From 2e1c8967faf4e9f7b45471df02e4e5b07fbb520a Mon Sep 17 00:00:00 2001 From: Ole Troan Date: Wed, 10 Apr 2019 09:44:23 +0200 Subject: API: Fix shared memory only action handlers. Some API action handlers called vl_msg_ai_send_shmem() directly. That breaks Unix domain socket API transport. A couple (bond / vhost) also tried to send a sw_interface_event directly, but did not send the message to all that had registred interest. That scheme never worked correctly. Refactored and improved the interface event code. Change-Id: Idb90edfd8703c6ae593b36b4eeb4d3ed7da5c808 Signed-off-by: Ole Troan --- src/plugins/ioam/lib-trace/trace_api.c | 70 +++++--------------------- src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c | 59 +++------------------- 2 files changed, 20 insertions(+), 109 deletions(-) (limited to 'src/plugins/ioam') diff --git a/src/plugins/ioam/lib-trace/trace_api.c b/src/plugins/ioam/lib-trace/trace_api.c index bb043f7c831..f74d4e7f43b 100644 --- a/src/plugins/ioam/lib-trace/trace_api.c +++ b/src/plugins/ioam/lib-trace/trace_api.c @@ -23,7 +23,7 @@ #include #include #include - +#include #include #include @@ -52,47 +52,6 @@ #include #undef vl_api_version -/* - * A handy macro to set up a message reply. - * Assumes that the following variables are available: - * mp - pointer to request message - * rmp - pointer to reply message type - * rv - return value - */ - -#define TRACE_REPLY_MACRO(t) \ -do { \ - svm_queue_t * q = \ - vl_api_client_index_to_input_queue (mp->client_index); \ - if (!q) \ - return; \ - \ - rmp = vl_msg_api_alloc (sizeof (*rmp)); \ - rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base); \ - rmp->context = mp->context; \ - rmp->retval = ntohl(rv); \ - \ - vl_msg_api_send_shmem (q, (u8 *)&rmp); \ -} while(0); - -/* *INDENT-OFF* */ -#define TRACE_REPLY_MACRO2(t, body) \ -do { \ - svm_queue_t * q; \ - rv = vl_msg_api_pd_handler (mp, rv); \ - q = vl_api_client_index_to_input_queue (mp->client_index); \ - if (!q) \ - return; \ - \ - rmp = vl_msg_api_alloc (sizeof (*rmp)); \ - rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base); \ - rmp->context = mp->context; \ - rmp->retval = ntohl(rv); \ - do {body;} while (0); \ - vl_msg_api_send_shmem (q, (u8 *)&rmp); \ -} while(0); -/* *INDENT-ON* */ - /* List of message types that this plugin understands */ #define foreach_trace_plugin_api_msg \ @@ -103,7 +62,6 @@ _(TRACE_PROFILE_SHOW_CONFIG, trace_profile_show_config) static void vl_api_trace_profile_add_t_handler (vl_api_trace_profile_add_t * mp) { - trace_main_t *sm = &trace_main; int rv = 0; vl_api_trace_profile_add_reply_t *rmp; trace_profile *profile = NULL; @@ -123,45 +81,43 @@ static void vl_api_trace_profile_add_t_handler rv = -3; } ERROROUT: - TRACE_REPLY_MACRO (VL_API_TRACE_PROFILE_ADD_REPLY); + REPLY_MACRO (VL_API_TRACE_PROFILE_ADD_REPLY); } static void vl_api_trace_profile_del_t_handler (vl_api_trace_profile_del_t * mp) { - trace_main_t *sm = &trace_main; int rv = 0; vl_api_trace_profile_del_reply_t *rmp; clear_trace_profiles (); - TRACE_REPLY_MACRO (VL_API_TRACE_PROFILE_DEL_REPLY); + REPLY_MACRO (VL_API_TRACE_PROFILE_DEL_REPLY); } static void vl_api_trace_profile_show_config_t_handler (vl_api_trace_profile_show_config_t * mp) { - trace_main_t *sm = &trace_main; vl_api_trace_profile_show_config_reply_t *rmp; int rv = 0; trace_profile *profile = trace_profile_find (); if (profile->valid) { - TRACE_REPLY_MACRO2 (VL_API_TRACE_PROFILE_SHOW_CONFIG_REPLY, - rmp->trace_type = profile->trace_type; - rmp->num_elts = profile->num_elts; - rmp->trace_tsp = profile->trace_tsp; - rmp->node_id = htonl (profile->node_id); - rmp->app_data = htonl (profile->app_data); + REPLY_MACRO2 (VL_API_TRACE_PROFILE_SHOW_CONFIG_REPLY, + rmp->trace_type = profile->trace_type; + rmp->num_elts = profile->num_elts; + rmp->trace_tsp = profile->trace_tsp; + rmp->node_id = htonl (profile->node_id); + rmp->app_data = htonl (profile->app_data); ); } else { - TRACE_REPLY_MACRO2 (VL_API_TRACE_PROFILE_SHOW_CONFIG_REPLY, - rmp->trace_type = 0; - rmp->num_elts = 0; rmp->trace_tsp = 0; - rmp->node_id = 0; rmp->app_data = 0; + REPLY_MACRO2 (VL_API_TRACE_PROFILE_SHOW_CONFIG_REPLY, + rmp->trace_type = 0; + rmp->num_elts = 0; rmp->trace_tsp = 0; + rmp->node_id = 0; rmp->app_data = 0; ); } } diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c index 2d9c6bfab3d..e46d0fbf866 100644 --- a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c +++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c @@ -22,7 +22,7 @@ #include #include #include - +#include #include #include @@ -51,47 +51,6 @@ #include #undef vl_api_version -/* - * A handy macro to set up a message reply. - * Assumes that the following variables are available: - * mp - pointer to request message - * rmp - pointer to reply message type - * rv - return value - */ - -#define VXLAN_GPE_REPLY_MACRO(t) \ -do { \ - svm_queue_t * q = \ - vl_api_client_index_to_input_queue (mp->client_index); \ - if (!q) \ - return; \ - \ - rmp = vl_msg_api_alloc (sizeof (*rmp)); \ - rmp->_vl_msg_id = ntohs((t)+sm->msg_id_base); \ - rmp->context = mp->context; \ - rmp->retval = ntohl(rv); \ - \ - vl_msg_api_send_shmem (q, (u8 *)&rmp); \ -} while(0); - -/* *INDENT-OFF* */ -#define VXLAN_GPE_REPLY_MACRO2(t, body) \ -do { \ - svm_queue_t * q; \ - rv = vl_msg_api_pd_handler (mp, rv); \ - q = vl_api_client_index_to_input_queue (mp->client_index); \ - if (!q) \ - return; \ - \ - rmp = vl_msg_api_alloc (sizeof (*rmp)); \ - rmp->_vl_msg_id = ntohs((t)); \ - rmp->context = mp->context; \ - rmp->retval = ntohl(rv); \ - do {body;} while (0); \ - vl_msg_api_send_shmem (q, (u8 *)&rmp); \ -} while(0); -/* *INDENT-ON* */ - /* List of message types that this plugin understands */ #define foreach_vxlan_gpe_plugin_api_msg \ @@ -109,7 +68,6 @@ static void vl_api_vxlan_gpe_ioam_enable_t_handler int rv = 0; vl_api_vxlan_gpe_ioam_enable_reply_t *rmp; clib_error_t *error; - vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main; /* Ignoring the profile id as currently a single profile * is supported */ @@ -121,7 +79,7 @@ static void vl_api_vxlan_gpe_ioam_enable_t_handler rv = clib_error_get_code (error); } - VXLAN_GPE_REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_ENABLE_REPLY); + REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_ENABLE_REPLY); } static void vl_api_vxlan_gpe_ioam_disable_t_handler @@ -130,7 +88,6 @@ static void vl_api_vxlan_gpe_ioam_disable_t_handler int rv = 0; vl_api_vxlan_gpe_ioam_disable_reply_t *rmp; clib_error_t *error; - vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main; /* Ignoring the profile id as currently a single profile * is supported */ @@ -141,7 +98,7 @@ static void vl_api_vxlan_gpe_ioam_disable_t_handler rv = clib_error_get_code (error); } - VXLAN_GPE_REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_DISABLE_REPLY); + REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_DISABLE_REPLY); } static void vl_api_vxlan_gpe_ioam_vni_enable_t_handler @@ -150,7 +107,6 @@ static void vl_api_vxlan_gpe_ioam_vni_enable_t_handler int rv = 0; vl_api_vxlan_gpe_ioam_vni_enable_reply_t *rmp; clib_error_t *error; - vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main; vxlan4_gpe_tunnel_key_t key4; uword *p = NULL; vxlan_gpe_main_t *gm = &vxlan_gpe_main; @@ -190,7 +146,7 @@ static void vl_api_vxlan_gpe_ioam_vni_enable_t_handler rv = clib_error_get_code (error); } - VXLAN_GPE_REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_VNI_ENABLE_REPLY); + REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_VNI_ENABLE_REPLY); } @@ -200,7 +156,6 @@ static void vl_api_vxlan_gpe_ioam_vni_disable_t_handler int rv = 0; vl_api_vxlan_gpe_ioam_vni_enable_reply_t *rmp; clib_error_t *error; - vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main; vxlan4_gpe_tunnel_key_t key4; uword *p = NULL; vxlan_gpe_main_t *gm = &vxlan_gpe_main; @@ -238,7 +193,7 @@ static void vl_api_vxlan_gpe_ioam_vni_disable_t_handler } - VXLAN_GPE_REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_VNI_DISABLE_REPLY); + REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_VNI_DISABLE_REPLY); } static void vl_api_vxlan_gpe_ioam_transit_enable_t_handler @@ -260,7 +215,7 @@ static void vl_api_vxlan_gpe_ioam_transit_enable_t_handler mp->is_ipv6 ? 0 : 1, 1 /* is_add */ ); - VXLAN_GPE_REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_TRANSIT_ENABLE_REPLY); + REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_TRANSIT_ENABLE_REPLY); } static void vl_api_vxlan_gpe_ioam_transit_disable_t_handler @@ -281,7 +236,7 @@ static void vl_api_vxlan_gpe_ioam_transit_disable_t_handler dst_addr, ntohl (mp->outer_fib_index), mp->is_ipv6 ? 0 : 1); - VXLAN_GPE_REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_TRANSIT_DISABLE_REPLY); + REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_TRANSIT_DISABLE_REPLY); } /* Set up the API message handling tables */ -- cgit 1.2.3-korg