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

crypto-sw-scheduler: fix queue iterator

Browse Source 
When there are several workers, iterator can and will skip
head iterator and it will last until BARRIER_SYNC_TIMEOUT won't
expire and will cause SIGABRT with `worker thread deadlock`

Type: fix

Signed-off-by: Vladimir Ratnikov <vratnikov@netgate.com>
Change-Id: Id4def4d5894e077ae27592367b141ecd822e86af
Signed-off-by: Matthew Smith <mgsmith@netgate.com>
(cherry picked from commit 65bff88c36)
This commit is contained in:
Vladimir Ratnikov
2022-10-17 07:34:14 +00:00
committed by Matthew Smith
parent b807f08d87
commit e3618c1960
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/crypto_sw_scheduler/main.c
View File

@ -471,6 +471,15 @@ crypto_sw_scheduler_process_aead (vlib_main_t *vm,
tail = current_queue->tail;
head = current_queue->head;
/* Skip this queue unless tail < head or head has overflowed
* and tail has not. At the point where tail overflows (== 0),
* the largest possible value of head is (queue size - 1).
* Prior to that, the largest possible value of head is
* (queue size - 2).
*/
if ((tail > head) && (head >= CRYPTO_SW_SCHEDULER_QUEUE_MASK))
goto skip_queue;
for (j = tail; j != head; j++)
{
@ -488,6 +497,7 @@ crypto_sw_scheduler_process_aead (vlib_main_t *vm,
}
}
skip_queue:
if (found || i == ptd->last_serve_lcore_id)
{
CLIB_MEMORY_STORE_BARRIER ();