X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface_output.c;h=721236a777f1d9480a48e542099a19f3b6ff44dd;hb=4da1506d39eb8f67ed2c48c76916bb6bcca6fbf1;hp=593457c10cf9595e4940a0d847216c8a69cea82c;hpb=08f2a5dae9663eafa09685ebebf672aa6b0b7ae0;p=vpp.git

diff --git a/src/vnet/interface_output.c b/src/vnet/interface_output.c
index 593457c10cf..721236a777f 100644
--- a/src/vnet/interface_output.c
+++ b/src/vnet/interface_output.c
@@ -43,6 +43,7 @@
 #include <vnet/ip/ip6.h>
 #include <vnet/udp/udp_packet.h>
 #include <vnet/feature/feature.h>
+#include <vnet/classify/trace_classify.h>
 
 typedef struct
 {
@@ -232,13 +233,14 @@ calc_checksums (vlib_main_t * vm, vlib_buffer_t * b)
 static_always_inline u16
 tso_alloc_tx_bufs (vlib_main_t * vm,
 		   vnet_interface_per_thread_data_t * ptd,
-		   vlib_buffer_t * b0, u16 l4_hdr_sz)
+		   vlib_buffer_t * b0, u32 n_bytes_b0, u16 l234_sz,
+		   u16 gso_size)
 {
-  u32 n_bytes_b0 = vlib_buffer_length_in_chain (vm, b0);
-  u16 gso_size = vnet_buffer2 (b0)->gso_size;
-  u16 l234_sz = vnet_buffer (b0)->l4_hdr_offset + l4_hdr_sz;
+  u16 size =
+    clib_min (gso_size, vlib_buffer_get_default_data_size (vm) - l234_sz);
+
   /* rounded-up division */
-  u16 n_bufs = (n_bytes_b0 - l234_sz + (gso_size - 1)) / gso_size;
+  u16 n_bufs = (n_bytes_b0 - l234_sz + (size - 1)) / size;
   u16 n_alloc;
 
   ASSERT (n_bufs > 0);
@@ -250,18 +252,19 @@ tso_alloc_tx_bufs (vlib_main_t * vm,
       vlib_buffer_free (vm, ptd->split_buffers, n_alloc);
       return 0;
     }
-  return 1;
+  return n_alloc;
 }
 
 static_always_inline void
 tso_init_buf_from_template_base (vlib_buffer_t * nb0, vlib_buffer_t * b0,
 				 u32 flags, u16 length)
 {
-  nb0->current_data = 0;
+  nb0->current_data = b0->current_data;
   nb0->total_length_not_including_first_buffer = 0;
   nb0->flags = VLIB_BUFFER_TOTAL_LENGTH_VALID | flags;
   clib_memcpy_fast (&nb0->opaque, &b0->opaque, sizeof (nb0->opaque));
-  clib_memcpy_fast (nb0->data, b0->data, length);
+  clib_memcpy_fast (vlib_buffer_get_current (nb0),
+		    vlib_buffer_get_current (b0), length);
   nb0->current_length = length;
 }
 
@@ -275,8 +278,9 @@ tso_init_buf_from_template (vlib_main_t * vm, vlib_buffer_t * nb0,
 
   *p_dst_left =
     clib_min (gso_size,
-	      vlib_buffer_get_default_data_size (vm) - template_data_sz);
-  *p_dst_ptr = nb0->data + template_data_sz;
+	      vlib_buffer_get_default_data_size (vm) - (template_data_sz +
+							nb0->current_data));
+  *p_dst_ptr = vlib_buffer_get_current (nb0) + template_data_sz;
 
   tcp_header_t *tcp =
     (tcp_header_t *) (nb0->data + vnet_buffer (nb0)->l4_hdr_offset);
@@ -297,11 +301,11 @@ tso_fixup_segmented_buf (vlib_buffer_t * b0, u8 tcp_flags, int is_ip6)
   if (is_ip6)
     ip6->payload_length =
       clib_host_to_net_u16 (b0->current_length -
-			    vnet_buffer (b0)->l4_hdr_offset);
+			    (l4_hdr_offset - b0->current_data));
   else
     ip4->length =
       clib_host_to_net_u16 (b0->current_length -
-			    vnet_buffer (b0)->l3_hdr_offset);
+			    (l3_hdr_offset - b0->current_data));
 }
 
 /**
@@ -342,11 +346,13 @@ tso_segment_buffer (vlib_main_t * vm, vnet_interface_per_thread_data_t * ptd,
 
   u32 default_bflags =
     sb0->flags & ~(VNET_BUFFER_F_GSO | VLIB_BUFFER_NEXT_PRESENT);
-  u16 l234_sz = vnet_buffer (sb0)->l4_hdr_offset + l4_hdr_sz;
+  u16 l234_sz = vnet_buffer (sb0)->l4_hdr_offset + l4_hdr_sz
+    - sb0->current_data;
   int first_data_size = clib_min (gso_size, sb0->current_length - l234_sz);
   next_tcp_seq += first_data_size;
 
-  if (PREDICT_FALSE (!tso_alloc_tx_bufs (vm, ptd, sb0, l4_hdr_sz)))
+  if (PREDICT_FALSE
+      (!tso_alloc_tx_bufs (vm, ptd, sb0, n_bytes_b0, l234_sz, gso_size)))
     return 0;
 
   vlib_buffer_t *b0 = vlib_get_buffer (vm, ptd->split_buffers[0]);
@@ -366,9 +372,8 @@ tso_segment_buffer (vlib_main_t * vm, vnet_interface_per_thread_data_t * ptd,
       vlib_buffer_t *cdb0;
       u16 dbi = 1;		/* the buffer [0] is b0 */
 
