diff options
author | Sirshak Das <sirshak.das@arm.com> | 2019-02-05 01:33:33 -0600 |
---|---|---|
committer | Florin Coras <florin.coras@gmail.com> | 2019-04-16 19:33:21 +0000 |
commit | 28aa539f7da7b172d0f35ea9a63f3986939477f7 (patch) | |
tree | be856eb44878b604b2fc93beffb7268db77b457b /src/plugins/tlsopenssl/tls_openssl.c | |
parent | 39d04099467414175803273433c95a96c0276252 (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/plugins/tlsopenssl/tls_openssl.c')
-rw-r--r-- | src/plugins/tlsopenssl/tls_openssl.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/tlsopenssl/tls_openssl.c b/src/plugins/tlsopenssl/tls_openssl.c index e41d50a2b8b..d99a89c3d9c 100644 --- a/src/plugins/tlsopenssl/tls_openssl.c +++ b/src/plugins/tlsopenssl/tls_openssl.c @@ -112,7 +112,7 @@ openssl_try_handshake_read (openssl_ctx_t * oc, session_t * tls_session) int wrote, rv; f = tls_session->rx_fifo; - deq_max = svm_fifo_max_dequeue (f); + deq_max = svm_fifo_max_dequeue_cons (f); if (!deq_max) return 0; @@ -146,7 +146,7 @@ openssl_try_handshake_write (openssl_ctx_t * oc, session_t * tls_session) return 0; f = tls_session->tx_fifo; - enq_max = svm_fifo_max_enqueue (f); + enq_max = svm_fifo_max_enqueue_prod (f); if (!enq_max) return 0; @@ -306,7 +306,7 @@ openssl_ctx_write (tls_ctx_t * ctx, session_t * app_session) svm_fifo_t *f; f = app_session->tx_fifo; - deq_max = svm_fifo_max_dequeue (f); + deq_max = svm_fifo_max_dequeue_cons (f); if (!deq_max) goto check_tls_fifo; @@ -342,7 +342,7 @@ check_tls_fifo: tls_session = session_get_from_handle (ctx->tls_session_handle); f = tls_session->tx_fifo; - enq_max = svm_fifo_max_enqueue (f); + enq_max = svm_fifo_max_enqueue_prod (f); if (!enq_max) { tls_add_vpp_q_builtin_tx_evt (app_session); @@ -390,7 +390,7 @@ openssl_ctx_read (tls_ctx_t * ctx, session_t * tls_session) } f = tls_session->rx_fifo; - deq_max = svm_fifo_max_dequeue (f); + deq_max = svm_fifo_max_dequeue_cons (f); max_space = max_buf - BIO_ctrl_pending (oc->wbio); max_space = max_space < 0 ? 0 : max_space; deq_now = clib_min (deq_max, max_space); @@ -415,7 +415,7 @@ openssl_ctx_read (tls_ctx_t * ctx, session_t * tls_session) wrote += rv; } } - if (svm_fifo_max_dequeue (f)) + if (svm_fifo_max_dequeue_cons (f)) tls_add_vpp_q_builtin_rx_evt (tls_session); check_app_fifo: @@ -425,7 +425,7 @@ check_app_fifo: app_session = session_get_from_handle (ctx->app_session_handle); f = app_session->rx_fifo; - enq_max = svm_fifo_max_enqueue (f); + enq_max = svm_fifo_max_enqueue_prod (f); if (!enq_max) { tls_add_vpp_q_builtin_rx_evt (tls_session); |