From: wanghanlin <wanghanlin@corp.netease.com>
Date: Fri, 11 Sep 2020 09:19:32 +0000 (+0800)
Subject: vcl: fix crash problem for invalidation of vls_table_lock
X-Git-Tag: v21.06-rc0~32
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=492350ee645ee415593b499590757bfa8e0c4410;p=vpp.git

vcl: fix crash problem for invalidation of vls_table_lock

Type: fix

Signed-off-by: wanghanlin <wanghanlin@corp.netease.com>
Change-Id: I0649f4d5adb5fa5b407431ea23982f2ad87fb657
---

diff --git a/src/vcl/vcl_locked.c b/src/vcl/vcl_locked.c
index 35061e7d86e..d56a209d2cd 100644
--- a/src/vcl/vcl_locked.c
+++ b/src/vcl/vcl_locked.c
@@ -219,7 +219,10 @@ vls_mt_add (void)
    * vcl worker with vpp. Otherwise, all threads use the same vcl worker, so
    * update the vcl worker's thread local worker index variable */
   if (vls_mt_wrk_supported ())
-    vls_register_vcl_worker ();
+    {
+      if (vppcom_worker_register () != VPPCOM_OK)
+	VERR ("failed to register worker");
+    }
   else
     vcl_set_worker_index (vlsl->vls_wrk_index);
 }
@@ -1712,11 +1715,7 @@ vls_use_real_epoll (void)
 void
 vls_register_vcl_worker (void)
 {
-  if (vppcom_worker_register () != VPPCOM_OK)
-    {
-      VERR ("failed to register worker");
-      return;
-    }
+  vls_mt_add ();
 }
 
 /*