-      src_ptr = sb0->data + l234_sz + first_data_size;
+      src_ptr = vlib_buffer_get_current (sb0) + l234_sz + first_data_size;
       src_left = sb0->current_length - l234_sz - first_data_size;
-      b0->current_length = l234_sz + first_data_size;
 
       tso_fixup_segmented_buf (b0, tcp_flags_no_fin_psh, is_ip6);
       if (do_tx_offloads)
@@ -502,8 +507,7 @@ vnet_interface_output_node_inline_gso (vlib_main_t * vm,
 
   si = vnet_get_sw_interface (vnm, rt->sw_if_index);
   hi = vnet_get_sup_hw_interface (vnm, rt->sw_if_index);
-  if (!(si->flags & (VNET_SW_INTERFACE_FLAG_ADMIN_UP |
-		     VNET_SW_INTERFACE_FLAG_BOND_SLAVE)) ||
+  if (!(si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ||
       !(hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP))
     {
       vlib_simple_counter_main_t *cm;
@@ -810,13 +814,29 @@ static_always_inline void vnet_interface_pcap_tx_trace
   else
     sw_if_index = ~0;
 
+  vnet_main_t *vnm = vnet_get_main ();
   n_left_from = frame->n_vectors;
   from = vlib_frame_vector_args (frame);
 
   while (n_left_from > 0)
     {
+      int classify_filter_result;
       u32 bi0 = from[0];
       vlib_buffer_t *b0 = vlib_get_buffer (vm, bi0);
+      from++;
+      n_left_from--;
+
+      if (vec_len (vnm->classify_filter_table_indices))
+	{
+	  classify_filter_result =
+	    vnet_is_packet_traced_inline
+	    (b0, vnm->classify_filter_table_indices[0],
+	     0 /* full classify */ );
+	  if (classify_filter_result)
+	    pcap_add_buffer (&vlib_global_main.pcap[VLIB_TX].pcap_main, vm,
+			     bi0, 512);
+	  continue;
+	}
 
       if (sw_if_index_from_buffer)
 	sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX];
@@ -825,8 +845,6 @@ static_always_inline void vnet_interface_pcap_tx_trace
 	  vlib_global_main.pcap[VLIB_TX].pcap_sw_if_index == sw_if_index)
 	pcap_add_buffer (&vlib_global_main.pcap[VLIB_TX].pcap_main, vm, bi0,
 			 512);
-      from++;
-      n_left_from--;
     }
 }
 
@@ -1189,8 +1207,19 @@ pcap_drop_trace (vlib_main_t * vm,
 
 	  /*
 	   * Typically, we'll need to rewind the buffer
+	   * if l2_hdr_offset is valid, make sure to rewind to the start of
+	   * the L2 header. This may not be the buffer start in case we pop-ed
+	   * vlan tags.
+	   * Otherwise, rewind to buffer start and hope for the best.
 	   */
-	  if (b0->current_data > 0)
+	  if (b0->flags & VNET_BUFFER_F_L2_HDR_OFFSET_VALID)
+	    {
+	      if (b0->current_data > vnet_buffer (b0)->l2_hdr_offset)
+		vlib_buffer_advance (b0,
+				     vnet_buffer (b0)->l2_hdr_offset -
+				     b0->current_data);
+	    }
+	  else if (b0->current_data > 0)
 	    vlib_buffer_advance (b0, (word) - b0->current_data);
 
 	  pcap_add_buffer (&im->pcap_main, vm, bi0, 512);
@@ -1314,7 +1343,7 @@ interface_tx_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 }
 
 /* *INDENT-OFF* */
-VLIB_REGISTER_NODE (interface_tx, static) = {
+VLIB_REGISTER_NODE (interface_tx) = {
   .function = interface_tx_node_fn,
   .name = "interface-tx",
   .vector_size = sizeof (u32),
@@ -1438,6 +1467,8 @@ pcap_drop_trace_command_fn (vlib_main_t * vm,
 		  im->pcap_main.n_packets_to_capture =
 		    im->pcap_main.n_packets_captured;
 		  error = pcap_write (&im->pcap_main);
+		  if (im->pcap_main.flags & PCAP_MAIN_INIT_DONE)
+		    pcap_close (&im->pcap_main);
 		  if (error)
 		    clib_error_report (error);
 		  else