summaryrefslogtreecommitdiffstats
path: root/src/vlibmemory/memory_api.c
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2019-11-27 09:15:25 -0800
committerDave Barach <openvpp@barachs.net>2019-12-06 19:29:02 +0000
commit8d820857d91efa9adca86e935e2d559d310ee2a1 (patch)
tree5e915700594d157d4a25d1d7ca46cbdf99d01689 /src/vlibmemory/memory_api.c
parent157a4ab4043cd9d1b6ac26b7853f1471a9095756 (diff)
api: avoid swapping vlib_rp before barrier sync
Type: fix Change-Id: I9868d13e827c6f5aa5535a38f629efb62ff12dbc Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com> Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/vlibmemory/memory_api.c')
-rw-r--r--src/vlibmemory/memory_api.c50
1 files changed, 18 insertions, 32 deletions
diff --git a/src/vlibmemory/memory_api.c b/src/vlibmemory/memory_api.c
index 42d1ee08a9f..b5c97e9acb7 100644
--- a/src/vlibmemory/memory_api.c
+++ b/src/vlibmemory/memory_api.c
@@ -503,10 +503,8 @@ static void
send_memclnt_keepalive (vl_api_registration_t * regp, f64 now)
{
vl_api_memclnt_keepalive_t *mp;
- svm_queue_t *q;
api_main_t *am = &api_main;
- svm_region_t *save_vlib_rp = am->vlib_rp;
- vl_shmem_hdr_t *save_shmem_hdr = am->shmem_hdr;
+ svm_queue_t *q;
q = regp->vl_input_queue;
@@ -530,10 +528,7 @@ send_memclnt_keepalive (vl_api_registration_t * regp, f64 now)
* memory clients..
*/
- am->vlib_rp = regp->vlib_rp;
- am->shmem_hdr = regp->shmem_hdr;
-
- mp = vl_msg_api_alloc (sizeof (*mp));
+ mp = vl_mem_api_alloc_as_if_client_w_reg (regp, sizeof (*mp));
clib_memset (mp, 0, sizeof (*mp));
mp->_vl_msg_id = clib_host_to_net_u16 (VL_API_MEMCLNT_KEEPALIVE);
mp->context = mp->client_index =
@@ -545,10 +540,7 @@ send_memclnt_keepalive (vl_api_registration_t * regp, f64 now)
/* Failure-to-send due to a stuffed queue is absolutely expected */
if (svm_queue_add (q, (u8 *) & mp, 1 /* nowait */ ))
- vl_msg_api_free (mp);
-
- am->vlib_rp = save_vlib_rp;
- am->shmem_hdr = save_shmem_hdr;
+ vl_msg_api_free_w_region (regp->vlib_rp, mp);
}
static void
@@ -708,14 +700,20 @@ vl_mem_api_dead_client_scan (api_main_t * am, vl_shmem_hdr_t * shm, f64 now)
}
static inline int
-void_mem_api_handle_msg_i (api_main_t * am, vlib_main_t * vm,
- vlib_node_runtime_t * node, svm_queue_t * q)
+void_mem_api_handle_msg_i (api_main_t * am, svm_region_t * vlib_rp,
+ vlib_main_t * vm, vlib_node_runtime_t * node,
+ u8 is_private)
{
+ svm_queue_t *q;
uword mp;
+
+ q = ((vl_shmem_hdr_t *) (void *) vlib_rp->user_ctx)->vl_input_queue;
+
if (!svm_queue_sub2 (q, (u8 *) & mp))
{
VL_MSG_API_UNPOISON ((void *) mp);
- vl_msg_api_handler_with_vm_node (am, (void *) mp, vm, node);
+ vl_msg_api_handler_with_vm_node (am, vlib_rp, (void *) mp, vm, node,
+ is_private);
return 0;
}
return -1;
@@ -725,8 +723,8 @@ int
vl_mem_api_handle_msg_main (vlib_main_t * vm, vlib_node_runtime_t * node)
{
api_main_t *am = &api_main;
- return void_mem_api_handle_msg_i (am, vm, node,
- am->shmem_hdr->vl_input_queue);
+ return void_mem_api_handle_msg_i (am, am->vlib_rp, vm, node,
+ 0 /* is_private */ );
}
int
@@ -764,7 +762,8 @@ vl_mem_api_handle_rpc (vlib_main_t * vm, vlib_node_runtime_t * node)
for (i = 0; i < vec_len (vm->processing_rpc_requests); i++)
{
mp = vm->processing_rpc_requests[i];
- vl_msg_api_handler_with_vm_node (am, (void *) mp, vm, node);
+ vl_msg_api_handler_with_vm_node (am, am->vlib_rp, (void *) mp, vm,
+ node, 0 /* is_private */ );
}
vl_msg_api_barrier_release ();
}
@@ -777,22 +776,9 @@ vl_mem_api_handle_msg_private (vlib_main_t * vm, vlib_node_runtime_t * node,
u32 reg_index)
{
api_main_t *am = &api_main;
- vl_shmem_hdr_t *save_shmem_hdr = am->shmem_hdr;
- svm_region_t *vlib_rp, *save_vlib_rp = am->vlib_rp;
- svm_queue_t *q;
- int rv;
-
- vlib_rp = am->vlib_rp = am->vlib_private_rps[reg_index];
-
- am->shmem_hdr = (void *) vlib_rp->user_ctx;
- q = am->shmem_hdr->vl_input_queue;
-
- rv = void_mem_api_handle_msg_i (am, vm, node, q);
-
- am->shmem_hdr = save_shmem_hdr;
- am->vlib_rp = save_vlib_rp;
- return rv;
+ return void_mem_api_handle_msg_i (am, am->vlib_private_rps[reg_index], vm,
+ node, 1 /* is_private */ );
}
vl_api_registration_t *