X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fflowprobe%2Fnode.c;h=8dfc47cace96ad4e49aec0b88f2ae87e5406a1c7;hb=aaba610077c21537c775a633d7f64dad239783cb;hp=604a0a0e15db73da370bfe5a95d58e2cb999637a;hpb=ed92925f4d5535d7dd3e6de058ae90af209d5a8f;p=vpp.git

diff --git a/src/plugins/flowprobe/node.c b/src/plugins/flowprobe/node.c
index 604a0a0e15d..8dfc47cace9 100644
--- a/src/plugins/flowprobe/node.c
+++ b/src/plugins/flowprobe/node.c
@@ -73,7 +73,7 @@ format_flowprobe_trace (u8 * s, va_list * args)
   CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
   CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
   flowprobe_trace_t *t = va_arg (*args, flowprobe_trace_t *);
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   s = format (s,
 	      "FLOWPROBE[%s]: rx_sw_if_index %d, tx_sw_if_index %d, "
@@ -148,7 +148,7 @@ flowprobe_get_variant (flowprobe_variant_t which,
 /*
  * NTP rfc868 : 2 208 988 800 corresponds to 00:00  1 Jan 1970 GMT
  */
-#define NTP_TIMESTAMP 2208988800L
+#define NTP_TIMESTAMP 2208988800LU
 
 static inline u32
 flowprobe_common_add (vlib_buffer_t * to_b, flowprobe_entry_t * e, u16 offset)
@@ -157,33 +157,33 @@ flowprobe_common_add (vlib_buffer_t * to_b, flowprobe_entry_t * e, u16 offset)
 
   /* Ingress interface */
   u32 rx_if = clib_host_to_net_u32 (e->key.rx_sw_if_index);
-  clib_memcpy (to_b->data + offset, &rx_if, sizeof (rx_if));
+  clib_memcpy_fast (to_b->data + offset, &rx_if, sizeof (rx_if));
   offset += sizeof (rx_if);
 
   /* Egress interface */
   u32 tx_if = clib_host_to_net_u32 (e->key.tx_sw_if_index);
-  clib_memcpy (to_b->data + offset, &tx_if, sizeof (tx_if));
+  clib_memcpy_fast (to_b->data + offset, &tx_if, sizeof (tx_if));
   offset += sizeof (tx_if);
 
   /* packet delta count */
   u64 packetdelta = clib_host_to_net_u64 (e->packetcount);
-  clib_memcpy (to_b->data + offset, &packetdelta, sizeof (u64));
+  clib_memcpy_fast (to_b->data + offset, &packetdelta, sizeof (u64));
   offset += sizeof (u64);
 
   /* flowStartNanoseconds */
   u32 t = clib_host_to_net_u32 (e->flow_start.sec + NTP_TIMESTAMP);
-  clib_memcpy (to_b->data + offset, &t, sizeof (u32));
+  clib_memcpy_fast (to_b->data + offset, &t, sizeof (u32));
   offset += sizeof (u32);
   t = clib_host_to_net_u32 (e->flow_start.nsec);
-  clib_memcpy (to_b->data + offset, &t, sizeof (u32));
+  clib_memcpy_fast (to_b->data + offset, &t, sizeof (u32));
   offset += sizeof (u32);
 
   /* flowEndNanoseconds */
   t = clib_host_to_net_u32 (e->flow_end.sec + NTP_TIMESTAMP);
-  clib_memcpy (to_b->data + offset, &t, sizeof (u32));
+  clib_memcpy_fast (to_b->data + offset, &t, sizeof (u32));
   offset += sizeof (u32);
   t = clib_host_to_net_u32 (e->flow_end.nsec);
-  clib_memcpy (to_b->data + offset, &t, sizeof (u32));
+  clib_memcpy_fast (to_b->data + offset, &t, sizeof (u32));
   offset += sizeof (u32);
 
   return offset - start;
@@ -195,15 +195,15 @@ flowprobe_l2_add (vlib_buffer_t * to_b, flowprobe_entry_t * e, u16 offset)
   u16 start = offset;
 
   /* src mac address */
-  clib_memcpy (to_b->data + offset, &e->key.src_mac, 6);
+  clib_memcpy_fast (to_b->data + offset, &e->key.src_mac, 6);
   offset += 6;
 
   /* dst mac address */
-  clib_memcpy (to_b->data + offset, &e->key.dst_mac, 6);
+  clib_memcpy_fast (to_b->data + offset, &e->key.dst_mac, 6);
   offset += 6;
 
   /* ethertype */
-  clib_memcpy (to_b->data + offset, &e->key.ethertype, 2);
+  clib_memcpy_fast (to_b->data + offset, &e->key.ethertype, 2);
   offset += 2;
 
   return offset - start;
@@ -215,13 +215,13 @@ flowprobe_l3_ip6_add (vlib_buffer_t * to_b, flowprobe_entry_t * e, u16 offset)
   u16 start = offset;
 
   /* ip6 src address */
-  clib_memcpy (to_b->data + offset, &e->key.src_address,
-	       sizeof (ip6_address_t));
+  clib_memcpy_fast (to_b->data + offset, &e->key.src_address,
+		    sizeof (ip6_address_t));
   offset += sizeof (ip6_address_t);
 
   /* ip6 dst address */
-  clib_memcpy (to_b->data + offset, &e->key.dst_address,
-	       sizeof (ip6_address_t));
+  clib_memcpy_fast (to_b->data + offset, &e->key.dst_address,
+		    sizeof (ip6_address_t));
   offset += sizeof (ip6_address_t);
 
   /* Protocol */
@@ -229,7 +229,7 @@ flowprobe_l3_ip6_add (vlib_buffer_t * to_b, flowprobe_entry_t * e, u16 offset)
 
   /* octetDeltaCount */
   u64 octetdelta = clib_host_to_net_u64 (e->octetcount);
-  clib_memcpy (to_b->data + offset, &octetdelta, sizeof (u64));
+  clib_memcpy_fast (to_b->data + offset, &octetdelta, sizeof (u64));
   offset += sizeof (u64);
 
   return offset - start;
@@ -241,13 +241,13 @@ flowprobe_l3_ip4_add (vlib_buffer_t * to_b, flowprobe_entry_t * e, u16 offset)
   u16 start = offset;
 
   /* ip4 src address */
-  clib_memcpy (to_b->data + offset, &e->key.src_address.ip4,
-	       sizeof (ip4_address_t));
+  clib_memcpy_fast (to_b->data + offset, &e->key.src_address.ip4,
+		    sizeof (ip4_address_t));
   offset += sizeof (ip4_address_t);
 
   /* ip4 dst address */
-  clib_memcpy (to_b->data + offset, &e->key.dst_address.ip4,
-	       sizeof (ip4_address_t));
+  clib_memcpy_fast (to_b->data + offset, &e->key.dst_address.ip4,
+		    sizeof (ip4_address_t));
   offset += sizeof (ip4_address_t);
 
   /* Protocol */
@@ -255,7 +255,7 @@ flowprobe_l3_ip4_add (vlib_buffer_t * to_b, flowprobe_entry_t * e, u16 offset)
 
   /* octetDeltaCount */
   u64 octetdelta = clib_host_to_net_u64 (e->octetcount);
-  clib_memcpy (to_b->data + offset, &octetdelta, sizeof (u64));
+  clib_memcpy_fast (to_b->data + offset, &octetdelta, sizeof (u64));
   offset += sizeof (u64);
 
   return offset - start;
@@ -267,16 +267,16 @@ flowprobe_l4_add (vlib_buffer_t * to_b, flowprobe_entry_t * e, u16 offset)
   u16 start = offset;
 
   /* src port */
-  clib_memcpy (to_b->data + offset, &e->key.src_port, 2);
+  clib_memcpy_fast (to_b->data + offset, &e->key.src_port, 2);
   offset += 2;
 
   /* dst port */
-  clib_memcpy (to_b->data + offset, &e->key.dst_port, 2);
+  clib_memcpy_fast (to_b->data + offset, &e->key.dst_port, 2);
   offset += 2;
 
   /* tcp control bits */
   u16 control_bits = htons (e->prot.tcp.flags);
-  clib_memcpy (to_b->data + offset, &control_bits, 2);
+  clib_memcpy_fast (to_b->data + offset, &control_bits, 2);
   offset += 2;
 
   return offset - start;
@@ -289,10 +289,13 @@ flowprobe_hash (flowprobe_key_t * k)
   u32 h = 0;
 
 #ifdef clib_crc32c_uses_intrinsics
-  h = clib_crc32c ((u8 *) k->as_u32, FLOWPROBE_KEY_IN_U32);
+  h = clib_crc32c ((u8 *) k, sizeof (*k));
 #else
-  u64 tmp =
-    k->as_u32[0] ^ k->as_u32[1] ^ k->as_u32[2] ^ k->as_u32[3] ^ k->as_u32[4];
+  int i;
+  u64 tmp = 0;
+  for (i = 0; i < sizeof (*k) / 8; i++)
+    tmp ^= ((u64 *) k)[i];
+
   h = clib_xxhash (tmp);
 #endif
 
@@ -370,7 +373,7 @@ add_to_flow_record_state (vlib_main_t * vm, vlib_node_runtime_t * node,
   ethernet_header_t *eth = vlib_buffer_get_current (b);
   u16 ethertype = clib_net_to_host_u16 (eth->type);
   /* *INDENT-OFF* */
-  flowprobe_key_t k = { {0} };
+  flowprobe_key_t k = {};
   /* *INDENT-ON* */
   ip4_header_t *ip4 = 0;
   ip6_header_t *ip6 = 0;
@@ -391,8 +394,8 @@ add_to_flow_record_state (vlib_main_t * vm, vlib_node_runtime_t * node,
 
   if (flags & FLOW_RECORD_L2)
     {
-      clib_memcpy (k.src_mac, eth->src_address, 6);
-      clib_memcpy (k.dst_mac, eth->dst_address, 6);
+      clib_memcpy_fast (k.src_mac, eth->src_address, 6);
+      clib_memcpy_fast (k.dst_mac, eth->dst_address, 6);
       k.ethertype = ethertype;
     }
   if (collect_ip6 && ethertype == ETHERNET_TYPE_IP6)
@@ -447,8 +450,8 @@ add_to_flow_record_state (vlib_main_t * vm, vlib_node_runtime_t * node,
     {
       t->rx_sw_if_index = k.rx_sw_if_index;
       t->tx_sw_if_index = k.tx_sw_if_index;
-      clib_memcpy (t->src_mac, k.src_mac, 6);
-      clib_memcpy (t->dst_mac, k.dst_mac, 6);
+      clib_memcpy_fast (t->src_mac, k.src_mac, 6);
+      clib_memcpy_fast (t->dst_mac, k.dst_mac, 6);
       t->ethertype = k.ethertype;
       t->src_address.ip4.as_u32 = k.src_address.ip4.as_u32;
       t->dst_address.ip4.as_u32 = k.dst_address.ip4.as_u32;
@@ -472,6 +475,7 @@ add_to_flow_record_state (vlib_main_t * vm, vlib_node_runtime_t * node,
 	  if (e->packetcount)
 	    flowprobe_export_entry (vm, e);
 	  e->key = k;
+	  e->flow_start = timestamp;
 	  vlib_node_increment_counter (vm, node->node_index,
 				       FLOWPROBE_ERROR_COLLISION, 1);
 	}
@@ -627,7 +631,6 @@ flowprobe_get_buffer (vlib_main_t * vm, flowprobe_variant_t which)
   flow_report_main_t *frm = &flow_report_main;
   vlib_buffer_t *b0;
   u32 bi0;
-  vlib_buffer_free_list_t *fl;
   u32 my_cpu_number = vm->thread_index;
 
   /* Find or allocate a buffer */
@@ -646,14 +649,12 @@ flowprobe_get_buffer (vlib_main_t * vm, flowprobe_variant_t which)
       /* Initialize the buffer */
       b0 = fm->context[which].buffers_per_worker[my_cpu_number] =
 	vlib_get_buffer (vm, bi0);
-      fl =
-	vlib_buffer_get_free_list (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
-      vlib_buffer_init_for_free_list (b0, fl);
       VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
 
       b0->current_data = 0;
       b0->current_length = flowprobe_get_headersize ();
-      b0->flags |= (VLIB_BUFFER_TOTAL_LENGTH_VALID | VLIB_BUFFER_FLOW_REPORT);
+      b0->flags |=
+	(VLIB_BUFFER_TOTAL_LENGTH_VALID | VNET_BUFFER_F_FLOW_REPORT);
       vnet_buffer (b0)->sw_if_index[VLIB_RX] = 0;
       vnet_buffer (b0)->sw_if_index[VLIB_TX] = frm->fib_index;
       fm->context[which].next_record_offset_per_worker[my_cpu_number] =
@@ -769,16 +770,14 @@ flowprobe_node_fn (vlib_main_t * vm,
 	  b0 = vlib_get_buffer (vm, bi0);
 	  b1 = vlib_get_buffer (vm, bi1);
 
-	  vnet_feature_next (vnet_buffer (b0)->sw_if_index[VLIB_TX],
-			     &next0, b0);
-	  vnet_feature_next (vnet_buffer (b1)->sw_if_index[VLIB_TX],
-			     &next1, b1);
+	  vnet_feature_next (&next0, b0);
+	  vnet_feature_next (&next1, b1);
 
 	  len0 = vlib_buffer_length_in_chain (vm, b0);
 	  ethernet_header_t *eh0 = vlib_buffer_get_current (b0);
 	  u16 ethertype0 = clib_net_to_host_u16 (eh0->type);
 
-	  if (PREDICT_TRUE ((b0->flags & VLIB_BUFFER_FLOW_REPORT) == 0))
+	  if (PREDICT_TRUE ((b0->flags & VNET_BUFFER_F_FLOW_REPORT) == 0))
 	    add_to_flow_record_state (vm, node, fm, b0, timestamp, len0,
 				      flowprobe_get_variant
 				      (which, fm->context[which].flags,
@@ -788,7 +787,7 @@ flowprobe_node_fn (vlib_main_t * vm,
 	  ethernet_header_t *eh1 = vlib_buffer_get_current (b1);
 	  u16 ethertype1 = clib_net_to_host_u16 (eh1->type);
 
-	  if (PREDICT_TRUE ((b1->flags & VLIB_BUFFER_FLOW_REPORT) == 0))
+	  if (PREDICT_TRUE ((b1->flags & VNET_BUFFER_F_FLOW_REPORT) == 0))
 	    add_to_flow_record_state (vm, node, fm, b1, timestamp, len1,
 				      flowprobe_get_variant
 				      (which, fm->context[which].flags,
@@ -817,14 +816,13 @@ flowprobe_node_fn (vlib_main_t * vm,
 
 	  b0 = vlib_get_buffer (vm, bi0);
 
-	  vnet_feature_next (vnet_buffer (b0)->sw_if_index[VLIB_TX],
-			     &next0, b0);
+	  vnet_feature_next (&next0, b0);
 
 	  len0 = vlib_buffer_length_in_chain (vm, b0);
 	  ethernet_header_t *eh0 = vlib_buffer_get_current (b0);
 	  u16 ethertype0 = clib_net_to_host_u16 (eh0->type);
 
-	  if (PREDICT_TRUE ((b0->flags & VLIB_BUFFER_FLOW_REPORT) == 0))
+	  if (PREDICT_TRUE ((b0->flags & VNET_BUFFER_F_FLOW_REPORT) == 0))
 	    {
 	      flowprobe_trace_t *t = 0;
 	      if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
@@ -971,9 +969,9 @@ flowprobe_walker_process (vlib_main_t * vm,
      * entry. Otherwise restart timer with what's left
      * Premature passive timer by more than 10%
      */
-    if ((now - e->last_updated) < (fm->passive_timer * 0.9))
+    if ((now - e->last_updated) < (u64) (fm->passive_timer * 0.9))
       {
-	f64 delta = fm->passive_timer - (now - e->last_updated);
+	u64 delta = fm->passive_timer - (now - e->last_updated);
 	e->passive_timer_handle = tw_timer_start_2t_1w_2048sl
 	  (fm->timers_per_worker[cpu_index], *i, 0, delta);
       }