sctp: move to plugins, disabled by default
[vpp.git] / src / vnet / interface.h
index 62fdc60..c6400ce 100644 (file)
 #ifndef included_vnet_interface_h
 #define included_vnet_interface_h
 
-#include <vnet/unix/pcap.h>
+#include <vlib/vlib.h>
+#include <vppinfra/pcap.h>
 #include <vnet/l3_types.h>
 
 struct vnet_main_t;
 struct vnet_hw_interface_t;
 struct vnet_sw_interface_t;
-struct ip46_address_t;
+union ip46_address_t_;
 
 typedef enum
 {
@@ -69,13 +70,33 @@ typedef clib_error_t *(vnet_subif_add_del_function_t)
 
 /* Interface set mac address callback. */
 typedef clib_error_t *(vnet_interface_set_mac_address_function_t)
-  (struct vnet_hw_interface_t * hi, char *address);
+  (struct vnet_hw_interface_t * hi,
+   const u8 * old_address, const u8 * new_address);
 
 /* Interface set rx mode callback. */
 typedef clib_error_t *(vnet_interface_set_rx_mode_function_t)
   (struct vnet_main_t * vnm, u32 if_index, u32 queue_id,
    vnet_hw_interface_rx_mode mode);
 
+/* Interface set l2 mode callback. */
+typedef clib_error_t *(vnet_interface_set_l2_mode_function_t)
+  (struct vnet_main_t * vnm, struct vnet_hw_interface_t * hi,
+   i32 l2_if_adjust);
+
+typedef enum
+{
+  VNET_FLOW_DEV_OP_ADD_FLOW,
+  VNET_FLOW_DEV_OP_DEL_FLOW,
+  VNET_FLOW_DEV_OP_GET_COUNTER,
+  VNET_FLOW_DEV_OP_RESET_COUNTER,
+} vnet_flow_dev_op_t;
+
+/* Interface flow operations callback. */
+typedef int (vnet_flow_dev_ops_function_t) (struct vnet_main_t * vnm,
+                                           vnet_flow_dev_op_t op,
+                                           u32 hw_if_index, u32 index,
+                                           uword * private_data);
+
 typedef enum vnet_interface_function_priority_t_
 {
   VNET_ITF_FUNC_PRIORITY_LOW,
@@ -89,6 +110,7 @@ typedef struct _vnet_interface_function_list_elt
   clib_error_t *(*fp) (struct vnet_main_t * vnm, u32 if_index, u32 flags);
 } _vnet_interface_function_list_elt_t;
 
+#ifndef CLIB_MARCH_VARIANT
 #define _VNET_INTERFACE_FUNCTION_DECL_PRIO(f,tag,p)                    \
                                                                         \
 static void __vnet_interface_function_init_##tag##_##f (void)           \
@@ -101,7 +123,38 @@ static void __vnet_interface_function_init_##tag##_##f (void)           \
  init_function.next_interface_function = vnm->tag##_functions[p];       \
  vnm->tag##_functions[p] = &init_function;                              \
  init_function.fp = (void *) &f;                                        \
+}                                                                       \
+static void __vnet_interface_function_deinit_##tag##_##f (void)         \
+    __attribute__((__destructor__)) ;                                   \
+                                                                        \
+static void __vnet_interface_function_deinit_##tag##_##f (void)         \
+{                                                                       \
+ vnet_main_t * vnm = vnet_get_main();                                   \
+ _vnet_interface_function_list_elt_t *next;                             \
+ if (vnm->tag##_functions[p]->fp == f)                                  \
+    {                                                                   \
+      vnm->tag##_functions[p] =                                         \
+        vnm->tag##_functions[p]->next_interface_function;               \
+      return;                                                           \
+    }                                                                   \
+  next = vnm->tag##_functions[p];                                       \
+  while (next->next_interface_function)                                 \
+    {                                                                   \
+      if (next->next_interface_function->fp == f)                       \
+        {                                                               \
+          next->next_interface_function =                               \
+            next->next_interface_function->next_interface_function;     \
+          return;                                                       \
+        }                                                               \
+      next = next->next_interface_function;                             \
+    }                                                                   \
 }
+#else
+/* create unused pointer to silence compiler warnings and get whole
+   function optimized out */
+#define _VNET_INTERFACE_FUNCTION_DECL_PRIO(f,tag,p)                    \
+static __clib_unused void * __clib_unused_##f = f;
+#endif
 
 #define _VNET_INTERFACE_FUNCTION_DECL(f,tag)                            \
   _VNET_INTERFACE_FUNCTION_DECL_PRIO(f,tag,VNET_ITF_FUNC_PRIORITY_LOW)
@@ -110,8 +163,10 @@ static void __vnet_interface_function_init_##tag##_##f (void)           \
   _VNET_INTERFACE_FUNCTION_DECL(f,hw_interface_add_del)
 #define VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION(f)             \
   _VNET_INTERFACE_FUNCTION_DECL(f,hw_interface_link_up_down)
-#define VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION_PRIO(f,p)        \
+#define VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION_PRIO(f,p)       \
   _VNET_INTERFACE_FUNCTION_DECL_PRIO(f,hw_interface_link_up_down,p)
+#define VNET_SW_INTERFACE_MTU_CHANGE_FUNCTION(f)                \
+  _VNET_INTERFACE_FUNCTION_DECL(f,sw_interface_mtu_change)
 #define VNET_SW_INTERFACE_ADD_DEL_FUNCTION(f)                  \
   _VNET_INTERFACE_FUNCTION_DECL(f,sw_interface_add_del)
 #define VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION(f)            \
@@ -119,6 +174,14 @@ static void __vnet_interface_function_init_##tag##_##f (void)           \
 #define VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION_PRIO(f,p)             \
   _VNET_INTERFACE_FUNCTION_DECL_PRIO(f,sw_interface_admin_up_down, p)
 
+/**
+ * Tunnel description parameters
+ */
+typedef int (*vnet_dev_class_ip_tunnel_desc_t) (u32 sw_if_index,
+                                               union ip46_address_t_ * src,
+                                               union ip46_address_t_ * dst,
+                                               u8 * is_l2);
+
 /* A class of hardware interface devices. */
 typedef struct _vnet_device_class
 {
@@ -140,12 +203,18 @@ typedef struct _vnet_device_class
   /* Function to call interface rx mode is changed */
   vnet_interface_set_rx_mode_function_t *rx_mode_change_function;
 
+  /* Function to call interface l2 mode is changed */
+  vnet_interface_set_l2_mode_function_t *set_l2_mode_function;
+
   /* Redistribute flag changes/existence of this interface class. */
   u32 redistribute;
 
   /* Transmit function. */
   vlib_node_function_t *tx_function;
 
+  /* Transmit function candidate registration with priority */
+  vlib_node_fn_registration_t *tx_fn_registrations;
+
   /* Error strings indexed by error code for this node. */
   char **tx_function_error_strings;
 
@@ -156,6 +225,9 @@ typedef struct _vnet_device_class
   int (*name_renumber) (struct vnet_hw_interface_t * hi,
                        u32 new_dev_instance);
 
+  /* Interface flow offload operations */
+  vnet_flow_dev_ops_function_t *flow_ops_function;
+
   /* Format device instance as name. */
   format_function_t *format_device_name;
 
@@ -168,6 +240,11 @@ typedef struct _vnet_device_class
   /* Trace buffer format for TX function. */
   format_function_t *format_tx_trace;
 
+  /* Format flow offload entry */
+  format_function_t *format_flow;
+
+  vnet_dev_class_ip_tunnel_desc_t ip_tun_desc;
+
   /* Function to clear hardware counters for device. */
   void (*clear_counters) (u32 dev_class_instance);
 
@@ -190,6 +267,7 @@ typedef struct _vnet_device_class
   vnet_interface_set_mac_address_function_t *mac_addr_change_function;
 } vnet_device_class_t;
 
+#ifndef CLIB_MARCH_VARIANT
 #define VNET_DEVICE_CLASS(x,...)                                        \
   __VA_ARGS__ vnet_device_class_t x;                                    \
 static void __vnet_add_device_class_registration_##x (void)             \
@@ -200,33 +278,40 @@ static void __vnet_add_device_class_registration_##x (void)             \
     x.next_class_registration = vnm->device_class_registrations;        \
     vnm->device_class_registrations = &x;                               \
 }                                                                       \
