X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fipsec_if_in.c;h=2627e7c1ca61941f49de898fe1313cd11c0c9a41;hb=430ac939d115b59e3f7f704645c6f88878223e1b;hp=db75ab92da97e589ad3fbcbb97f8eed62ba12ef7;hpb=7cd468a3d7dee7d6c92f69a0bb7061ae208ec727;p=vpp.git

diff --git a/src/vnet/ipsec/ipsec_if_in.c b/src/vnet/ipsec/ipsec_if_in.c
index db75ab92da9..2627e7c1ca6 100644
--- a/src/vnet/ipsec/ipsec_if_in.c
+++ b/src/vnet/ipsec/ipsec_if_in.c
@@ -22,12 +22,6 @@
 #include <vnet/ipsec/ipsec.h>
 #include <vnet/ipsec/esp.h>
 
-#if DPDK_CRYPTO==1
-#define ESP_NODE "dpdk-esp-decrypt"
-#else
-#define ESP_NODE "esp-decrypt"
-#endif
-
 /* Statistics (not really errors) */
 #define foreach_ipsec_if_input_error    \
 _(RX, "good packets received")
@@ -46,12 +40,6 @@ typedef enum
     IPSEC_IF_INPUT_N_ERROR,
 } ipsec_if_input_error_t;
 
-typedef enum
-{
-  IPSEC_IF_INPUT_NEXT_ESP_DECRYPT,
-  IPSEC_IF_INPUT_NEXT_DROP,
-  IPSEC_IF_INPUT_N_NEXT,
-} ipsec_if_input_next_t;
 
 typedef struct
 {
@@ -59,7 +47,6 @@ typedef struct
   u32 seq;
 } ipsec_if_input_trace_t;
 
