X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2Fdevice%2Fdpdk.h;h=f02e718dc9ca0ddf2f543466d8726780280b2eb8;hb=eb987d3a09f669787014b1553f032219522149e1;hp=770da6e3da608ff68872df669e348d86cb85a5f0;hpb=2f5eb0afa0893e94ed0115896d274de6f48cb93c;p=vpp.git diff --git a/src/plugins/dpdk/device/dpdk.h b/src/plugins/dpdk/device/dpdk.h index 770da6e3da6..f02e718dc9c 100644 --- a/src/plugins/dpdk/device/dpdk.h +++ b/src/plugins/dpdk/device/dpdk.h @@ -39,9 +39,7 @@ #include #include #include -#if RTE_VERSION >= RTE_VERSION_NUM(17, 11, 0, 0) #include -#endif #include #include @@ -94,10 +92,14 @@ typedef enum typedef enum { VNET_DPDK_PORT_TYPE_ETH_1G, + VNET_DPDK_PORT_TYPE_ETH_2_5G, + VNET_DPDK_PORT_TYPE_ETH_5G, VNET_DPDK_PORT_TYPE_ETH_10G, + VNET_DPDK_PORT_TYPE_ETH_20G, VNET_DPDK_PORT_TYPE_ETH_25G, VNET_DPDK_PORT_TYPE_ETH_40G, VNET_DPDK_PORT_TYPE_ETH_50G, + VNET_DPDK_PORT_TYPE_ETH_56G, VNET_DPDK_PORT_TYPE_ETH_100G, VNET_DPDK_PORT_TYPE_ETH_BOND, VNET_DPDK_PORT_TYPE_ETH_SWITCH, @@ -119,14 +121,13 @@ typedef struct u64 tx_tail; } tx_ring_hdr_t; -#if RTE_VERSION < RTE_VERSION_NUM(17, 11, 0, 0) -typedef uint8_t dpdk_portid_t; -#else typedef uint16_t dpdk_portid_t; -#endif typedef struct { + /* Required for vec_validate_aligned */ + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); + struct rte_ring *swq; u64 hqos_field0_slabmask; @@ -143,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; @@ -154,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); @@ -163,33 +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; - - /* vector of traced contexts, per device */ - u32 **d_trace_buffers; 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); @@ -346,25 +354,33 @@ 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; - /* vlib buffer free list, must be same size as an rte_mbuf */ - u32 vlib_buffer_free_list_index; - /* pcap tracing [only works if (CLIB_DEBUG > 0)] */ int tx_pcap_enable; pcap_main_t pcap_main; @@ -399,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; @@ -412,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 { @@ -422,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); @@ -449,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;