X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2Fdevice%2Fdpdk.h;h=1f43a484224f2bf67bcfecba2eea93c31af6bc70;hb=refs%2Fchanges%2F70%2F11770%2F1;hp=ab5da5672ecc89c218e7d54709bf6c637d0ee6a4;hpb=10980465ce97eceff05ac94a69a13d63d3cfa70a;p=vpp.git diff --git a/src/plugins/dpdk/device/dpdk.h b/src/plugins/dpdk/device/dpdk.h index ab5da5672ec..1f43a484224 100644 --- a/src/plugins/dpdk/device/dpdk.h +++ b/src/plugins/dpdk/device/dpdk.h @@ -38,6 +38,8 @@ #include #include #include +#include +#include #include #include @@ -73,7 +75,10 @@ extern vlib_node_registration_t dpdk_input_node; _ ("net_cxgbe", CXGBE) \ _ ("net_mlx4", MLX4) \ _ ("net_mlx5", MLX5) \ - _ ("net_dpaa2", DPAA2) + _ ("net_dpaa2", DPAA2) \ + _ ("net_virtio_user", VIRTIO_USER) \ + _ ("net_vhost", VHOST_ETHER) \ + _ ("net_ena", ENA) typedef enum { @@ -87,14 +92,21 @@ 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, VNET_DPDK_PORT_TYPE_AF_PACKET, VNET_DPDK_PORT_TYPE_ETH_VF, + VNET_DPDK_PORT_TYPE_VIRTIO_USER, + VNET_DPDK_PORT_TYPE_VHOST_ETHER, VNET_DPDK_PORT_TYPE_UNKNOWN, } dpdk_port_type_t; @@ -109,6 +121,8 @@ typedef struct u64 tx_tail; } tx_ring_hdr_t; +typedef uint16_t dpdk_portid_t; + typedef struct { struct rte_ring *swq; @@ -144,7 +158,7 @@ typedef struct volatile u32 **lockp; /* Instance ID */ - u32 device_index; + dpdk_portid_t device_index; u32 hw_if_index; u32 vlib_sw_if_index; @@ -156,9 +170,6 @@ typedef struct 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; @@ -170,6 +181,10 @@ typedef struct #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); @@ -184,6 +199,7 @@ typedef struct u16 rx_q_used; u16 nb_rx_desc; u16 *cpu_socket_id_by_queue; + u8 *buffer_pool_for_queue; struct rte_eth_conf port_conf; struct rte_eth_txconf tx_conf; @@ -192,7 +208,11 @@ typedef struct dpdk_device_hqos_per_hqos_thread_t *hqos_ht; /* af_packet or BondEthernet instance number */ - u8 port_id; + dpdk_portid_t port_id; + + /* Bonded interface port# of a slave - + only valid if DPDK_DEVICE_FLAG_BOND_SLAVE bit is set */ + dpdk_portid_t bond_port; struct rte_eth_link link; f64 time_last_link_update; @@ -297,6 +317,7 @@ typedef struct u8 *uio_driver_name; u8 no_multi_seg; u8 enable_tcp_udp_checksum; + u8 no_tx_checksum_offload; /* Required config parameters */ u8 coremask_set_manually; @@ -318,7 +339,7 @@ typedef struct } dpdk_config_main_t; -dpdk_config_main_t dpdk_config_main; +extern dpdk_config_main_t dpdk_config_main; typedef struct { @@ -336,12 +357,6 @@ typedef struct /* 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; - - /* Ethernet input node index */ - u32 ethernet_input_node_index; - /* pcap tracing [only works if (CLIB_DEBUG > 0)] */ int tx_pcap_enable; pcap_main_t pcap_main; @@ -355,8 +370,6 @@ typedef struct */ u8 admin_up_down_in_progress; - u8 use_rss; - /* which cpus are running I/O TX */ int hqos_cpu_first_index; int hqos_cpu_count; @@ -390,6 +403,7 @@ typedef struct struct rte_mbuf mb; /* 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; typedef struct @@ -406,6 +420,10 @@ void dpdk_device_setup (dpdk_device_t * xd); void dpdk_device_start (dpdk_device_t * xd); void dpdk_device_stop (dpdk_device_t * xd); +int dpdk_port_state_callback (dpdk_portid_t port_id, + enum rte_eth_event_type type, + void *param, void *ret_param); + #define foreach_dpdk_error \ _(NONE, "no error") \ _(RX_PACKET_ERROR, "Rx packet errors") \ @@ -441,6 +459,20 @@ uword admin_up_down_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f); +clib_error_t *dpdk_pool_create (vlib_main_t * vm, u8 * pool_name, + u32 elt_size, u32 num_elts, + u32 pool_priv_size, u16 cache_size, u8 numa, + struct rte_mempool **_mp, + vlib_physmem_region_index_t * pri); + +clib_error_t *dpdk_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs, + unsigned socket_id); + +#if CLI_DEBUG +int dpdk_buffer_validate_trajectory_all (u32 * uninitialized); +void dpdk_buffer_poison_trajectory_all (void); +#endif + #endif /* __included_dpdk_h__ */ /*