From ff40d8f1b2f4efcf05f21934b423dce8aba8b652 Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Tue, 11 Aug 2020 22:05:28 -0700 Subject: vcl: mt detection and cleanup Type: improvement Signed-off-by: Florin Coras Change-Id: I521c110fd4d7445bd585c96d4c768f16a0a7d3b8 --- src/vcl/ldp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/vcl/ldp.c') diff --git a/src/vcl/ldp.c b/src/vcl/ldp.c index fddf45cd502..a4b66feedfc 100644 --- a/src/vcl/ldp.c +++ b/src/vcl/ldp.c @@ -2438,9 +2438,10 @@ ldp_epoll_pwait_eventfd (int epfd, struct epoll_event *events, return -1; } - if (vls_mt_wrk_supported ()) - if (PREDICT_FALSE (vppcom_worker_index () == ~0)) - vls_register_vcl_worker (); + /* Make sure the vcl worker is valid. Could be that epoll fd was created on + * one thread but it is now used on another */ + if (PREDICT_FALSE (vppcom_worker_index () == ~0)) + vls_register_vcl_worker (); ldpw = ldp_worker_get_current (); if (epfd == ldpw->vcl_mq_epfd) -- cgit 1.2.3-korg