+static void __vnet_rm_device_class_registration_##x (void)              \
+    __attribute__((__destructor__)) ;                                   \
+static void __vnet_rm_device_class_registration_##x (void)              \
+{                                                                       \
+    vnet_main_t * vnm = vnet_get_main();                                \
+    VLIB_REMOVE_FROM_LINKED_LIST (vnm->device_class_registrations,      \
+                                  &x, next_class_registration);         \
+}                                                                       \
 __VA_ARGS__ vnet_device_class_t x
-
-#define VLIB_DEVICE_TX_FUNCTION_CLONE_TEMPLATE(arch, fn, tgt)          \
-  uword                                                                        \
-  __attribute__ ((flatten))                                            \
-  __attribute__ ((target (tgt)))                                       \
-  CLIB_CPU_OPTIMIZED                                                   \
-  fn ## _ ## arch ( vlib_main_t * vm,                                  \
-                   vlib_node_runtime_t * node,                         \
-                   vlib_frame_t * frame)                               \
-  { return fn (vm, node, frame); }
-
-#define VLIB_DEVICE_TX_FUNCTION_MULTIARCH_CLONE(fn)                    \
-  foreach_march_variant(VLIB_DEVICE_TX_FUNCTION_CLONE_TEMPLATE, fn)
-
-#if CLIB_DEBUG > 0
-#define VLIB_MULTIARCH_CLONE_AND_SELECT_FN(fn,...)
-#define VLIB_DEVICE_TX_FUNCTION_MULTIARCH(dev, fn)
 #else
