X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface.h;h=5ca489db32d3d5d87f2beb8db403a30313815709;hb=0091611c3cc9e7d7291beec7932468f1e1b551eb;hp=a1ea2d6184f74738d2208f20f61fc64f9862d392;hpb=eb743fad56b32cb20ad2d2cadc4760f9c25be5e1;p=vpp.git

diff --git a/src/vnet/interface.h b/src/vnet/interface.h
index a1ea2d6184f..5ca489db32d 100644
--- a/src/vnet/interface.h
+++ b/src/vnet/interface.h
@@ -48,6 +48,16 @@ struct vnet_hw_interface_t;
 struct vnet_sw_interface_t;
 struct ip46_address_t;
 
+typedef enum
+{
+  VNET_HW_INTERFACE_RX_MODE_UNKNOWN,
+  VNET_HW_INTERFACE_RX_MODE_POLLING,
+  VNET_HW_INTERFACE_RX_MODE_INTERRUPT,
+  VNET_HW_INTERFACE_RX_MODE_ADAPTIVE,
+  VNET_HW_INTERFACE_RX_MODE_DEFAULT,
+  VNET_HW_INTERFACE_NUM_RX_MODES,
+} vnet_hw_interface_rx_mode;
+
 /* Interface up/down callback. */
 typedef clib_error_t *(vnet_interface_function_t)
   (struct vnet_main_t * vnm, u32 if_index, u32 flags);
@@ -61,6 +71,11 @@ typedef clib_error_t *(vnet_subif_add_del_function_t)
 typedef clib_error_t *(vnet_interface_set_mac_address_function_t)
   (struct vnet_hw_interface_t * hi, char *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);
+
 typedef enum vnet_interface_function_priority_t_
 {
   VNET_ITF_FUNC_PRIORITY_LOW,
@@ -134,6 +149,9 @@ typedef struct _vnet_device_class
   /* Function to call when sub-interface is added/deleted */
   vnet_subif_add_del_function_t *subif_add_del_function;
 
+  /* Function to call interface rx mode is changed */
+  vnet_interface_set_rx_mode_function_t *rx_mode_change_function;
+
   /* Redistribute flag changes/existence of this interface class. */
   u32 redistribute;
 
@@ -180,9 +198,6 @@ typedef struct _vnet_device_class
   /* Link-list of all device classes set up by constructors created below */
   struct _vnet_device_class *next_class_registration;
 
-  /* Splice vnet_interface_output_node into TX path */
-  u8 flatten_output_chains;
-
   /* Function to set mac address. */
   vnet_interface_set_mac_address_function_t *mac_addr_change_function;
 } vnet_device_class_t;
@@ -401,9 +416,11 @@ typedef struct vnet_hw_interface_t
    VNET_HW_INTERFACE_FLAG_SPEED_40G |		\
    VNET_HW_INTERFACE_FLAG_SPEED_100G)
 
-  /* l2output node flags */
-#define VNET_HW_INTERFACE_FLAG_L2OUTPUT_SHIFT	9
-#define VNET_HW_INTERFACE_FLAG_L2OUTPUT_MAPPED	(1 << 9)
+  /* rx mode flags */
+#define VNET_HW_INTERFACE_FLAG_SUPPORTS_INT_MODE (1 << 10)
+
+  /* tx checksum offload */
+#define VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD (1 << 11)
 
   /* Hardware address as vector.  Zero (e.g. zero-length vector) if no
      address for this class (e.g. PPP). */
@@ -468,7 +485,14 @@ typedef struct vnet_hw_interface_t
   u32 input_node_index;
 
   /* input node cpu index by queue */
-  u32 *input_node_cpu_index_by_queue;
+  u32 *input_node_thread_index_by_queue;
+
+  /* vnet_hw_interface_rx_mode by queue */
+  u8 *rx_mode_by_queue;
+  vnet_hw_interface_rx_mode default_rx_mode;
+
+  /* device input device_and_queue runtime index */
+  uword *dq_runtime_index_by_queue;
 
 } vnet_hw_interface_t;
 
@@ -481,6 +505,7 @@ typedef enum
 
   /* A sub-interface. */
   VNET_SW_INTERFACE_TYPE_SUB,
+  VNET_SW_INTERFACE_TYPE_P2P,
 } vnet_sw_interface_type_t;
 
 typedef struct
@@ -514,6 +539,17 @@ typedef struct
   } eth;
 } vnet_sub_interface_t;
 
+typedef struct
+{
+  /*
+   * Subinterface ID. A number 0-N to uniquely identify
+   * this subinterface under the main interface
+   */
+  u32 id;
+  u32 pool_index;
+  u8 client_mac[6];
+} vnet_p2p_sub_interface_t;
+
 typedef enum
 {
   /* Always flood */
@@ -544,9 +580,12 @@ typedef struct
 
 #define VNET_SW_INTERFACE_FLAG_BOND_SLAVE (1 << 4)
 
-/* Interface does not appear in CLI/API */
+  /* Interface does not appear in CLI/API */
 #define VNET_SW_INTERFACE_FLAG_HIDDEN (1 << 5)
 
+  /* Interface in ERROR state */
+#define VNET_SW_INTERFACE_FLAG_ERROR (1 << 6)
+
   /* Index for this interface. */
   u32 sw_if_index;
 
@@ -567,6 +606,9 @@ typedef struct
 
     /* VNET_SW_INTERFACE_TYPE_SUB. */
     vnet_sub_interface_t sub;
+
+    /* VNET_SW_INTERFACE_TYPE_P2P. */
+    vnet_p2p_sub_interface_t p2p;
   };
 
   vnet_flood_class_t flood_class;