X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2Fvnet%2Fdevices%2Fdpdk%2Fdpdk.h;h=05f74b849f5058556f99727bf795a3add0bc5c25;hb=ce3e971;hp=4123cc9cbef4de27daba99931c5ea4e852c46e3d;hpb=39da6211a3371cee46642602f6d16b4afba37f83;p=vpp.git

diff --git a/vnet/vnet/devices/dpdk/dpdk.h b/vnet/vnet/devices/dpdk/dpdk.h
index 4123cc9cbef..05f74b849f5 100644
--- a/vnet/vnet/devices/dpdk/dpdk.h
+++ b/vnet/vnet/devices/dpdk/dpdk.h
@@ -63,11 +63,10 @@
 
 #include <vlib/pci/pci.h>
 
-#define NB_MBUF   (32<<10)
+#define NB_MBUF   (16<<10)
 
 extern vnet_device_class_t dpdk_device_class;
 extern vlib_node_registration_t dpdk_input_node;
-extern vlib_node_registration_t dpdk_io_input_node;
 extern vlib_node_registration_t handoff_dispatch_node;
 
 typedef enum {
@@ -87,22 +86,19 @@ typedef enum {
   _ ("rte_i40e_pmd", I40E)        \
   _ ("rte_i40evf_pmd", I40EVF)    \
   _ ("rte_virtio_pmd", VIRTIO)    \
-  _ ("rte_vice_pmd", VICE)        \
   _ ("rte_enic_pmd", ENIC)        \
   _ ("rte_vmxnet3_pmd", VMXNET3)  \
   _ ("AF_PACKET PMD", AF_PACKET)  \
   _ ("rte_bond_pmd", BOND)        \
   _ ("rte_pmd_fm10k", FM10K)      \
-  _ ("rte_cxgbe_pmd", CXGBE)
+  _ ("rte_cxgbe_pmd", CXGBE)      \
+  _ ("rte_dpaa2_dpni", DPAA2)
 
 typedef enum {
   VNET_DPDK_PMD_NONE,
 #define _(s,f) VNET_DPDK_PMD_##f,
   foreach_dpdk_pmd
 #undef _
-#ifdef NETMAP
-  VNET_DPDK_PMD_NETMAP,
-#endif
   VNET_DPDK_PMD_UNKNOWN, /* must be last */
 } dpdk_pmd_t;
 
@@ -112,9 +108,6 @@ typedef enum {
   VNET_DPDK_PORT_TYPE_ETH_40G,
   VNET_DPDK_PORT_TYPE_ETH_BOND,
   VNET_DPDK_PORT_TYPE_ETH_SWITCH,
-#ifdef NETMAP
-  VNET_DPDK_PORT_TYPE_NETMAP,
-#endif
   VNET_DPDK_PORT_TYPE_AF_PACKET,
   VNET_DPDK_PORT_TYPE_UNKNOWN,
 } dpdk_port_type_t;
@@ -142,9 +135,7 @@ typedef struct {
   int callfd;
   int kickfd;
   int errfd;
-#if RTE_VERSION >= RTE_VERSION_NUM(2, 2, 0, 0)
   int enabled;
-#endif
   u32 callfd_idx;
   u32 n_since_last_int;
   f64 int_deadline;
@@ -164,13 +155,10 @@ typedef struct {
 
   u64 feature_mask;
   u32 num_vrings;
-#if RTE_VERSION >= RTE_VERSION_NUM(2, 2, 0, 0)
   dpdk_vu_vring vrings[VHOST_MAX_QUEUE_PAIRS * 2];
-#else
-  dpdk_vu_vring vrings[2];
-#endif
   u64 region_addr[VHOST_MEMORY_MAX_NREGIONS];
   u32 region_fd[VHOST_MEMORY_MAX_NREGIONS];
+  u64 region_offset[VHOST_MEMORY_MAX_NREGIONS];
 } dpdk_vu_intf_t;
 
 typedef void (*dpdk_flowcontrol_callback_t) (vlib_main_t *vm,
@@ -210,6 +198,9 @@ typedef struct {
   /* per-worker destination frame queue */
   dpdk_frame_t * frames;
 
+  /* number of sub-interfaces */
+  u16 vlan_subifs;
+
   dpdk_device_type_t dev_type:8;
   dpdk_pmd_t pmd:8;
   i8 cpu_socket;
@@ -256,22 +247,6 @@ typedef struct {
   u8 need_txlock; /* Used by VNET_DPDK_DEV_VHOST_USER */
 } dpdk_device_t;
 
-#define MAX_NELTS 32
-typedef struct {
-  CLIB_CACHE_LINE_ALIGN_MARK(cacheline0);
-  u64 head;
-  u64 head_hint;
-  u64 tail;
-  u32 n_in_use;
-  u32 nelts;
-  u32 written;
-  u32 threshold;
-  i32 n_vectors[MAX_NELTS];
-} frame_queue_trace_t;
-
-typedef struct {
-  u64 count[MAX_NELTS];
-} frame_queue_nelt_counter_t;
 
 #define DPDK_TX_RING_SIZE (4 * 1024)
 
@@ -313,14 +288,21 @@ typedef struct dpdk_efd_t {
   _ (num_rx_queues) \
   _ (num_tx_queues) \
   _ (num_rx_desc) \
-  _ (num_tx_desc)
+  _ (num_tx_desc) \
+  _ (rss_fn)
 
 typedef struct {
     vlib_pci_addr_t pci_addr;
     u8 is_blacklisted;
+    u8 vlan_strip_offload;
+#define DPDK_DEVICE_VLAN_STRIP_DEFAULT 0
+#define DPDK_DEVICE_VLAN_STRIP_OFF 1
+#define DPDK_DEVICE_VLAN_STRIP_ON  2
+
 #define _(x) uword x;
     foreach_dpdk_device_config_item
 #undef _
+    clib_bitmap_t * workers;
 } dpdk_device_config_t;
 
 typedef struct {
@@ -342,7 +324,7 @@ typedef struct {
 
   /*
    * format interface names ala xxxEthernet%d/%d/%d instead of
-   * xxxEthernet%x/%x/%x. For VIRL.
+   * xxxEthernet%x/%x/%x.
    */
   u8 interface_name_format_decimal;
 
@@ -387,9 +369,6 @@ typedef struct {
   /* Ethernet input node index */
   u32 ethernet_input_node_index;
 
-  /* dpdk i/o thread initialization barrier */
-  volatile u32 io_thread_release;
-
   /* pcap tracing [only works if (CLIB_DEBUG > 0)] */
   int tx_pcap_enable;
   pcap_main_t pcap_main;
@@ -414,7 +393,6 @@ typedef struct {
    */
   u8 admin_up_down_in_progress;
 
-  u8 have_io_threads;
   u8 use_rss;
 
   /* which cpus are running dpdk-input */
@@ -425,10 +403,6 @@ typedef struct {
   f64 link_state_poll_interval;
   f64 stat_poll_interval;
 
-  /* for frame queue tracing */
-  frame_queue_trace_t        *frame_queue_traces;
-  frame_queue_nelt_counter_t *frame_queue_histogram;
-
   /* Sleep for this many MS after each device poll */
   u32 poll_sleep;
 
@@ -464,6 +438,7 @@ typedef struct {
   u16 queue_index;
   struct rte_mbuf mb;
   vlib_buffer_t buffer; /* Copy of VLIB buffer; pkt data stored in pre_data. */
+  u8 data[256];         /* First 256 data bytes, used for hexdump */
 } dpdk_rx_dma_trace_t;
 
 void vnet_buffer_needs_dpdk_mb (vlib_buffer_t * b);
@@ -475,13 +450,6 @@ clib_error_t * dpdk_set_mac_address (vnet_hw_interface_t * hi, char * address);
 clib_error_t * dpdk_set_mc_filter (vnet_hw_interface_t * hi,
                                    struct ether_addr mc_addr_vec[], int naddr);
 
-typedef void (*dpdk_io_thread_callback_t) (vlib_main_t *vm);
-
-void dpdk_io_thread (vlib_worker_thread_t * w,
-                     u32 instances,
-                     u32 instance_id,
-                     char *worker_name,
-                     dpdk_io_thread_callback_t callback);
 void dpdk_thread_input (dpdk_main_t * dm, dpdk_device_t * xd);
 
 clib_error_t * dpdk_port_setup (dpdk_main_t * dm, dpdk_device_t * xd);
@@ -491,10 +459,6 @@ void dpdk_set_flowcontrol_callback (vlib_main_t *vm,
 
 u32 dpdk_interface_tx_vector (vlib_main_t * vm, u32 dev_instance);
 
-vlib_frame_queue_elt_t * vlib_get_handoff_queue_elt (u32 vlib_worker_index);
-
-u32 dpdk_get_handoff_node_index (void);
-
 void set_efd_bitmap (u8 *bitmap, u32 value, u32 op);
 
 struct rte_mbuf * dpdk_replicate_packet_mb (vlib_buffer_t * b);
@@ -607,8 +571,6 @@ u32 dpdk_get_admin_up_down_in_progress (void);
 
 u32 dpdk_num_mbufs (void);
 
-int dpdk_io_thread_release (void);
-
 dpdk_pmd_t dpdk_get_pmd_type (vnet_hw_interface_t *hi);
 
 i8 dpdk_get_cpu_socket (vnet_hw_interface_t *hi);
@@ -627,6 +589,7 @@ format_function_t format_dpdk_rx_dma_trace;
 format_function_t format_dpdk_rte_mbuf;
 format_function_t format_dpdk_rx_rte_mbuf;
 unformat_function_t unformat_socket_mem;
+clib_error_t * unformat_rss_fn(unformat_input_t * input, uword * rss_fn);
 
 
 static inline void
@@ -691,6 +654,10 @@ dpdk_pmd_constructor_init()
   _(bond_drv)
 #endif
 
+#ifdef RTE_LIBRTE_DPAA2_PMD
+  _(pmd_dpaa2_drv)
+#endif
+
 #undef _
 
 /*