Harmonize vec/pool_get_aligned object sizes and alignment requests

[vpp.git] / src / plugins / dpdk / device / dpdk.h

diff --git a/src/plugins/dpdk/device/dpdk.h b/src/plugins/dpdk/device/dpdk.h
index 1f43a48..f02e718 100644 (file)
--- a/src/plugins/dpdk/device/dpdk.h
+++ b/src/plugins/dpdk/device/dpdk.h
@@ -125,6 +125,9 @@ typedef uint16_t dpdk_portid_t;
 
 typedef struct
 {
+  /* Required for vec_validate_aligned */
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+
   struct rte_ring *swq;
 
   u64 hqos_field0_slabmask;
@@ -141,6 +144,8 @@ typedef struct
 
 typedef struct
 {
+  /* Required for vec_validate_aligned */
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
   struct rte_ring **swq;
   struct rte_mbuf **pkts_enq;
   struct rte_mbuf **pkts_deq;
@@ -152,6 +157,26 @@ typedef struct
   u32 flush_count;
 } dpdk_device_hqos_per_hqos_thread_t;
 
+#define foreach_dpdk_device_flags \
+  _( 0, ADMIN_UP, "admin-up") \
+  _( 1, PROMISC, "promisc") \
+  _( 2, PMD, "pmd") \
+  _( 3, PMD_INIT_FAIL, "pmd-init-fail") \
+  _( 4, MAYBE_MULTISEG, "maybe-multiseg") \
+  _( 5, HAVE_SUBIF, "subif") \
+  _( 6, HQOS, "hqos") \
+  _( 7, BOND_SLAVE, "bond-slave") \
+  _( 8, BOND_SLAVE_UP, "bond-slave-up") \
+  _( 9, TX_OFFLOAD, "tx-offload") \
+  _(10, INTEL_PHDR_CKSUM, "intel-phdr-cksum") \
+
+enum
+{
+#define _(a, b, c) DPDK_DEVICE_FLAG_##b = (1 << a),
+  foreach_dpdk_device_flags
+#undef _
+};
+
 typedef struct
 {
   CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
@@ -161,30 +186,18 @@ typedef struct
   dpdk_portid_t device_index;
 
   u32 hw_if_index;
-  u32 vlib_sw_if_index;
+  u32 sw_if_index;
 
   /* next node index if we decide to steal the rx graph arc */
   u32 per_interface_next_index;
 
   /* dpdk rte_mbuf rx and tx vectors, VLIB_FRAME_SIZE */
   struct rte_mbuf ***tx_vectors;       /* one per worker thread */
-  struct rte_mbuf ***rx_vectors;
 
   dpdk_pmd_t pmd:8;
   i8 cpu_socket;
 
   u16 flags;
-#define DPDK_DEVICE_FLAG_ADMIN_UP           (1 << 0)
-#define DPDK_DEVICE_FLAG_PROMISC            (1 << 1)
-#define DPDK_DEVICE_FLAG_PMD                (1 << 2)
-#define DPDK_DEVICE_FLAG_PMD_INIT_FAIL      (1 << 3)
-#define DPDK_DEVICE_FLAG_MAYBE_MULTISEG     (1 << 4)
-#define DPDK_DEVICE_FLAG_HAVE_SUBIF         (1 << 5)
-#define DPDK_DEVICE_FLAG_HQOS               (1 << 6)
-#define DPDK_DEVICE_FLAG_BOND_SLAVE         (1 << 7)
-#define DPDK_DEVICE_FLAG_BOND_SLAVE_UP      (1 << 8)
-#define DPDK_DEVICE_FLAG_TX_OFFLOAD         (1 << 9)
-#define DPDK_DEVICE_FLAG_INTEL_PHDR_CKSUM   (1 << 10)
 
   u16 nb_tx_desc;
     CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
@@ -341,19 +354,30 @@ typedef struct
 
 extern dpdk_config_main_t dpdk_config_main;
 
+#define DPDK_RX_BURST_SZ VLIB_FRAME_SIZE
+
+typedef struct
+{
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+  struct rte_mbuf *mbufs[DPDK_RX_BURST_SZ];
+  u32 buffers[DPDK_RX_BURST_SZ];
+  u16 next[DPDK_RX_BURST_SZ];
+  u16 etype[DPDK_RX_BURST_SZ];
+  u8 flags[DPDK_RX_BURST_SZ];
+  vlib_buffer_t buffer_template;
+} dpdk_per_thread_data_t;
+
 typedef struct
 {
 
   /* Devices */
   dpdk_device_t *devices;
   dpdk_device_and_queue_t **devices_by_hqos_cpu;
+  dpdk_per_thread_data_t *per_thread_data;
 
   /* per-thread recycle lists */
   u32 **recycle;
 
-  /* per-thread buffer templates */
-  vlib_buffer_t *buffer_templates;
-
   /* buffer flags template, configurable to enable/disable tcp / udp cksum */
   u32 buffer_flags_template;
 
@@ -391,6 +415,9 @@ typedef struct
 
   /* API message ID base */
   u16 msg_id_base;
+
+  /* logging */
+  vlib_log_class_t log_default;
 } dpdk_main_t;
 
 extern dpdk_main_t dpdk_main;
@@ -404,7 +431,7 @@ typedef struct
   /* Copy of VLIB buffer; packet data stored in pre_data. */
   vlib_buffer_t buffer;
   u8 data[256];                        /* First 256 data bytes, used for hexdump */
-} dpdk_tx_dma_trace_t;
+} dpdk_tx_trace_t;
 
 typedef struct
 {
@@ -414,7 +441,7 @@ typedef struct
   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;
+} dpdk_rx_trace_t;
 
 void dpdk_device_setup (dpdk_device_t * xd);
 void dpdk_device_start (dpdk_device_t * xd);
@@ -441,13 +468,22 @@ typedef enum
     DPDK_N_ERROR,
 } dpdk_error_t;
 
+#define dpdk_log_err(...) \
+  vlib_log(VLIB_LOG_LEVEL_ERR, dpdk_main.log_default, __VA_ARGS__)
+#define dpdk_log_warn(...) \
+  vlib_log(VLIB_LOG_LEVEL_WARNING, dpdk_main.log_default, __VA_ARGS__)
+#define dpdk_log_notice(...) \
+  vlib_log(VLIB_LOG_LEVEL_NOTICE, dpdk_main.log_default, __VA_ARGS__)
+#define dpdk_log_info(...) \
+  vlib_log(VLIB_LOG_LEVEL_INFO, dpdk_main.log_default, __VA_ARGS__)
+
 void dpdk_update_link_state (dpdk_device_t * xd, f64 now);
 
 format_function_t format_dpdk_device_name;
 format_function_t format_dpdk_device;
 format_function_t format_dpdk_device_errors;
-format_function_t format_dpdk_tx_dma_trace;
-format_function_t format_dpdk_rx_dma_trace;
+format_function_t format_dpdk_tx_trace;
+format_function_t format_dpdk_rx_trace;
 format_function_t format_dpdk_rte_mbuf;
 format_function_t format_dpdk_rx_rte_mbuf;
 unformat_function_t unformat_dpdk_log_level;