docs: vnet comment nitfixes

[vpp.git] / src / vnet / ethernet / node.c

diff --git a/src/vnet/ethernet/node.c b/src/vnet/ethernet/node.c
index 73e9eec..214e688 100644 (file)
--- a/src/vnet/ethernet/node.c
+++ b/src/vnet/ethernet/node.c
@@ -44,7 +44,7 @@
 #include <vnet/devices/pipe/pipe.h>
 #include <vppinfra/sparse_vec.h>
 #include <vnet/l2/l2_bvi.h>
-#include <vnet/classify/trace_classify.h>
+#include <vnet/classify/pcap_classify.h>
 
 #define foreach_ethernet_input_next            \
   _ (PUNT, "error-punt")                       \
@@ -694,9 +694,11 @@ ethernet_input_inline_dmac_check (vnet_hw_interface_t * hi,
                                  u32 n_packets, ethernet_interface_t * ei,
                                  u8 have_sec_dmac)
 {
-  u64 hwaddr = (*(u64 *) hi->hw_address) & DMAC_MASK;
+  u64 hwaddr = ei->address.as_u64;
   u8 bad = 0;
 
+  ASSERT (0 == ei->address.zero);
+
   dmacs_bad[0] = is_dmac_bad (dmacs[0], hwaddr);
   dmacs_bad[1] = ((n_packets > 1) & is_dmac_bad (dmacs[1], hwaddr));
 
@@ -704,11 +706,12 @@ ethernet_input_inline_dmac_check (vnet_hw_interface_t * hi,
 
   if (PREDICT_FALSE (bad && have_sec_dmac))
     {
-      mac_address_t *sec_addr;
+      ethernet_interface_address_t *sec_addr;
 
       vec_foreach (sec_addr, ei->secondary_addrs)
       {
-       hwaddr = (*(u64 *) sec_addr) & DMAC_MASK;
+       ASSERT (0 == sec_addr->zero);
+       hwaddr = sec_addr->as_u64;
 
        bad = (eth_input_sec_dmac_check_x1 (hwaddr, dmacs, dmacs_bad) |
               eth_input_sec_dmac_check_x1 (hwaddr, dmacs + 1,
@@ -726,12 +729,14 @@ eth_input_process_frame_dmac_check (vnet_hw_interface_t * hi,
                                    u32 n_packets, ethernet_interface_t * ei,
                                    u8 have_sec_dmac)
 {
-  u64 hwaddr = (*(u64 *) hi->hw_address) & DMAC_MASK;
+  u64 hwaddr = ei->address.as_u64;
   u64 *dmac = dmacs;
   u8 *dmac_bad = dmacs_bad;
   u32 bad = 0;
   i32 n_left = n_packets;
 
+  ASSERT (0 == ei->address.zero);
+
 #ifdef CLIB_HAVE_VEC256
   while (n_left > 0)
     {
@@ -760,15 +765,17 @@ eth_input_process_frame_dmac_check (vnet_hw_interface_t * hi,
 
   if (have_sec_dmac && bad)
     {
-      mac_address_t *addr;
+      ethernet_interface_address_t *addr;
 
       vec_foreach (addr, ei->secondary_addrs)
       {
-       u64 hwaddr = ((u64 *) addr)[0] & DMAC_MASK;
+       u64 hwaddr = addr->as_u64;
        i32 n_left = n_packets;
        u64 *dmac = dmacs;
        u8 *dmac_bad = dmacs_bad;
 
+       ASSERT (0 == addr->zero);
+
        bad = 0;
 
        while (n_left > 0)
@@ -1124,6 +1131,7 @@ static_always_inline void
 ethernet_input_trace (vlib_main_t * vm, vlib_node_runtime_t * node,
                      vlib_frame_t * from_frame)
 {
+  vnet_main_t *vnm = vnet_get_main ();
   u32 *from, n_left;
   if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
     {
@@ -1152,48 +1160,22 @@ ethernet_input_trace (vlib_main_t * vm, vlib_node_runtime_t * node,
     }
 
   /* rx pcap capture if enabled */
-  if (PREDICT_FALSE (vlib_global_main.pcap.pcap_rx_enable))
+  if (PREDICT_FALSE (vnm->pcap.pcap_rx_enable))
     {
       u32 bi0;
-      vnet_pcap_t *pp = &vlib_global_main.pcap;
+      vnet_pcap_t *pp = &vnm->pcap;
 
       from = vlib_frame_vector_args (from_frame);
       n_left = from_frame->n_vectors;
       while (n_left > 0)
        {
-         int classify_filter_result;
          vlib_buffer_t *b0;
          bi0 = from[0];
          from++;
          n_left--;
          b0 = vlib_get_buffer (vm, bi0);
-         if (pp->filter_classify_table_index != ~0)
-           {
-             classify_filter_result =
-               vnet_is_packet_traced_inline
-               (b0, pp->filter_classify_table_index, 0 /* full classify */ );
-             if (classify_filter_result)
-               pcap_add_buffer (&pp->pcap_main, vm, bi0,
-                                pp->max_bytes_per_pkt);
-             continue;
-           }
-
-         if (pp->pcap_sw_if_index == 0 ||
-             pp->pcap_sw_if_index == vnet_buffer (b0)->sw_if_index[VLIB_RX])
-           {
-             vnet_main_t *vnm = vnet_get_main ();
-             vnet_hw_interface_t *hi =
-               vnet_get_sup_hw_interface
-               (vnm, vnet_buffer (b0)->sw_if_index[VLIB_RX]);
-
-             /* Capture pkt if not filtered, or if filter hits */
-             if (hi->trace_classify_table_index == ~0 ||
-                 vnet_is_packet_traced_inline
-                 (b0, hi->trace_classify_table_index,
-                  0 /* full classify */ ))
-               pcap_add_buffer (&pp->pcap_main, vm, bi0,
-                                pp->max_bytes_per_pkt);
-           }
+         if (vnet_is_packet_pcaped (pp, b0, ~0))
+           pcap_add_buffer (&pp->pcap_main, vm, bi0, pp->max_bytes_per_pkt);
        }
     }
 }
@@ -1333,7 +1315,7 @@ ethernet_input_inline (vlib_main_t * vm,
                }
              else
                {
-                 if (ei->flags & ETHERNET_INTERFACE_FLAG_STATUS_L3)
+                 if (ei && (ei->flags & ETHERNET_INTERFACE_FLAG_STATUS_L3))
                    goto skip_dmac_check01;
 
                  dmacs[0] = *(u64 *) e0;
@@ -1523,7 +1505,7 @@ ethernet_input_inline (vlib_main_t * vm,
          if (n_left_from > 1)
            {
              vlib_prefetch_buffer_header (b[1], STORE);
-             CLIB_PREFETCH (b[1]->data, CLIB_CACHE_LINE_BYTES, LOAD);
+             clib_prefetch_load (b[1]->data);
            }
 
          bi0 = from[0];
@@ -1577,7 +1559,7 @@ ethernet_input_inline (vlib_main_t * vm,
                }
              else
                {
-                 if (ei->flags & ETHERNET_INTERFACE_FLAG_STATUS_L3)
+                 if (ei && ei->flags & ETHERNET_INTERFACE_FLAG_STATUS_L3)
                    goto skip_dmac_check0;
 
                  dmacs[0] = *(u64 *) e0;
@@ -1915,7 +1897,7 @@ ethernet_sw_interface_get_config (vnet_main_t * vnm,
            }
          else
            {
-             // a specific outer + specifc innner vlan id, a common case
+             // a specific outer + specific innner vlan id, a common case
 
              // get the qinq table
              if (vlan_table->vlans[si->sub.eth.outer_vlan_id].qinqs == 0)
@@ -2254,6 +2236,17 @@ next_by_ethertype_register (next_by_ethertype_t * l3_next,
   return 0;
 }
 
+void
+ethernet_setup_node (vlib_main_t *vm, u32 node_index)
+{
+  vlib_node_t *n = vlib_get_node (vm, node_index);
+  pg_node_t *pn = pg_get_node (node_index);
+
+  n->format_buffer = format_ethernet_header_with_length;
+  n->unformat_buffer = unformat_ethernet_header;
+  pn->unformat_edit = unformat_pg_ethernet_header;
+}
+
 void
 ethernet_input_init (vlib_main_t * vm, ethernet_main_t * em)
 {