-#define VLIB_DEVICE_TX_FUNCTION_MULTIARCH(dev, fn)                     \
-  VLIB_DEVICE_TX_FUNCTION_MULTIARCH_CLONE(fn)                          \
-  CLIB_MULTIARCH_SELECT_FN(fn, static inline)                          \
-  static void __attribute__((__constructor__))                         \
-  __vlib_device_tx_function_multiarch_select_##dev (void)              \
-  { dev.tx_function = fn ## _multiarch_select(); }
+/* create unused pointer to silence compiler warnings and get whole
+   function optimized out */
+#define VNET_DEVICE_CLASS(x,...)                                        \
+static __clib_unused vnet_device_class_t __clib_unused_##x
 #endif
 
+#define VNET_DEVICE_CLASS_TX_FN(devclass)                              \
+uword CLIB_MARCH_SFX (devclass##_tx_fn)();                             \
+static vlib_node_fn_registration_t                                     \
+  CLIB_MARCH_SFX(devclass##_tx_fn_registration) =                      \
+  { .function = &CLIB_MARCH_SFX (devclass##_tx_fn), };                 \
+                                                                       \
+static void __clib_constructor                                         \
+CLIB_MARCH_SFX (devclass##_tx_fn_multiarch_register) (void)            \
+{                                                                      \
+  extern vnet_device_class_t devclass;                                 \
+  vlib_node_fn_registration_t *r;                                      \
+  r = &CLIB_MARCH_SFX (devclass##_tx_fn_registration);                 \
+  r->priority = CLIB_MARCH_FN_PRIORITY();                              \
+  r->next_registration = devclass.tx_fn_registrations;                 \
+  devclass.tx_fn_registrations = r;                                    \
+}                                                                      \
+uword CLIB_CPU_OPTIMIZED CLIB_MARCH_SFX (devclass##_tx_fn)
+
 /**
  * Link Type: A description of the protocol of packets on the link.
  * On an ethernet link this maps directly into the ethertype. On a GRE tunnel
@@ -255,6 +340,11 @@ typedef enum vnet_link_t_
     [VNET_LINK_NSH] = "nsh",           \
 }
 
+#define FOR_EACH_VNET_LINK(_link)    \
+  for (_link = VNET_LINK_IP4;        \
+       _link <= VNET_LINK_NSH;       \
+       _link++)
+
 /**
  * @brief Number of link types. Not part of the enum so it does not have to be included in
  * switch statements
@@ -325,7 +415,7 @@ typedef struct _vnet_hw_interface_class
                        u32 sw_if_index,
                        vnet_link_t link_type, const void *dst_hw_address);
 
-  /* Update an adjacecny added by FIB (as opposed to via the
+  /* Update an adjacency added by FIB (as opposed to via the
    * neighbour resolution protocol). */
   void (*update_adjacency) (struct vnet_main_t * vnm,
                            u32 sw_if_index, u32 adj_index);
@@ -368,59 +458,54 @@ static void __vnet_add_hw_interface_class_registration_##x (void)       \
     x.next_class_registration = vnm->hw_interface_class_registrations;  \
     vnm->hw_interface_class_registrations = &x;                         \
 }                                                                       \
+static void __vnet_rm_hw_interface_class_registration_##x (void)        \
+    __attribute__((__destructor__)) ;                                   \
+static void __vnet_rm_hw_interface_class_registration_##x (void)        \
+{                                                                       \
+    vnet_main_t * vnm = vnet_get_main();                                \
+    VLIB_REMOVE_FROM_LINKED_LIST (vnm->hw_interface_class_registrations,\
+                                  &x, next_class_registration);         \
+}                                                                       \
 __VA_ARGS__ vnet_hw_interface_class_t x
 
-/* Hardware-interface.  This corresponds to a physical wire
-   that packets flow over. */
-typedef struct vnet_hw_interface_t
+typedef enum vnet_hw_interface_flags_t_
 {
-  /* Interface name. */
-  u8 *name;
-
-  u32 flags;
+  VNET_HW_INTERFACE_FLAG_NONE,
   /* Hardware link state is up. */
-#define VNET_HW_INTERFACE_FLAG_LINK_UP         (1 << 0)
+  VNET_HW_INTERFACE_FLAG_LINK_UP = (1 << 0),
   /* Hardware duplex state */
-#define VNET_HW_INTERFACE_FLAG_DUPLEX_SHIFT    1
-#define VNET_HW_INTERFACE_FLAG_HALF_DUPLEX     (1 << 1)
-#define VNET_HW_INTERFACE_FLAG_FULL_DUPLEX     (1 << 2)
+  VNET_HW_INTERFACE_FLAG_HALF_DUPLEX = (1 << 1),
+  VNET_HW_INTERFACE_FLAG_FULL_DUPLEX = (1 << 2),
+
+  /* rx mode flags */
+  VNET_HW_INTERFACE_FLAG_SUPPORTS_INT_MODE = (1 << 16),
+
+  /* tx checksum offload */
+  VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD = (1 << 17),
+
+  /* gso */
+  VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO = (1 << 18),
+} vnet_hw_interface_flags_t;
+
+#define VNET_HW_INTERFACE_FLAG_DUPLEX_SHIFT 1
+#define VNET_HW_INTERFACE_FLAG_SPEED_SHIFT  3
 #define VNET_HW_INTERFACE_FLAG_DUPLEX_MASK     \
   (VNET_HW_INTERFACE_FLAG_HALF_DUPLEX |                \
    VNET_HW_INTERFACE_FLAG_FULL_DUPLEX)
 
-  /* Hardware link speed */
-#define VNET_HW_INTERFACE_FLAG_SPEED_SHIFT     3
-#define VNET_HW_INTERFACE_FLAG_SPEED_10M       (1 << 3)
-#define VNET_HW_INTERFACE_FLAG_SPEED_100M      (1 << 4)
-#define VNET_HW_INTERFACE_FLAG_SPEED_1G                (1 << 5)
-#define VNET_HW_INTERFACE_FLAG_SPEED_2_5G      (1 << 6)
-#define VNET_HW_INTERFACE_FLAG_SPEED_5G                (1 << 7)
-#define VNET_HW_INTERFACE_FLAG_SPEED_10G       (1 << 8)
-#define VNET_HW_INTERFACE_FLAG_SPEED_20G       (1 << 9)
-#define VNET_HW_INTERFACE_FLAG_SPEED_25G       (1 << 10)
-#define VNET_HW_INTERFACE_FLAG_SPEED_40G       (1 << 11)
-#define VNET_HW_INTERFACE_FLAG_SPEED_50G       (1 << 12)
-#define VNET_HW_INTERFACE_FLAG_SPEED_56G       (1 << 13)
-#define VNET_HW_INTERFACE_FLAG_SPEED_100G      (1 << 14)
-#define VNET_HW_INTERFACE_FLAG_SPEED_MASK      \
-  (VNET_HW_INTERFACE_FLAG_SPEED_10M |          \
-   VNET_HW_INTERFACE_FLAG_SPEED_100M |         \
-   VNET_HW_INTERFACE_FLAG_SPEED_1G |           \
-   VNET_HW_INTERFACE_FLAG_SPEED_2_5G |         \
-   VNET_HW_INTERFACE_FLAG_SPEED_5G |           \
-   VNET_HW_INTERFACE_FLAG_SPEED_10G |          \
-   VNET_HW_INTERFACE_FLAG_SPEED_20G |          \
-   VNET_HW_INTERFACE_FLAG_SPEED_25G |          \
-   VNET_HW_INTERFACE_FLAG_SPEED_40G |          \
-   VNET_HW_INTERFACE_FLAG_SPEED_50G |          \
-   VNET_HW_INTERFACE_FLAG_SPEED_56G |          \
-   VNET_HW_INTERFACE_FLAG_SPEED_100G)
+/* Hardware-interface.  This corresponds to a physical wire
+   that packets flow over. */
+typedef struct vnet_hw_interface_t
+{
+  /* Interface name. */
+  u8 *name;
 
-  /* rx mode flags */
-#define VNET_HW_INTERFACE_FLAG_SUPPORTS_INT_MODE (1 << 16)
+  /* flags */
+  vnet_hw_interface_flags_t flags;
 
-  /* tx checksum offload */
-#define VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD (1 << 17)
+
+  /* link speed in kbps */
+  u32 link_speed;
 
   /* Hardware address as vector.  Zero (e.g. zero-length vector) if no
      address for this class (e.g. PPP). */
@@ -463,14 +548,6 @@ typedef struct vnet_hw_interface_t
   /* Largest packet size for this interface. */
   u32 max_packet_bytes;
 
-  /* Number of extra bytes that go on the wire.
-     Packet length on wire
-     = max (length + per_packet_overhead_bytes, min_packet_bytes). */
-  u32 per_packet_overhead_bytes;
-
-  /* Receive and transmit layer 3 packet size limits (MRU/MTU). */
-  u32 max_l3_packet_bytes[VLIB_N_RX_TX];
-
   /* Hash table mapping sub interface id to sw_if_index. */
   uword *sub_interface_sw_if_index_by_id;
 
@@ -498,6 +575,10 @@ typedef struct vnet_hw_interface_t
   /* device input device_and_queue runtime index */
   uword *dq_runtime_index_by_queue;
 
+  /* numa node that hardware device connects to */
+  u8 numa_node;
+
+  u8 padding[3];
 } vnet_hw_interface_t;
 
 extern vnet_device_class_t vnet_local_interface_device_class;
@@ -510,6 +591,7 @@ typedef enum
   /* A sub-interface. */
   VNET_SW_INTERFACE_TYPE_SUB,
   VNET_SW_INTERFACE_TYPE_P2P,
+  VNET_SW_INTERFACE_TYPE_PIPE,
 } vnet_sw_interface_type_t;
 
 typedef struct
@@ -556,39 +638,64 @@ typedef struct
 
 typedef enum
 {
+  /* THe BVI interface */
+  VNET_FLOOD_CLASS_BVI,
   /* Always flood */
   VNET_FLOOD_CLASS_NORMAL,
   VNET_FLOOD_CLASS_TUNNEL_MASTER,
   /* Does not flood when tunnel master is in the same L2 BD */
-  VNET_FLOOD_CLASS_TUNNEL_NORMAL
+  VNET_FLOOD_CLASS_TUNNEL_NORMAL,
+  /* Never flood to this type */
+  VNET_FLOOD_CLASS_NO_FLOOD,
 } vnet_flood_class_t;
 
-/* Software-interface.  This corresponds to a Ethernet VLAN, ATM vc, a
-   tunnel, etc.  Configuration (e.g. IP address) gets attached to
-   software interface. */
-typedef struct
+/* Per protocol MTU */
+typedef enum
 {
-  vnet_sw_interface_type_t type:16;
+  VNET_MTU_L3,                 /* Default payload MTU (without L2 headers) */
+  VNET_MTU_IP4,                        /* Per-protocol MTUs overriding default */
+  VNET_MTU_IP6,
+  VNET_MTU_MPLS,
+  VNET_N_MTU
+} vnet_mtu_t;
+
+extern vnet_mtu_t vnet_link_to_mtu (vnet_link_t link);
 
-  u16 flags;
-  /* Interface is "up" meaning adminstratively up.
+typedef enum vnet_sw_interface_flags_t_
+{
+  VNET_SW_INTERFACE_FLAG_NONE = 0,
+  /* Interface is "up" meaning administratively up.
      Up in the sense of link state being up is maintained by hardware interface. */
-#define VNET_SW_INTERFACE_FLAG_ADMIN_UP (1 << 0)
+  VNET_SW_INTERFACE_FLAG_ADMIN_UP = (1 << 0),
 
   /* Interface is disabled for forwarding: punt all traffic to slow-path. */
-#define VNET_SW_INTERFACE_FLAG_PUNT (1 << 1)
+  VNET_SW_INTERFACE_FLAG_PUNT = (1 << 1),
 
-#define VNET_SW_INTERFACE_FLAG_PROXY_ARP (1 << 2)
+  __VNET_SW_INTERFACE_FLAG_UNSUED = (1 << 2),
 
-#define VNET_SW_INTERFACE_FLAG_UNNUMBERED (1 << 3)
+  VNET_SW_INTERFACE_FLAG_UNNUMBERED = (1 << 3),
 
-#define VNET_SW_INTERFACE_FLAG_BOND_SLAVE (1 << 4)
+  VNET_SW_INTERFACE_FLAG_BOND_SLAVE = (1 << 4),
 
   /* Interface does not appear in CLI/API */
-#define VNET_SW_INTERFACE_FLAG_HIDDEN (1 << 5)
+  VNET_SW_INTERFACE_FLAG_HIDDEN = (1 << 5),
 
   /* Interface in ERROR state */
-#define VNET_SW_INTERFACE_FLAG_ERROR (1 << 6)
+  VNET_SW_INTERFACE_FLAG_ERROR = (1 << 6),
+
+  /* Interface has IP configured directed broadcast */
+  VNET_SW_INTERFACE_FLAG_DIRECTED_BCAST = (1 << 7),
+
+} __attribute__ ((packed)) vnet_sw_interface_flags_t;
+
+/* Software-interface.  This corresponds to a Ethernet VLAN, ATM vc, a
+   tunnel, etc.  Configuration (e.g. IP address) gets attached to
+   software interface. */
+typedef struct
+{
+  vnet_sw_interface_type_t type:16;
+
+  vnet_sw_interface_flags_t flags;
 
   /* Index for this interface. */
   u32 sw_if_index;
@@ -601,19 +708,17 @@ typedef struct
   /* this swif is unnumbered, use addresses on unnumbered_sw_if_index... */
   u32 unnumbered_sw_if_index;
 
-  u32 link_speed;
+  /* VNET_SW_INTERFACE_TYPE_HARDWARE. */
+  u32 hw_if_index;
 
-  union
-  {
-    /* VNET_SW_INTERFACE_TYPE_HARDWARE. */
-    u32 hw_if_index;
+  /* MTU for network layer (not including L2 headers) */
+  u32 mtu[VNET_N_MTU];
 
-    /* VNET_SW_INTERFACE_TYPE_SUB. */
-    vnet_sub_interface_t sub;
+  /* VNET_SW_INTERFACE_TYPE_SUB. */
+  vnet_sub_interface_t sub;
 
-    /* VNET_SW_INTERFACE_TYPE_P2P. */
-    vnet_p2p_sub_interface_t p2p;
-  };
+  /* VNET_SW_INTERFACE_TYPE_P2P. */
+  vnet_p2p_sub_interface_t p2p;
 
   vnet_flood_class_t flood_class;
 } vnet_sw_interface_t;
@@ -633,25 +738,46 @@ typedef enum
   VNET_N_SIMPLE_INTERFACE_COUNTER = 9,
   /* Combined counters. */
   VNET_INTERFACE_COUNTER_RX = 0,
-  VNET_INTERFACE_COUNTER_TX = 1,
-  VNET_INTERFACE_COUNTER_RX_UNICAST = 2,
-  VNET_INTERFACE_COUNTER_TX_UNICAST = 3,
-  VNET_INTERFACE_COUNTER_RX_MULTICAST = 4,
-  VNET_INTERFACE_COUNTER_TX_MULTICAST = 5,
-  VNET_INTERFACE_COUNTER_RX_BROADCAST = 6,
+  VNET_INTERFACE_COUNTER_RX_UNICAST = 1,
+  VNET_INTERFACE_COUNTER_RX_MULTICAST = 2,
+  VNET_INTERFACE_COUNTER_RX_BROADCAST = 3,
+  VNET_INTERFACE_COUNTER_TX = 4,
+  VNET_INTERFACE_COUNTER_TX_UNICAST = 5,
+  VNET_INTERFACE_COUNTER_TX_MULTICAST = 6,
   VNET_INTERFACE_COUNTER_TX_BROADCAST = 7,
   VNET_N_COMBINED_INTERFACE_COUNTER = 8,
 } vnet_interface_counter_type_t;
 
-#define foreach_combined_interface_counter(X)                  \
-  X(VNET_INTERFACE_COUNTER_RX, rx)                             \
-  X(VNET_INTERFACE_COUNTER_TX, tx)                             \
-  X(VNET_INTERFACE_COUNTER_RX_UNICAST, rx_unicast)             \
-  X(VNET_INTERFACE_COUNTER_TX_UNICAST, tx_unicast)             \
-  X(VNET_INTERFACE_COUNTER_RX_MULTICAST, rx_multicast)         \
-  X(VNET_INTERFACE_COUNTER_TX_MULTICAST, tx_multicast)         \
-  X(VNET_INTERFACE_COUNTER_RX_BROADCAST, rx_broadcast)         \
-  X(VNET_INTERFACE_COUNTER_TX_BROADCAST, tx_broadcast)
+#define foreach_rx_combined_interface_counter(_x)               \
+  for (_x = VNET_INTERFACE_COUNTER_RX;                          \
+       _x <= VNET_INTERFACE_COUNTER_RX_BROADCAST;               \
+       _x++)
+
+#define foreach_tx_combined_interface_counter(_x)               \
+  for (_x = VNET_INTERFACE_COUNTER_TX;                          \
+       _x <= VNET_INTERFACE_COUNTER_TX_BROADCAST;               \
+       _x++)
+
+#define foreach_simple_interface_counter_name  \
+  _(DROP, drops, if)                           \
+  _(PUNT, punt, if)                            \
+  _(IP4, ip4, if)                              \
+  _(IP6, ip6, if)                              \
+  _(RX_NO_BUF, rx-no-buf, if)                  \
+  _(RX_MISS, rx-miss, if)                      \
+  _(RX_ERROR, rx-error, if)                    \
+  _(TX_ERROR, tx-error, if)         \
+  _(MPLS, mpls, if)
+
+#define foreach_combined_interface_counter_name        \
+  _(RX, rx, if)                                        \
+  _(RX_UNICAST, rx-unicast, if)                        \
+  _(RX_MULTICAST, rx-multicast, if)            \
+  _(RX_BROADCAST, rx-broadcast, if)            \
+  _(TX, tx, if)                                        \
+  _(TX_UNICAST, tx-unicast, if)                        \
+  _(TX_MULTICAST, tx-multicast, if)            \
+  _(TX_BROADCAST, tx-broadcast, if)
 
 typedef enum
 {
@@ -677,6 +803,15 @@ typedef struct
   u32 tx_node_index;
 } vnet_hw_interface_nodes_t;
 
+typedef struct
+{
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+  u32 *split_buffers;
+} vnet_interface_per_thread_data_t;
+
+typedef u8 *(*vnet_buffer_opquae_formatter_t) (const vlib_buffer_t * b,
+                                              u8 * s);
+
 typedef struct
 {
   /* Hardware interfaces. */
@@ -715,6 +850,16 @@ typedef struct
   u32 pcap_pkts_to_capture;
   uword *pcap_drop_filter_hash;
 
+  /* Buffer metadata format helper functions */
+  vnet_buffer_opquae_formatter_t *buffer_opaque_format_helpers;
+  vnet_buffer_opquae_formatter_t *buffer_opaque2_format_helpers;
+
+  /* per-thread data */
+  vnet_interface_per_thread_data_t *per_thread_data;
+
+  /* enable GSO processing in packet path if this count is > 0 */
+  u32 gso_interface_count;
+
   /* feature_arc_index */
   u8 output_feature_arc_index;
 } vnet_interface_main_t;
@@ -723,7 +868,7 @@ static inline void
 vnet_interface_counter_lock (vnet_interface_main_t * im)
 {
   if (im->sw_if_counter_lock)
-    while (__sync_lock_test_and_set (im->sw_if_counter_lock, 1))
+    while (clib_atomic_test_and_set (im->sw_if_counter_lock))
       /* zzzz */ ;
 }
 
@@ -731,13 +876,23 @@ static inline void
 vnet_interface_counter_unlock (vnet_interface_main_t * im)
 {
   if (im->sw_if_counter_lock)
-    *im->sw_if_counter_lock = 0;
+    clib_atomic_release (im->sw_if_counter_lock);
 }
 
 void vnet_pcap_drop_trace_filter_add_del (u32 error_index, int is_add);
 
 int vnet_interface_name_renumber (u32 sw_if_index, u32 new_show_dev_instance);
 
+uword vnet_interface_output_node (vlib_main_t * vm,
+                                 vlib_node_runtime_t * node,
+                                 vlib_frame_t * frame);
+
+void vnet_register_format_buffer_opaque_helper
+  (vnet_buffer_opquae_formatter_t fn);
+
+void vnet_register_format_buffer_opaque2_helper
+  (vnet_buffer_opquae_formatter_t fn);
+
 #endif /* included_vnet_interface_h */
 
 /*