X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2Fdevice%2Fdpdk.h;h=4c45e8759335b59298d4606f27983b6b75df7c82;hb=940d1c8a18d672c37c6545ffdabd090d29f09850;hp=bd442bd97afecd2f1fb64dcca668025263159284;hpb=c576622667199db906efa3110ad25e552b3a0890;p=vpp.git diff --git a/src/plugins/dpdk/device/dpdk.h b/src/plugins/dpdk/device/dpdk.h index bd442bd97af..4c45e875933 100644 --- a/src/plugins/dpdk/device/dpdk.h +++ b/src/plugins/dpdk/device/dpdk.h @@ -18,6 +18,8 @@ /* $$$$ We should rename always_inline -> clib_always_inline */ #undef always_inline +#define ALLOW_EXPERIMENTAL_API + #include #include @@ -40,8 +42,9 @@ #include #include #include +#include -#include +#include #include #if CLIB_DEBUG > 0 @@ -51,11 +54,13 @@ #endif #include +#include #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 admin_up_down_process_node; #define foreach_dpdk_pmd \ _ ("net_thunderx", THUNDERX) \ @@ -78,7 +83,11 @@ extern vlib_node_registration_t dpdk_input_node; _ ("net_dpaa2", DPAA2) \ _ ("net_virtio_user", VIRTIO_USER) \ _ ("net_vhost", VHOST_ETHER) \ - _ ("net_ena", ENA) + _ ("net_ena", ENA) \ + _ ("net_failsafe", FAILSAFE) \ + _ ("net_liovf", LIOVF_ETHER) \ + _ ("net_qede", QEDE) \ + _ ("net_netvsc", NETVSC) typedef enum { @@ -107,24 +116,18 @@ typedef enum VNET_DPDK_PORT_TYPE_ETH_VF, VNET_DPDK_PORT_TYPE_VIRTIO_USER, VNET_DPDK_PORT_TYPE_VHOST_ETHER, + VNET_DPDK_PORT_TYPE_FAILSAFE, + VNET_DPDK_PORT_TYPE_NETVSC, VNET_DPDK_PORT_TYPE_UNKNOWN, } dpdk_port_type_t; -/* - * The header for the tx_vector in dpdk_device_t. - * Head and tail are indexes into the tx_vector and are of type - * u64 so they never overflow. - */ -typedef struct -{ - u64 tx_head; - u64 tx_tail; -} tx_ring_hdr_t; - 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; @@ -164,6 +169,8 @@ typedef struct _( 8, BOND_SLAVE_UP, "bond-slave-up") \ _( 9, TX_OFFLOAD, "tx-offload") \ _(10, INTEL_PHDR_CKSUM, "intel-phdr-cksum") \ + _(11, RX_FLOW_OFFLOAD, "rx-flow-offload") \ + _(12, RX_IP4_CKSUM, "rx-ip4-cksum") enum { @@ -172,23 +179,37 @@ enum #undef _ }; +typedef struct +{ + u32 flow_index; + u32 mark; + struct rte_flow *handle; +} dpdk_flow_entry_t; + +typedef struct +{ + u32 flow_id; + u16 next_index; + i16 buffer_advance; +} dpdk_flow_lookup_entry_t; + typedef struct { CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); volatile u32 **lockp; - /* Instance ID */ + /* Instance ID to access internal device array. */ dpdk_portid_t device_index; + /* DPDK device port number */ + dpdk_portid_t port_id; + u32 hw_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 */ - dpdk_pmd_t pmd:8; i8 cpu_socket; @@ -197,6 +218,7 @@ typedef struct u16 nb_tx_desc; CLIB_CACHE_LINE_ALIGN_MARK (cacheline1); + u8 *name; u8 *interface_name_suffix; /* number of sub-interfaces */ @@ -211,12 +233,21 @@ typedef struct struct rte_eth_conf port_conf; struct rte_eth_txconf tx_conf; + /* flow related */ + u32 supported_flow_actions; + dpdk_flow_entry_t *flow_entries; /* pool */ + dpdk_flow_lookup_entry_t *flow_lookup_entries; /* pool */ + u32 *parked_lookup_indexes; /* vector */ + u32 parked_loop_count; + struct rte_flow_error last_flow_error; + /* HQoS related */ dpdk_device_hqos_per_worker_thread_t *hqos_wt; dpdk_device_hqos_per_hqos_thread_t *hqos_ht; /* af_packet or BondEthernet instance number */ - dpdk_portid_t port_id; + u16 af_packet_instance_num; + u16 bond_instance_num; /* Bonded interface port# of a slave - only valid if DPDK_DEVICE_FLAG_BOND_SLAVE bit is set */ @@ -302,6 +333,7 @@ void dpdk_hqos_metadata_set (dpdk_device_hqos_per_worker_thread_t * hqos, typedef struct { vlib_pci_addr_t pci_addr; + u8 *name; u8 is_blacklisted; u8 vlan_strip_offload; #define DPDK_DEVICE_VLAN_STRIP_DEFAULT 0 @@ -362,6 +394,13 @@ typedef struct vlib_buffer_t buffer_template; } dpdk_per_thread_data_t; +typedef struct +{ + int pcap_enable; + u32 pcap_sw_if_index; + pcap_main_t pcap_main; +} dpdk_pcap_t; + typedef struct { @@ -370,14 +409,13 @@ typedef struct dpdk_device_and_queue_t **devices_by_hqos_cpu; dpdk_per_thread_data_t *per_thread_data; - /* per-thread recycle lists */ - u32 **recycle; - /* buffer flags template, configurable to enable/disable tcp / udp cksum */ u32 buffer_flags_template; - /* pcap tracing [only works if (CLIB_DEBUG > 0)] */ - int tx_pcap_enable; + /* pcap tracing */ + dpdk_pcap_t pcap[VLIB_N_RX_TX]; + + int pcap_enable; pcap_main_t pcap_main; u8 *pcap_filename; u32 pcap_sw_if_index; @@ -397,9 +435,6 @@ typedef struct f64 link_state_poll_interval; f64 stat_poll_interval; - /* Sleep for this many usec after each device poll */ - u32 poll_sleep_usec; - /* convenience */ vlib_main_t *vlib_main; vnet_main_t *vnet_main; @@ -481,24 +516,28 @@ 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; +format_function_t format_dpdk_flow; +format_function_t format_dpdk_rss_hf_name; +format_function_t format_dpdk_rx_offload_caps; +format_function_t format_dpdk_tx_offload_caps; unformat_function_t unformat_dpdk_log_level; +vnet_flow_dev_ops_function_t dpdk_flow_ops_fn; + clib_error_t *unformat_rss_fn (unformat_input_t * input, uword * rss_fn); clib_error_t *unformat_hqos (unformat_input_t * input, dpdk_device_config_hqos_t * hqos); -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); + struct rte_mempool **_mp, u32 * map_index); clib_error_t *dpdk_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs, unsigned socket_id); +struct rte_pci_device *dpdk_get_pci_device (const struct rte_eth_dev_info + *info); + #if CLI_DEBUG int dpdk_buffer_validate_trajectory_all (u32 * uninitialized); void dpdk_buffer_poison_trajectory_all (void);