From 6f05f724f4091acde82ef39e941a1ef819e53893 Mon Sep 17 00:00:00 2001
From: Steven Luong <sluong@cisco.com>
Date: Thu, 25 Apr 2019 11:19:49 -0700
Subject: mp_safe SW_INTERFACE_DUMP, SW_INTERFACE_DETAILS,
 SW_INTERFACE_TAG_ADD_DEL, BRIDGE_DOMAIN_DUMP, CONTROL_PING,
 CONTROL_PING_REPLY, and show interface CLI

Change-Id: I2927573b66bb5dd134b37ffb72af0e6676750917
Signed-off-by: Steven Luong <sluong@cisco.com>
(cherry picked from commit 15c31921a628c5500cbed2ebc588d7ddbaa970a3)
---
 src/vnet/interface_api.c | 5 +++++
 src/vnet/interface_cli.c | 1 +
 src/vnet/l2/l2_api.c     | 3 +++
 src/vpp/api/api.c        | 2 ++
 4 files changed, 11 insertions(+)

(limited to 'src')

diff --git a/src/vnet/interface_api.c b/src/vnet/interface_api.c
index f49af9473e5..b973ea1aa97 100644
--- a/src/vnet/interface_api.c
+++ b/src/vnet/interface_api.c
@@ -1394,6 +1394,11 @@ interface_api_hookup (vlib_main_t * vm)
   foreach_vpe_api_msg;
 #undef _
 
+  /* Mark these APIs as mp safe */
+  am->is_mp_safe[VL_API_SW_INTERFACE_DUMP] = 1;
+  am->is_mp_safe[VL_API_SW_INTERFACE_DETAILS] = 1;
+  am->is_mp_safe[VL_API_SW_INTERFACE_TAG_ADD_DEL] = 1;
+
   /*
    * Set up the (msg_name, crc, message-id) table
    */
diff --git a/src/vnet/interface_cli.c b/src/vnet/interface_cli.c
index c316750968e..1b85ca0008e 100644
--- a/src/vnet/interface_cli.c
+++ b/src/vnet/interface_cli.c
@@ -470,6 +470,7 @@ VLIB_CLI_COMMAND (show_sw_interfaces_command, static) = {
   .path = "show interface",
   .short_help = "show interface [address|addr|features|feat] [<interface> [<interface> [..]]] [verbose]",
   .function = show_sw_interfaces,
+  .is_mp_safe = 1,
 };
 /* *INDENT-ON* */
 
diff --git a/src/vnet/l2/l2_api.c b/src/vnet/l2/l2_api.c
index f60cd41bb39..edb1deb0d1a 100644
--- a/src/vnet/l2/l2_api.c
+++ b/src/vnet/l2/l2_api.c
@@ -1061,6 +1061,9 @@ l2_api_hookup (vlib_main_t * vm)
   foreach_vpe_api_msg;
 #undef _
 
+  /* Mark VL_API_BRIDGE_DOMAIN_DUMP as mp safe */
+  am->is_mp_safe[VL_API_BRIDGE_DOMAIN_DUMP] = 1;
+
   /*
    * Set up the (msg_name, crc, message-id) table
    */
diff --git a/src/vpp/api/api.c b/src/vpp/api/api.c
index b5ff3ccad71..c5c2480ea87 100644
--- a/src/vpp/api/api.c
+++ b/src/vpp/api/api.c
@@ -538,6 +538,8 @@ vpe_api_hookup (vlib_main_t * vm)
   /*
    * Thread-safe API messages
    */
+  am->is_mp_safe[VL_API_CONTROL_PING] = 1;
+  am->is_mp_safe[VL_API_CONTROL_PING_REPLY] = 1;
   am->is_mp_safe[VL_API_IP_ADD_DEL_ROUTE] = 1;
   am->is_mp_safe[VL_API_GET_NODE_GRAPH] = 1;
 
-- 
cgit 1.2.3-korg