From da8f218f78192370c0b5ab5bfce4a3584942099e Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Sun, 22 Dec 2019 12:48:05 -0800 Subject: vcl: fix multi-thread app segment attaching Type: fix Guard segment attaching/deletion, not only the hash table CRD operations. Change-Id: Ic96e4adedffb73baf89e971438596927e6daf930 Signed-off-by: Florin Coras --- src/vcl/vcl_private.c | 59 +++++++++++++++++++++++---------------------------- 1 file changed, 27 insertions(+), 32 deletions(-) (limited to 'src/vcl/vcl_private.c') diff --git a/src/vcl/vcl_private.c b/src/vcl/vcl_private.c index f3cee5d6f8e..f041a868929 100644 --- a/src/vcl/vcl_private.c +++ b/src/vcl/vcl_private.c @@ -290,36 +290,6 @@ vcl_worker_ctrl_mq (vcl_worker_t * wrk) return wrk->ctrl_mq; } -void -vcl_segment_table_add (u64 segment_handle, u32 svm_segment_index) -{ - clib_rwlock_writer_lock (&vcm->segment_table_lock); - hash_set (vcm->segment_table, segment_handle, svm_segment_index); - clib_rwlock_writer_unlock (&vcm->segment_table_lock); -} - -u32 -vcl_segment_table_lookup (u64 segment_handle) -{ - uword *seg_indexp; - - clib_rwlock_reader_lock (&vcm->segment_table_lock); - seg_indexp = hash_get (vcm->segment_table, segment_handle); - clib_rwlock_reader_unlock (&vcm->segment_table_lock); - - if (!seg_indexp) - return VCL_INVALID_SEGMENT_INDEX; - return ((u32) * seg_indexp); -} - -void -vcl_segment_table_del (u64 segment_handle) -{ - clib_rwlock_writer_lock (&vcm->segment_table_lock); - hash_unset (vcm->segment_table, segment_handle); - clib_rwlock_writer_unlock (&vcm->segment_table_lock); -} - void vcl_cleanup_bapi (void) { @@ -419,16 +389,35 @@ vcl_segment_attach (u64 segment_handle, char *name, ssvm_segment_type_t type, if (type == SSVM_SEGMENT_MEMFD) a->memfd_fd = fd; + clib_rwlock_writer_lock (&vcm->segment_table_lock); + if ((rv = fifo_segment_attach (&vcm->segment_main, a))) { clib_warning ("svm_fifo_segment_attach ('%s') failed", name); return rv; } - vcl_segment_table_add (segment_handle, a->new_segment_indices[0]); + hash_set (vcm->segment_table, segment_handle, a->new_segment_indices[0]); + + clib_rwlock_writer_unlock (&vcm->segment_table_lock); + vec_reset_length (a->new_segment_indices); return 0; } +u32 +vcl_segment_table_lookup (u64 segment_handle) +{ + uword *seg_indexp; + + clib_rwlock_reader_lock (&vcm->segment_table_lock); + seg_indexp = hash_get (vcm->segment_table, segment_handle); + clib_rwlock_reader_unlock (&vcm->segment_table_lock); + + if (!seg_indexp) + return VCL_INVALID_SEGMENT_INDEX; + return ((u32) * seg_indexp); +} + void vcl_segment_detach (u64 segment_handle) { @@ -439,9 +428,15 @@ vcl_segment_detach (u64 segment_handle) segment_index = vcl_segment_table_lookup (segment_handle); if (segment_index == (u32) ~ 0) return; + + clib_rwlock_writer_lock (&vcm->segment_table_lock); + segment = fifo_segment_get_segment (sm, segment_index); fifo_segment_delete (sm, segment); - vcl_segment_table_del (segment_handle); + hash_unset (vcm->segment_table, segment_handle); + + clib_rwlock_writer_unlock (&vcm->segment_table_lock); + VDBG (0, "detached segment %u handle %u", segment_index, segment_handle); } -- cgit 1.2.3-korg