From 50a392f5a0981fb442449864c479511c54145a29 Mon Sep 17 00:00:00 2001 From: Kingwel Xie Date: Tue, 25 Dec 2018 21:31:28 -0500 Subject: crypto-input: fix crash bug as this node is refactored in new style with vlib_buffer_enqueue_to_next, we have to check if the 'count' is greater than 0. otherise, the next_index would be invalid then lead to a crash Change-Id: If7c323b59c02b5c16bd9d77b65c946512cc972c1 Signed-off-by: Kingwel Xie (cherry picked from commit 955ee280280e09b73621119f5753a38ce5173989) --- src/plugins/dpdk/ipsec/crypto_node.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/plugins/dpdk/ipsec/crypto_node.c b/src/plugins/dpdk/ipsec/crypto_node.c index 966e86da288..9e58a525429 100644 --- a/src/plugins/dpdk/ipsec/crypto_node.c +++ b/src/plugins/dpdk/ipsec/crypto_node.c @@ -166,6 +166,10 @@ dpdk_crypto_dequeue (vlib_main_t * vm, vlib_node_runtime_t * node, res->qp_id + outbound, ops, VLIB_FRAME_SIZE); + /* no op dequeued, do not proceed */ + if (n_deq == 0) + return 0; + res->inflights[outbound] -= n_ops; dpdk_crypto_input_trace (vm, node, ops, n_deq); @@ -183,14 +187,14 @@ dpdk_crypto_dequeue (vlib_main_t * vm, vlib_node_runtime_t * node, CLIB_PREFETCH (ops[6], CLIB_CACHE_LINE_BYTES, LOAD); CLIB_PREFETCH (ops[7], CLIB_CACHE_LINE_BYTES, LOAD); - CLIB_PREFETCH (crypto_op_get_priv (ops[4]), CLIB_CACHE_LINE_BYTES, - LOAD); - CLIB_PREFETCH (crypto_op_get_priv (ops[5]), CLIB_CACHE_LINE_BYTES, - LOAD); - CLIB_PREFETCH (crypto_op_get_priv (ops[6]), CLIB_CACHE_LINE_BYTES, - LOAD); - CLIB_PREFETCH (crypto_op_get_priv (ops[7]), CLIB_CACHE_LINE_BYTES, - LOAD); + CLIB_PREFETCH (crypto_op_get_priv (ops[4]), + CLIB_CACHE_LINE_BYTES, LOAD); + CLIB_PREFETCH (crypto_op_get_priv (ops[5]), + CLIB_CACHE_LINE_BYTES, LOAD); + CLIB_PREFETCH (crypto_op_get_priv (ops[6]), + CLIB_CACHE_LINE_BYTES, LOAD); + CLIB_PREFETCH (crypto_op_get_priv (ops[7]), + CLIB_CACHE_LINE_BYTES, LOAD); } op0 = ops[0]; -- cgit 1.2.3-korg