-
 u8 *
 format_ipsec_if_input_trace (u8 * s, va_list * args)
 {
@@ -76,8 +63,16 @@ ipsec_if_input_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 			vlib_frame_t * from_frame)
 {
   ipsec_main_t *im = &ipsec_main;
+  vnet_main_t *vnm = im->vnet_main;
+  vnet_interface_main_t *vim = &vnm->interface_main;
+  ipsec_proto_main_t *em = &ipsec_proto_main;
   u32 *from, *to_next = 0, next_index;
-  u32 n_left_from;
+  u32 n_left_from, last_sw_if_index = ~0;
+  u32 thread_index = vlib_get_thread_index ();
+  u64 n_bytes = 0, n_packets = 0;
+  u8 icv_len;
+  ipsec_tunnel_if_t *last_t = NULL;
+  ipsec_sa_t *sa0;
 
   from = vlib_frame_vector_args (from_frame);
   n_left_from = from_frame->n_vectors;
@@ -91,7 +86,7 @@ ipsec_if_input_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 
       while (n_left_from > 0 && n_left_to_next > 0)
 	{
-	  u32 bi0, next0;
+	  u32 bi0, next0, sw_if_index0;
 	  vlib_buffer_t *b0;
 	  ip4_header_t *ip0;
 	  esp_header_t *esp0;
@@ -106,7 +101,7 @@ ipsec_if_input_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 	  ip0 = vlib_buffer_get_current (b0);
 	  esp0 = (esp_header_t *) ((u8 *) ip0 + ip4_header_bytes (ip0));
 
-	  next0 = IPSEC_IF_INPUT_NEXT_DROP;
+	  next0 = IPSEC_INPUT_NEXT_DROP;
 
 	  u64 key = (u64) ip0->src_address.as_u32 << 32 |
 	    (u64) clib_net_to_host_u32 (esp0->spi);
@@ -118,10 +113,54 @@ ipsec_if_input_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 	      ipsec_tunnel_if_t *t;
 	      t = pool_elt_at_index (im->tunnel_interfaces, p[0]);
 	      vnet_buffer (b0)->ipsec.sad_index = t->input_sa_index;
-	      vnet_buffer (b0)->ipsec.flags =
-		t->hw_if_index == ~0 ? IPSEC_FLAG_IPSEC_GRE_TUNNEL : 0;
+	      if (t->hw_if_index != ~0)
+		{
+		  vnet_hw_interface_t *hi;
+
+		  vnet_buffer (b0)->ipsec.flags = 0;
+		  hi = vnet_get_hw_interface (vnm, t->hw_if_index);
+		  sw_if_index0 = hi->sw_if_index;
+		  vnet_buffer (b0)->sw_if_index[VLIB_RX] = sw_if_index0;
+
+		  if (PREDICT_TRUE (sw_if_index0 == last_sw_if_index))
+		    {
+		      n_packets++;
+		      n_bytes += vlib_buffer_length_in_chain (vm, b0);
+		    }
+		  else
+		    {
+		      sa0 = pool_elt_at_index (im->sad, t->input_sa_index);
+		      icv_len =
+			em->ipsec_proto_main_integ_algs[sa0->
+							integ_alg].trunc_size;
+
+		      /* length = packet length - ESP/tunnel overhead */
+		      n_bytes -= n_packets * (sizeof (ip4_header_t) +
+					      sizeof (esp_header_t) +
+					      sizeof (esp_footer_t) +
+					      16 /* aes-cbc IV */  + icv_len);
+
+		      if (last_t)
+			{
+			  vlib_increment_combined_counter
+			    (vim->combined_sw_if_counters
+			     + VNET_INTERFACE_COUNTER_RX,
+			     thread_index, sw_if_index0, n_packets, n_bytes);
+			}
+
+		      last_sw_if_index = sw_if_index0;
+		      last_t = t;
+		      n_packets = 1;
+		      n_bytes = vlib_buffer_length_in_chain (vm, b0);
+		    }
+		}
+	      else
+		{
+		  vnet_buffer (b0)->ipsec.flags = IPSEC_FLAG_IPSEC_GRE_TUNNEL;
+		}
+
 	      vlib_buffer_advance (b0, ip4_header_bytes (ip0));
-	      next0 = IPSEC_IF_INPUT_NEXT_ESP_DECRYPT;
+	      next0 = im->esp_decrypt_next_index;
 	    }
 
 	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
@@ -138,6 +177,20 @@ ipsec_if_input_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
       vlib_put_next_frame (vm, node, next_index, n_left_to_next);
     }
 
+  if (last_t)
+    {
+      sa0 = pool_elt_at_index (im->sad, last_t->input_sa_index);
+      icv_len = em->ipsec_proto_main_integ_algs[sa0->integ_alg].trunc_size;
+
+      n_bytes -= n_packets * (sizeof (ip4_header_t) + sizeof (esp_header_t) +
+			      sizeof (esp_footer_t) + 16 /* aes-cbc IV */  +
+			      icv_len);
+      vlib_increment_combined_counter (vim->combined_sw_if_counters
+				       + VNET_INTERFACE_COUNTER_RX,
+				       thread_index,
+				       last_sw_if_index, n_packets, n_bytes);
+    }
+
   vlib_node_increment_counter (vm, ipsec_if_input_node.index,
 			       IPSEC_IF_INPUT_ERROR_RX,
 			       from_frame->n_vectors);
@@ -156,12 +209,7 @@ VLIB_REGISTER_NODE (ipsec_if_input_node) = {
   .n_errors = ARRAY_LEN(ipsec_if_input_error_strings),
   .error_strings = ipsec_if_input_error_strings,
 
-  .n_next_nodes = IPSEC_IF_INPUT_N_NEXT,
-
-  .next_nodes = {
-	[IPSEC_IF_INPUT_NEXT_ESP_DECRYPT] = ESP_NODE,
-	[IPSEC_IF_INPUT_NEXT_DROP] = "error-drop",
-  },
+  .sibling_of = "ipsec-input-ip4",
 };
 /* *INDENT-ON* */