X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2Fdevice%2Fdpdk.h;h=28647913d1cdf63b9dc540552288f081570e1e20;hb=6cb727394;hp=64a2330a3782f8e24fc8e6ad725587c715c26593;hpb=70e808b1bfc25d1664ddb917457040b419e123c8;p=vpp.git diff --git a/src/plugins/dpdk/device/dpdk.h b/src/plugins/dpdk/device/dpdk.h index 64a2330a378..28647913d1c 100644 --- a/src/plugins/dpdk/device/dpdk.h +++ b/src/plugins/dpdk/device/dpdk.h @@ -28,6 +28,15 @@ #include #include #include +#if RTE_VERSION >= RTE_VERSION_NUM(22, 11, 0, 0) +#include +#include +#include + +#include +#include +#include +#endif #include @@ -45,79 +54,11 @@ 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; -#if RTE_VERSION < RTE_VERSION_NUM(20, 8, 0, 0) -#define DPDK_MLX5_PMD_NAME "net_mlx5" -#else -#define DPDK_MLX5_PMD_NAME "mlx5_pci" -#endif - -#define foreach_dpdk_pmd \ - _ ("net_thunderx", THUNDERX) \ - _ ("net_e1000_em", E1000EM) \ - _ ("net_e1000_igb", IGB) \ - _ ("net_e1000_igb_vf", IGBVF) \ - _ ("net_ixgbe", IXGBE) \ - _ ("net_ixgbe_vf", IXGBEVF) \ - _ ("net_i40e", I40E) \ - _ ("net_i40e_vf", I40EVF) \ - _ ("net_ice", ICE) \ - _ ("net_iavf", IAVF) \ - _ ("net_igc", IGC) \ - _ ("net_virtio", VIRTIO) \ - _ ("net_enic", ENIC) \ - _ ("net_vmxnet3", VMXNET3) \ - _ ("AF_PACKET PMD", AF_PACKET) \ - _ ("net_fm10k", FM10K) \ - _ ("net_cxgbe", CXGBE) \ - _ ("net_mlx4", MLX4) \ - _ (DPDK_MLX5_PMD_NAME, MLX5) \ - _ ("net_dpaa2", DPAA2) \ - _ ("net_virtio_user", VIRTIO_USER) \ - _ ("net_vhost", VHOST_ETHER) \ - _ ("net_ena", ENA) \ - _ ("net_failsafe", FAILSAFE) \ - _ ("net_liovf", LIOVF_ETHER) \ - _ ("net_qede", QEDE) \ - _ ("net_netvsc", NETVSC) \ - _ ("net_bnxt", BNXT) - -typedef enum -{ - VNET_DPDK_PMD_NONE, -#define _(s,f) VNET_DPDK_PMD_##f, - foreach_dpdk_pmd -#undef _ - VNET_DPDK_PMD_UNKNOWN, /* must be last */ -} dpdk_pmd_t; - -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_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_FAILSAFE, - VNET_DPDK_PORT_TYPE_NETVSC, - VNET_DPDK_PORT_TYPE_UNKNOWN, -} dpdk_port_type_t; - typedef uint16_t dpdk_portid_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") \ @@ -128,12 +69,12 @@ typedef uint16_t dpdk_portid_t; _ (13, INT_SUPPORTED, "int-supported") \ _ (14, INT_UNMASKABLE, "int-unmaskable") -enum +typedef enum { #define _(a, b, c) DPDK_DEVICE_FLAG_##b = (1 << a), foreach_dpdk_device_flags #undef _ -}; +} dpdk_device_flag_t; typedef struct { @@ -162,8 +103,60 @@ typedef struct { CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); clib_spinlock_t lock; + u32 queue_index; } dpdk_tx_queue_t; +typedef struct +{ + const char *name; + const char *desc; +} dpdk_driver_name_t; + +typedef struct +{ + dpdk_driver_name_t *drivers; + const char *interface_name_prefix; + u16 n_rx_desc; + u16 n_tx_desc; + u32 supported_flow_actions; + u32 enable_lsc_int : 1; + u32 enable_rxq_int : 1; + u32 disable_rx_scatter : 1; + u32 program_vlans : 1; + u32 mq_mode_none : 1; + u32 interface_number_from_port_id : 1; + u32 use_intel_phdr_cksum : 1; + u32 int_unmaskable : 1; +} dpdk_driver_t; + +dpdk_driver_t *dpdk_driver_find (const char *name, const char **desc); + +typedef union +{ + struct + { + u16 disable_multi_seg : 1; + u16 enable_lro : 1; + u16 enable_tso : 1; + u16 enable_tcp_udp_checksum : 1; + u16 enable_outer_checksum_offload : 1; + u16 enable_lsc_int : 1; + u16 enable_rxq_int : 1; + u16 disable_tx_checksum_offload : 1; + u16 disable_rss : 1; + u16 disable_rx_scatter : 1; + u16 n_rx_queues; + u16 n_tx_queues; + u16 n_rx_desc; + u16 n_tx_desc; + u32 max_lro_pkt_size; + u64 rss_hf; + }; + u64 as_u64[3]; +} dpdk_port_conf_t; + +STATIC_ASSERT_SIZEOF (dpdk_port_conf_t, 24); + typedef struct { CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); @@ -176,33 +169,28 @@ typedef struct u32 hw_if_index; u32 sw_if_index; + u32 buffer_flags; /* next node index if we decide to steal the rx graph arc */ u32 per_interface_next_index; - u16 rx_q_used; - u16 tx_q_used; u16 flags; /* DPDK device port number */ dpdk_portid_t port_id; - dpdk_pmd_t pmd:8; i8 cpu_socket; - CLIB_CACHE_LINE_ALIGN_MARK (cacheline1); - u16 nb_tx_desc; - u16 nb_rx_desc; + CLIB_CACHE_LINE_ALIGN_MARK (cacheline1); + u64 enabled_tx_off; + u64 enabled_rx_off; + dpdk_driver_t *driver; u8 *name; - u8 *interface_name_suffix; + const char *if_desc; /* number of sub-interfaces */ u16 num_subifs; - /* PMD related */ - 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 */ @@ -211,9 +199,6 @@ typedef struct u32 parked_loop_count; struct rte_flow_error last_flow_error; - /* af_packet instance number */ - u16 af_packet_instance_num; - struct rte_eth_link link; f64 time_last_link_update; @@ -221,13 +206,20 @@ typedef struct struct rte_eth_stats last_stats; struct rte_eth_xstat *xstats; f64 time_last_stats_update; - dpdk_port_type_t port_type; /* mac address */ u8 *default_mac_address; + /* maximum supported max frame size */ + u32 max_supported_frame_size; + + /* due to lack of API to get ethernet max_frame_size we store information + * deducted from device info */ + u8 driver_frame_overhead; + /* error string */ clib_error_t *errors; + dpdk_port_conf_t conf; } dpdk_device_t; #define DPDK_STATS_POLL_INTERVAL (10.0) @@ -260,11 +252,8 @@ typedef struct }; dpdk_device_addr_type_t dev_addr_type; u8 *name; + u8 *tag; 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 @@ -286,11 +275,7 @@ typedef struct u8 **eal_init_args; u8 *eal_init_args_str; u8 *uio_driver_name; - u8 no_multi_seg; - u8 enable_lro; - u8 enable_tcp_udp_checksum; - u8 enable_outer_checksum_offload; - u8 no_tx_checksum_offload; + u8 uio_bind_force; u8 enable_telemetry; u16 max_simd_bitwidth; @@ -334,14 +319,10 @@ typedef struct typedef struct { - /* Devices */ dpdk_device_t *devices; dpdk_per_thread_data_t *per_thread_data; - /* buffer flags template, configurable to enable/disable tcp / udp cksum */ - u32 buffer_flags_template; - /* * flag indicating that a posted admin up/down * (via post_sw_interface_set_flags) is in progress @@ -353,6 +334,7 @@ typedef struct f64 stat_poll_interval; dpdk_config_main_t *conf; + dpdk_port_conf_t default_port_conf; /* API message ID base */ u16 msg_id_base; @@ -360,7 +342,6 @@ typedef struct /* logging */ vlib_log_class_t log_default; vlib_log_class_t log_cryptodev; - vlib_log_class_t log_ipsec; } dpdk_main_t; extern dpdk_main_t dpdk_main; @@ -418,36 +399,39 @@ typedef enum 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__) +#define dpdk_log_debug(...) \ + vlib_log (VLIB_LOG_LEVEL_DEBUG, dpdk_main.log_default, __VA_ARGS__) void dpdk_update_link_state (dpdk_device_t * xd, f64 now); #define foreach_dpdk_rss_hf \ - _ (0, ETH_RSS_FRAG_IPV4, "ipv4-frag") \ - _ (1, ETH_RSS_NONFRAG_IPV4_TCP, "ipv4-tcp") \ - _ (2, ETH_RSS_NONFRAG_IPV4_UDP, "ipv4-udp") \ - _ (3, ETH_RSS_NONFRAG_IPV4_SCTP, "ipv4-sctp") \ - _ (4, ETH_RSS_NONFRAG_IPV4_OTHER, "ipv4-other") \ - _ (5, ETH_RSS_IPV4, "ipv4") \ - _ (6, ETH_RSS_IPV6_TCP_EX, "ipv6-tcp-ex") \ - _ (7, ETH_RSS_IPV6_UDP_EX, "ipv6-udp-ex") \ - _ (8, ETH_RSS_FRAG_IPV6, "ipv6-frag") \ - _ (9, ETH_RSS_NONFRAG_IPV6_TCP, "ipv6-tcp") \ - _ (10, ETH_RSS_NONFRAG_IPV6_UDP, "ipv6-udp") \ - _ (11, ETH_RSS_NONFRAG_IPV6_SCTP, "ipv6-sctp") \ - _ (12, ETH_RSS_NONFRAG_IPV6_OTHER, "ipv6-other") \ - _ (13, ETH_RSS_IPV6_EX, "ipv6-ex") \ - _ (14, ETH_RSS_IPV6, "ipv6") \ - _ (15, ETH_RSS_L2_PAYLOAD, "l2-payload") \ - _ (16, ETH_RSS_PORT, "port") \ - _ (17, ETH_RSS_VXLAN, "vxlan") \ - _ (18, ETH_RSS_GENEVE, "geneve") \ - _ (19, ETH_RSS_NVGRE, "nvgre") \ - _ (20, ETH_RSS_GTPU, "gtpu") \ - _ (21, ETH_RSS_ESP, "esp") \ - _ (60, ETH_RSS_L4_DST_ONLY, "l4-dst-only") \ - _ (61, ETH_RSS_L4_SRC_ONLY, "l4-src-only") \ - _ (62, ETH_RSS_L3_DST_ONLY, "l3-dst-only") \ - _ (63, ETH_RSS_L3_SRC_ONLY, "l3-src-only") + _ (0, RTE_ETH_RSS_FRAG_IPV4, "ipv4-frag") \ + _ (1, RTE_ETH_RSS_NONFRAG_IPV4_TCP, "ipv4-tcp") \ + _ (2, RTE_ETH_RSS_NONFRAG_IPV4_UDP, "ipv4-udp") \ + _ (3, RTE_ETH_RSS_NONFRAG_IPV4_SCTP, "ipv4-sctp") \ + _ (4, RTE_ETH_RSS_NONFRAG_IPV4_OTHER, "ipv4-other") \ + _ (5, RTE_ETH_RSS_IPV4, "ipv4") \ + _ (6, RTE_ETH_RSS_IPV6_TCP_EX, "ipv6-tcp-ex") \ + _ (7, RTE_ETH_RSS_IPV6_UDP_EX, "ipv6-udp-ex") \ + _ (8, RTE_ETH_RSS_FRAG_IPV6, "ipv6-frag") \ + _ (9, RTE_ETH_RSS_NONFRAG_IPV6_TCP, "ipv6-tcp") \ + _ (10, RTE_ETH_RSS_NONFRAG_IPV6_UDP, "ipv6-udp") \ + _ (11, RTE_ETH_RSS_NONFRAG_IPV6_SCTP, "ipv6-sctp") \ + _ (12, RTE_ETH_RSS_NONFRAG_IPV6_OTHER, "ipv6-other") \ + _ (13, RTE_ETH_RSS_IPV6_EX, "ipv6-ex") \ + _ (14, RTE_ETH_RSS_IPV6, "ipv6") \ + _ (15, RTE_ETH_RSS_L2_PAYLOAD, "l2-payload") \ + _ (16, RTE_ETH_RSS_PORT, "port") \ + _ (17, RTE_ETH_RSS_VXLAN, "vxlan") \ + _ (18, RTE_ETH_RSS_GENEVE, "geneve") \ + _ (19, RTE_ETH_RSS_NVGRE, "nvgre") \ + _ (20, RTE_ETH_RSS_GTPU, "gtpu") \ + _ (21, RTE_ETH_RSS_ESP, "esp") \ + _ (22, RTE_ETH_RSS_L2TPV3, "l2tpv3") \ + _ (60, RTE_ETH_RSS_L4_DST_ONLY, "l4-dst-only") \ + _ (61, RTE_ETH_RSS_L4_SRC_ONLY, "l4-src-only") \ + _ (62, RTE_ETH_RSS_L3_DST_ONLY, "l3-dst-only") \ + _ (63, RTE_ETH_RSS_L3_SRC_ONLY, "l3-src-only") format_function_t format_dpdk_device_name; format_function_t format_dpdk_device; @@ -460,6 +444,8 @@ 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; +format_function_t format_dpdk_burst_fn; +format_function_t format_dpdk_rte_device; vnet_flow_dev_ops_function_t dpdk_flow_ops_fn; clib_error_t *unformat_rss_fn (unformat_input_t * input, uword * rss_fn);