ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vcl: grab wrk create lock sooner

Browse Source 
Type: fix

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I0faeef20c57486564122e39f01f31c8c45f38014
(cherry picked from commit 94fef3e676)
This commit is contained in:
Florin Coras
2021-09-23 15:08:05 -07:00
committed by Florin Coras
parent fd9d936b3c
commit c1931b2f09
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vcl/vcl_private.c
View File

@ -167,16 +167,19 @@ vcl_worker_alloc_and_init ()
if (vcl_get_worker_index () != ~0) if (vcl_get_worker_index () != ~0)
return 0; return 0;
/* Grab lock before selecting mem thread index */
clib_spinlock_lock (&vcm->workers_lock);
/* Use separate heap map entry for worker */ /* Use separate heap map entry for worker */
clib_mem_set_thread_index (); clib_mem_set_thread_index ();
if (pool_elts (vcm->workers) == vcm->cfg.max_workers) if (pool_elts (vcm->workers) == vcm->cfg.max_workers)
{ {
VDBG (0, "max-workers %u limit reached", vcm->cfg.max_workers); VDBG (0, "max-workers %u limit reached", vcm->cfg.max_workers);
return 0; wrk = 0;
goto done;
} }
clib_spinlock_lock (&vcm->workers_lock);
wrk = vcl_worker_alloc (); wrk = vcl_worker_alloc ();
vcl_set_worker_index (wrk->wrk_index); vcl_set_worker_index (wrk->wrk_index);
wrk->thread_id = pthread_self (); wrk->thread_id = pthread_self ();
@ -203,9 +206,9 @@ vcl_worker_alloc_and_init ()
vec_reset_length (wrk->mq_msg_vector); vec_reset_length (wrk->mq_msg_vector);
vec_validate (wrk->unhandled_evts_vector, 128); vec_validate (wrk->unhandled_evts_vector, 128);
vec_reset_length (wrk->unhandled_evts_vector); vec_reset_length (wrk->unhandled_evts_vector);
clib_spinlock_unlock (&vcm->workers_lock);
done: done:
clib_spinlock_unlock (&vcm->workers_lock);
return wrk; return wrk;
} }