X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2Fipsec%2Fesp_decrypt.c;h=20040433420b79f6663e4c6b4f6b9e6be4bcc96f;hb=eba31ecebed1a7d168da17194cab7a8955761f2b;hp=d8d1d385f0f0a5dfa7a1bb655df90859f8847291;hpb=a5c308e68d5578e5d75327619e30d73a95abb1a5;p=vpp.git

diff --git a/src/plugins/dpdk/ipsec/esp_decrypt.c b/src/plugins/dpdk/ipsec/esp_decrypt.c
index d8d1d385f0f..20040433420 100644
--- a/src/plugins/dpdk/ipsec/esp_decrypt.c
+++ b/src/plugins/dpdk/ipsec/esp_decrypt.c
@@ -97,7 +97,7 @@ dpdk_esp_decrypt_inline (vlib_main_t * vm,
 			 vlib_node_runtime_t * node,
 			 vlib_frame_t * from_frame, int is_ip6)
 {
-  u32 n_left_from, *from, *to_next, next_index;
+  u32 n_left_from, *from, *to_next, next_index, thread_index;
   ipsec_main_t *im = &ipsec_main;
   u32 thread_idx = vlib_get_thread_index ();
   dpdk_crypto_main_t *dcm = &dpdk_crypto_main;
@@ -114,6 +114,7 @@ dpdk_esp_decrypt_inline (vlib_main_t * vm,
 
   from = vlib_frame_vector_args (from_frame);
   n_left_from = from_frame->n_vectors;
+  thread_index = vm->thread_index;
 
   ret = crypto_alloc_ops (numa, ops, n_left_from);
   if (ret)
@@ -165,12 +166,16 @@ dpdk_esp_decrypt_inline (vlib_main_t * vm,
 	  ASSERT (op->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED);
 
 	  dpdk_op_priv_t *priv = crypto_op_get_priv (op);
+	  /* store bi in op private */
+	  priv->bi = bi0;
 
 	  u16 op_len =
 	    sizeof (op[0]) + sizeof (op[0].sym[0]) + sizeof (priv[0]);
 	  CLIB_PREFETCH (op, op_len, STORE);
 
 	  sa_index0 = vnet_buffer (b0)->ipsec.sad_index;
+	  vlib_prefetch_combined_counter (&ipsec_sa_counters,
+					  thread_index, sa_index0);
 
 	  if (sa_index0 != last_sa_index)
 	    {
@@ -264,7 +269,9 @@ dpdk_esp_decrypt_inline (vlib_main_t * vm,
 	    priv->next = DPDK_CRYPTO_INPUT_NEXT_DECRYPT4_POST;
 
 	  /* FIXME multi-seg */
-	  sa0->total_data_size += b0->current_length;
+	  vlib_increment_combined_counter
+	    (&ipsec_sa_counters, thread_index, sa_index0,
+	     1, b0->current_length);
 
 	  res->ops[res->n_ops] = op;
 	  res->bi[res->n_ops] = bi0;
@@ -376,7 +383,7 @@ dpdk_esp_decrypt_inline (vlib_main_t * vm,
 				   ESP_DECRYPT_ERROR_RX_PKTS,
 				   from_frame->n_vectors);
 
-      crypto_enqueue_ops (vm, cwm, 0, dpdk_esp6_decrypt_node.index,
+      crypto_enqueue_ops (vm, cwm, dpdk_esp6_decrypt_node.index,
 			  ESP_DECRYPT_ERROR_ENQ_FAIL, numa);
     }
   else
@@ -385,7 +392,7 @@ dpdk_esp_decrypt_inline (vlib_main_t * vm,
 				   ESP_DECRYPT_ERROR_RX_PKTS,
 				   from_frame->n_vectors);
 
-      crypto_enqueue_ops (vm, cwm, 0, dpdk_esp4_decrypt_node.index,
+      crypto_enqueue_ops (vm, cwm, dpdk_esp4_decrypt_node.index,
 			  ESP_DECRYPT_ERROR_ENQ_FAIL, numa);
     }