summaryrefslogtreecommitdiffstats
path: root/src/vnet/session-apps
diff options
context:
space:
mode:
authorSirshak Das <sirshak.das@arm.com>2019-02-05 01:33:33 -0600
committerFlorin Coras <florin.coras@gmail.com>2019-04-16 19:33:21 +0000
commit28aa539f7da7b172d0f35ea9a63f3986939477f7 (patch)
treebe856eb44878b604b2fc93beffb7268db77b457b /src/vnet/session-apps
parent39d04099467414175803273433c95a96c0276252 (diff)
svm_fifo rework to avoid contention on cursize
Problems Addressed: - Contention of cursize by producer and consumer. - Reduce the no of modulo operations. Changes: - Synchronization between producer and consumer changed from cursize to head and tail indexes Implications: reduces the usable size of fifo by 1. - Using weaker memory ordering C++11 atomics to access head and tail based on producer and consumer role. - Head and tail indexes are unsigned 32 bit integers. Additions and subtraction on them are implicit 32 bit Modulo operation. - Adding weaker memory ordering variants of max_enq, max_deq, is_empty and is_full Using them appropriately in all places. Perfomance improvement (iperf3 via Hoststack): iperf3 Server: Marvell ThunderX2(AArch64) - iperf3 Client: Skylake(x86) ~6%(256 rxd/txd) - ~11%(2048 rxd/txd) Change-Id: I1d484e000e437430fdd5a819657d1c6b62443018 Signed-off-by: Sirshak Das <sirshak.das@arm.com> Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Diffstat (limited to 'src/vnet/session-apps')
-rw-r--r--src/vnet/session-apps/echo_client.c8
-rw-r--r--src/vnet/session-apps/echo_server.c8
-rw-r--r--src/vnet/session-apps/http_server.c4
-rw-r--r--src/vnet/session-apps/proxy.c2
4 files changed, 11 insertions, 11 deletions
diff --git a/src/vnet/session-apps/echo_client.c b/src/vnet/session-apps/echo_client.c
index fb7de48f102..39f464d23ce 100644
--- a/src/vnet/session-apps/echo_client.c
+++ b/src/vnet/session-apps/echo_client.c
@@ -60,7 +60,7 @@ send_data_chunk (echo_client_main_t * ecm, eclient_session_t * s)
if (ecm->no_copy)
{
svm_fifo_t *f = s->data.tx_fifo;
- rv = clib_min (svm_fifo_max_enqueue (f), bytes_this_chunk);
+ rv = clib_min (svm_fifo_max_enqueue_prod (f), bytes_this_chunk);
svm_fifo_enqueue_nocopy (f, rv);
session_send_io_evt_to_thread_custom (&f->master_session_index,
s->thread_index,
@@ -77,7 +77,7 @@ send_data_chunk (echo_client_main_t * ecm, eclient_session_t * s)
session_dgram_hdr_t hdr;
svm_fifo_t *f = s->data.tx_fifo;
app_session_transport_t *at = &s->data.transport;
- u32 max_enqueue = svm_fifo_max_enqueue (f);
+ u32 max_enqueue = svm_fifo_max_enqueue_prod (f);
if (max_enqueue <= sizeof (session_dgram_hdr_t))
return;
@@ -151,7 +151,7 @@ receive_data_chunk (echo_client_main_t * ecm, eclient_session_t * s)
}
else
{
- n_read = svm_fifo_max_dequeue (rx_fifo);
+ n_read = svm_fifo_max_dequeue_cons (rx_fifo);
svm_fifo_dequeue_drop (rx_fifo, n_read);
}
@@ -480,7 +480,7 @@ echo_clients_rx_callback (session_t * s)
sp = pool_elt_at_index (ecm->sessions, s->rx_fifo->client_session_index);
receive_data_chunk (ecm, sp);
- if (svm_fifo_max_dequeue (s->rx_fifo))
+ if (svm_fifo_max_dequeue_cons (s->rx_fifo))
{
if (svm_fifo_set_event (s->rx_fifo))
session_send_io_evt_to_thread (s->rx_fifo, SESSION_IO_EVT_BUILTIN_RX);
diff --git a/src/vnet/session-apps/echo_server.c b/src/vnet/session-apps/echo_server.c
index d165fb35e01..4249ed83292 100644
--- a/src/vnet/session-apps/echo_server.c
+++ b/src/vnet/session-apps/echo_server.c
@@ -139,7 +139,7 @@ int
echo_server_builtin_server_rx_callback_no_echo (session_t * s)
{
svm_fifo_t *rx_fifo = s->rx_fifo;
- svm_fifo_dequeue_drop (rx_fifo, svm_fifo_max_dequeue (rx_fifo));
+ svm_fifo_dequeue_drop (rx_fifo, svm_fifo_max_dequeue_cons (rx_fifo));
return 0;
}
@@ -161,10 +161,10 @@ echo_server_rx_callback (session_t * s)
ASSERT (rx_fifo->master_thread_index == thread_index);
ASSERT (tx_fifo->master_thread_index == thread_index);
- max_enqueue = svm_fifo_max_enqueue (tx_fifo);
+ max_enqueue = svm_fifo_max_enqueue_prod (tx_fifo);
if (!esm->is_dgram)
{
- max_dequeue = svm_fifo_max_dequeue (rx_fifo);
+ max_dequeue = svm_fifo_max_dequeue_cons (rx_fifo);
}
else
{
@@ -255,7 +255,7 @@ echo_server_rx_callback (session_t * s)
if (n_written != max_transfer)
clib_warning ("short trout! written %u read %u", n_written, max_transfer);
- if (PREDICT_FALSE (svm_fifo_max_dequeue (rx_fifo)))
+ if (PREDICT_FALSE (svm_fifo_max_dequeue_cons (rx_fifo)))
goto rx_event;
return 0;
diff --git a/src/vnet/session-apps/http_server.c b/src/vnet/session-apps/http_server.c
index 4547a4dc4ef..c7e06bfbb2d 100644
--- a/src/vnet/session-apps/http_server.c
+++ b/src/vnet/session-apps/http_server.c
@@ -503,7 +503,7 @@ session_rx_request (http_session_t * hs)
int n_read;
cursize = vec_len (hs->rx_buf);
- max_dequeue = svm_fifo_max_dequeue (hs->rx_fifo);
+ max_dequeue = svm_fifo_max_dequeue_cons (hs->rx_fifo);
if (PREDICT_FALSE (max_dequeue == 0))
return -1;
@@ -511,7 +511,7 @@ session_rx_request (http_session_t * hs)
n_read = app_recv_stream_raw (hs->rx_fifo, hs->rx_buf + cursize,
max_dequeue, 0, 0 /* peek */ );
ASSERT (n_read == max_dequeue);
- if (svm_fifo_is_empty (hs->rx_fifo))
+ if (svm_fifo_is_empty_cons (hs->rx_fifo))
svm_fifo_unset_event (hs->rx_fifo);
_vec_len (hs->rx_buf) = cursize + n_read;
diff --git a/src/vnet/session-apps/proxy.c b/src/vnet/session-apps/proxy.c
index 0d4cdd43c1c..6542c160f63 100644
--- a/src/vnet/session-apps/proxy.c
+++ b/src/vnet/session-apps/proxy.c
@@ -227,7 +227,7 @@ proxy_rx_callback (session_t * s)
ASSERT (rx_fifo->master_thread_index == thread_index);
ASSERT (tx_fifo->master_thread_index == thread_index);
- max_dequeue = svm_fifo_max_dequeue (s->rx_fifo);
+ max_dequeue = svm_fifo_max_dequeue_cons (s->rx_fifo);
if (PREDICT_FALSE (max_dequeue == 0))
return 0;