From 14f066e95100cfdcd5f0531e35ba84b7b859a00a Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Thu, 10 Dec 2020 18:52:40 -0800 Subject: svm vcl: allow random offsets for fifo segments in apps Type: improvement Signed-off-by: Florin Coras Change-Id: I1658a9c19d8eae4c9a42c0a111d4ad343b8eb8a4 --- src/vnet/session/session_api.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/vnet/session/session_api.c') diff --git a/src/vnet/session/session_api.c b/src/vnet/session/session_api.c index 4602a783e60..2073a15af64 100644 --- a/src/vnet/session/session_api.c +++ b/src/vnet/session/session_api.c @@ -148,8 +148,8 @@ mq_send_session_accepted_cb (session_t * s) mp = (session_accepted_msg_t *) evt->data; clib_memset (mp, 0, sizeof (*mp)); mp->context = app->app_index; - mp->server_rx_fifo = pointer_to_uword (s->rx_fifo->shr); - mp->server_tx_fifo = pointer_to_uword (s->tx_fifo->shr); + mp->server_rx_fifo = fifo_segment_fifo_offset (s->rx_fifo); + mp->server_tx_fifo = fifo_segment_fifo_offset (s->tx_fifo); mp->segment_handle = session_segment_handle (s); mp->flags = s->flags; @@ -313,8 +313,8 @@ mq_send_session_connected_cb (u32 app_wrk_index, u32 api_context, session_get_endpoint (s, &mp->lcl, 1 /* is_lcl */ ); - mp->server_rx_fifo = pointer_to_uword (s->rx_fifo->shr); - mp->server_tx_fifo = pointer_to_uword (s->tx_fifo->shr); + mp->server_rx_fifo = fifo_segment_fifo_offset (s->rx_fifo); + mp->server_tx_fifo = fifo_segment_fifo_offset (s->tx_fifo); mp->segment_handle = session_segment_handle (s); } else @@ -328,12 +328,12 @@ mq_send_session_connected_cb (u32 app_wrk_index, u32 api_context, mp->lcl.is_ip4 = cct->c_is_ip4; mp->vpp_event_queue_address = fifo_segment_msg_q_offset (eq_seg, s->thread_index); - mp->server_rx_fifo = pointer_to_uword (s->rx_fifo->shr); - mp->server_tx_fifo = pointer_to_uword (s->tx_fifo->shr); + mp->server_rx_fifo = fifo_segment_fifo_offset (s->rx_fifo); + mp->server_tx_fifo = fifo_segment_fifo_offset (s->tx_fifo); mp->segment_handle = session_segment_handle (s); ss = ct_session_get_peer (s); - mp->ct_rx_fifo = pointer_to_uword (ss->tx_fifo->shr); - mp->ct_tx_fifo = pointer_to_uword (ss->rx_fifo->shr); + mp->ct_rx_fifo = fifo_segment_fifo_offset (ss->tx_fifo); + mp->ct_tx_fifo = fifo_segment_fifo_offset (ss->rx_fifo); mp->ct_segment_handle = session_segment_handle (ss); } @@ -395,8 +395,8 @@ mq_send_session_bound_cb (u32 app_wrk_index, u32 api_context, if (session_transport_service_type (ls) == TRANSPORT_SERVICE_CL) { - mp->rx_fifo = pointer_to_uword (ls->rx_fifo->shr); - mp->tx_fifo = pointer_to_uword (ls->tx_fifo->shr); + mp->rx_fifo = fifo_segment_fifo_offset (ls->rx_fifo); + mp->tx_fifo = fifo_segment_fifo_offset (ls->tx_fifo); mp->segment_handle = session_segment_handle (ls); } -- cgit 1.2.3-korg