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

api: fix mp-safe mark for some messages and add more

Browse Source 
Several api messages were not mp-safe although marked as such
because non-zero base id was not taken into account, and therefore
some other (from zero base id) were falsely mp-safe instead.

Keep messages as mp-safe, as they falsely were before:
    10   get_first_msg_id                              0       1
    12   api_versions                                  0       1

Messages that are no longer mp-safe as they weren't marked:
    15   sockclnt_create                               0       1
    33   proxy_arp_intfc_dump                          0       1

Fix messages to be really mp-safe:
    809  bridge_domain_dump                            0       1
    920  ip_route_add_del                              0       1
    921  ip_route_add_del_v2                           0       1
    1362 get_node_graph                                0       1
    1671 create_vhost_user_if                          0       1
    1675 create_vhost_user_if_v2                       0       1

Additionally mark messages as mp-safe, seems they need no barrier:
    1360 show_threads                                  0       1
    1370 show_version                                  0       1
    1372 show_vpe_system_time                          0       1

Type: fix
Change-Id: Ie6c1e3aa89f26bf51bfbcb7e7c4d9fee885487b7
Signed-off-by: Vladislav Grishenko <themiron@yandex-team.ru>
This commit is contained in:
Vladislav Grishenko
2023-03-19 02:57:01 +05:00
committed by Ole Tr�an
parent db8c285081
commit e7c57c45aa
6 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/vhost/vhost_user_api.c
+6 -3
View File
@@ -335,15 +335,18 @@ static clib_error_t *
vhost_user_api_hookup (vlib_main_t * vm)
{
api_main_t *am = vlibapi_get_main ();
/* Mark CREATE_VHOST_USER_IF as mp safe */
vl_api_set_msg_thread_safe (am, VL_API_CREATE_VHOST_USER_IF, 1);
vl_api_set_msg_thread_safe (am, VL_API_CREATE_VHOST_USER_IF_V2, 1);
/*
* Set up the (msg_name, crc, message-id) table
*/
REPLY_MSG_ID_BASE = setup_message_id_table ();
/* Mark CREATE_VHOST_USER_IF as mp safe */
vl_api_set_msg_thread_safe (
am, REPLY_MSG_ID_BASE + VL_API_CREATE_VHOST_USER_IF, 1);
vl_api_set_msg_thread_safe (
am, REPLY_MSG_ID_BASE + VL_API_CREATE_VHOST_USER_IF_V2, 1);
return 0;
}
src/vlibmemory/memclnt_api.c
+3
View File
@@ -190,6 +190,9 @@ vlib_api_init (void)
foreach_vlib_api_msg;
#undef _
/* Mark messages as mp safe */
vl_api_set_msg_thread_safe (am, VL_API_GET_FIRST_MSG_ID, 1);
vl_api_set_msg_thread_safe (am, VL_API_API_VERSIONS, 1);
vl_api_set_msg_thread_safe (am, VL_API_CONTROL_PING, 1);
vl_api_set_msg_thread_safe (am, VL_API_CONTROL_PING_REPLY, 1);
src/vlibmemory/vlib_api.c
+4 -1
View File
@@ -340,7 +340,10 @@ vlib_apis_hookup (vlib_main_t *vm)
*/
msg_id_base = setup_message_id_table ();
vl_api_set_msg_thread_safe (am, VL_API_GET_NODE_GRAPH, 1);
/* Mark messages as mp safe */
vl_api_set_msg_thread_safe (am, msg_id_base + VL_API_GET_NODE_GRAPH, 1);
vl_api_set_msg_thread_safe (am, msg_id_base + VL_API_SHOW_THREADS, 1);
return 0;
}
src/vnet/ip/ip_api.c
+12 -8
View File
@@ -2132,19 +2132,23 @@ ip_api_hookup (vlib_main_t * vm)
{
api_main_t *am = vlibapi_get_main ();
/*
* Mark the route add/del API as MP safe
*/
vl_api_set_msg_thread_safe (am, VL_API_IP_ROUTE_ADD_DEL, 1);
vl_api_set_msg_thread_safe (am, VL_API_IP_ROUTE_ADD_DEL_REPLY, 1);
vl_api_set_msg_thread_safe (am, VL_API_IP_ROUTE_ADD_DEL_V2, 1);
vl_api_set_msg_thread_safe (am, VL_API_IP_ROUTE_ADD_DEL_V2_REPLY, 1);
/*
* Set up the (msg_name, crc, message-id) table
*/
REPLY_MSG_ID_BASE = setup_message_id_table ();
/*
* Mark the route add/del API as MP safe
*/
vl_api_set_msg_thread_safe (am, REPLY_MSG_ID_BASE + VL_API_IP_ROUTE_ADD_DEL,
1);
vl_api_set_msg_thread_safe (
am, REPLY_MSG_ID_BASE + VL_API_IP_ROUTE_ADD_DEL_REPLY, 1);
vl_api_set_msg_thread_safe (
am, REPLY_MSG_ID_BASE + VL_API_IP_ROUTE_ADD_DEL_V2, 1);
vl_api_set_msg_thread_safe (
am, REPLY_MSG_ID_BASE + VL_API_IP_ROUTE_ADD_DEL_V2_REPLY, 1);
return 0;
}
src/vnet/l2/l2_api.c
+4 -3
View File
@@ -1312,14 +1312,15 @@ l2_api_hookup (vlib_main_t * vm)
{
api_main_t *am = vlibapi_get_main ();
/* Mark VL_API_BRIDGE_DOMAIN_DUMP as mp safe */
vl_api_set_msg_thread_safe (am, VL_API_BRIDGE_DOMAIN_DUMP, 1);
/*
* Set up the (msg_name, crc, message-id) table
*/
REPLY_MSG_ID_BASE = setup_message_id_table ();
/* Mark VL_API_BRIDGE_DOMAIN_DUMP as mp safe */
vl_api_set_msg_thread_safe (
am, REPLY_MSG_ID_BASE + VL_API_BRIDGE_DOMAIN_DUMP, 1);
return 0;
}
src/vpp/api/api.c
+7
View File
@@ -241,11 +241,18 @@ static void vl_api_##nn##_t_handler ( \
static clib_error_t *
vpe_api_hookup (vlib_main_t * vm)
{
api_main_t *am = vlibapi_get_main ();
/*
* Set up the (msg_name, crc, message-id) table
*/
msg_id_base = setup_message_id_table ();
/* Mark messages as mp safe */
vl_api_set_msg_thread_safe (am, msg_id_base + VL_API_SHOW_VERSION, 1);
vl_api_set_msg_thread_safe (am, msg_id_base + VL_API_SHOW_VPE_SYSTEM_TIME,
1);
return 0;
}