X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2Fdevice%2Fdpdk.h;h=ff2bf6f9c509cd0db60597de1e40c604b7038fa8;hb=c58b1747b34fe1987835f68268218779a81ae3db;hp=eadf35d5ef643f9230e917c85f253826b47b4db5;hpb=048acfbd9ee6c0d476ffd87db9c1c744f3040e25;p=vpp.git diff --git a/src/plugins/dpdk/device/dpdk.h b/src/plugins/dpdk/device/dpdk.h index eadf35d5ef6..ff2bf6f9c50 100644 --- a/src/plugins/dpdk/device/dpdk.h +++ b/src/plugins/dpdk/device/dpdk.h @@ -22,26 +22,12 @@ #include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include #include -#include -#include -#include #include -#include #include -#include -#include #include @@ -52,38 +38,48 @@ #endif #include +#include #include 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) \ - _ ("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_virtio", VIRTIO) \ - _ ("net_enic", ENIC) \ - _ ("net_vmxnet3", VMXNET3) \ - _ ("AF_PACKET PMD", AF_PACKET) \ - _ ("net_fm10k", FM10K) \ - _ ("net_cxgbe", CXGBE) \ - _ ("net_mlx4", MLX4) \ - _ ("net_mlx5", 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) +#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 { @@ -118,52 +114,18 @@ typedef enum 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; - u32 hqos_field0_slabpos; - u32 hqos_field0_slabshr; - u64 hqos_field1_slabmask; - u32 hqos_field1_slabpos; - u32 hqos_field1_slabshr; - u64 hqos_field2_slabmask; - u32 hqos_field2_slabpos; - u32 hqos_field2_slabshr; - u32 hqos_tc_table[64]; -} dpdk_device_hqos_per_worker_thread_t; - -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; - struct rte_sched_port *hqos; - u32 hqos_burst_enq; - u32 hqos_burst_deq; - u32 pkts_enq_len; - u32 swq_pos; - 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") \ - _( 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") +#define foreach_dpdk_device_flags \ + _ (0, ADMIN_UP, "admin-up") \ + _ (1, PROMISC, "promisc") \ + _ (3, PMD_INIT_FAIL, "pmd-init-fail") \ + _ (4, MAYBE_MULTISEG, "maybe-multiseg") \ + _ (5, HAVE_SUBIF, "subif") \ + _ (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") \ + _ (13, INT_SUPPORTED, "int-supported") \ + _ (14, INT_UNMASKABLE, "int-unmaskable") enum { @@ -189,26 +151,61 @@ typedef struct typedef struct { CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); - volatile u32 **lockp; + u8 buffer_pool_index; + u32 queue_index; + int efd; + uword clib_file_index; +} dpdk_rx_queue_t; - /* Instance ID to access internal device array. */ - dpdk_portid_t device_index; +typedef struct +{ + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); + clib_spinlock_t lock; +} dpdk_tx_queue_t; - /* DPDK device port number */ - dpdk_portid_t port_id; +typedef union +{ + struct + { + u16 no_multi_seg : 1; + u16 enable_lro : 1; + u16 enable_tcp_udp_checksum : 1; + u16 enable_outer_checksum_offload : 1; + u16 no_tx_checksum_offload : 1; + u16 n_rx_queues; + u16 n_tx_queues; + u16 n_rx_desc; + u16 n_tx_desc; + }; + u64 as_u64[3]; +} dpdk_port_conf_t; + +STATIC_ASSERT_SIZEOF (dpdk_port_conf_t, 24); + +typedef struct +{ + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); + + dpdk_rx_queue_t *rx_queues; + dpdk_tx_queue_t *tx_queues; + + /* Instance ID to access internal device array. */ + u32 device_index; 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 flags; + + /* DPDK device port number */ + dpdk_portid_t port_id; dpdk_pmd_t pmd:8; i8 cpu_socket; - u16 flags; - - u16 nb_tx_desc; CLIB_CACHE_LINE_ALIGN_MARK (cacheline1); u8 *name; @@ -218,13 +215,7 @@ typedef struct u16 num_subifs; /* PMD related */ - u16 tx_q_used; - 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; /* flow related */ u32 supported_flow_actions; @@ -234,10 +225,6 @@ typedef struct 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 instance number */ u16 af_packet_instance_num; @@ -246,9 +233,7 @@ typedef struct struct rte_eth_stats stats; struct rte_eth_stats last_stats; - struct rte_eth_stats last_cleared_stats; struct rte_eth_xstat *xstats; - struct rte_eth_xstat *last_cleared_xstats; f64 time_last_stats_update; dpdk_port_type_t port_type; @@ -257,6 +242,7 @@ typedef struct /* error string */ clib_error_t *errors; + dpdk_port_conf_t conf; } dpdk_device_t; #define DPDK_STATS_POLL_INTERVAL (10.0) @@ -265,77 +251,43 @@ typedef struct #define DPDK_LINK_POLL_INTERVAL (3.0) #define DPDK_MIN_LINK_POLL_INTERVAL (0.001) /* 1msec */ -typedef struct -{ - u32 device; - u16 queue_id; -} dpdk_device_and_queue_t; - -#ifndef DPDK_HQOS_DBG_BYPASS -#define DPDK_HQOS_DBG_BYPASS 0 -#endif - -#ifndef HQOS_FLUSH_COUNT_THRESHOLD -#define HQOS_FLUSH_COUNT_THRESHOLD 100000 -#endif +#define foreach_dpdk_device_config_item \ + _ (num_rx_queues) \ + _ (num_tx_queues) \ + _ (num_rx_desc) \ + _ (num_tx_desc) \ + _ (max_lro_pkt_size) \ + _ (rss_fn) -typedef struct dpdk_device_config_hqos_t +typedef enum { - u32 hqos_thread; - u32 hqos_thread_valid; - - u32 swq_size; - u32 burst_enq; - u32 burst_deq; - - u32 pktfield0_slabpos; - u32 pktfield1_slabpos; - u32 pktfield2_slabpos; - u64 pktfield0_slabmask; - u64 pktfield1_slabmask; - u64 pktfield2_slabmask; - u32 tc_table[64]; - - struct rte_sched_port_params port; - struct rte_sched_subport_params *subport; - struct rte_sched_pipe_params *pipe; - uint32_t *pipe_map; -} dpdk_device_config_hqos_t; - -int dpdk_hqos_validate_mask (u64 mask, u32 n); -void dpdk_device_config_hqos_pipe_profile_default (dpdk_device_config_hqos_t * - hqos, u32 pipe_profile_id); -#if 0 -void dpdk_device_config_hqos_default (dpdk_device_config_hqos_t * hqos); -#endif -clib_error_t *dpdk_port_setup_hqos (dpdk_device_t * xd, - dpdk_device_config_hqos_t * hqos); -void dpdk_hqos_metadata_set (dpdk_device_hqos_per_worker_thread_t * hqos, - struct rte_mbuf **pkts, u32 n_pkts); - -#define foreach_dpdk_device_config_item \ - _ (num_rx_queues) \ - _ (num_tx_queues) \ - _ (num_rx_desc) \ - _ (num_tx_desc) \ - _ (rss_fn) + VNET_DEV_ADDR_PCI, + VNET_DEV_ADDR_VMBUS, + VNET_DEV_ADDR_ANY, +} dpdk_device_addr_type_t; typedef struct { - vlib_pci_addr_t pci_addr; + union + { + vlib_pci_addr_t pci_addr; + vlib_vmbus_addr_t vmbus_addr; + }; + dpdk_device_addr_type_t dev_addr_type; u8 *name; 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 #undef _ clib_bitmap_t * workers; - u32 hqos_enabled; - dpdk_device_config_hqos_t hqos; + u8 tso; + u8 *devargs; + clib_bitmap_t *rss_queues; + +#define DPDK_DEVICE_TSO_DEFAULT 0 +#define DPDK_DEVICE_TSO_OFF 1 +#define DPDK_DEVICE_TSO_ON 2 } dpdk_device_config_t; typedef struct @@ -345,16 +297,12 @@ typedef struct u8 **eal_init_args; u8 *eal_init_args_str; u8 *uio_driver_name; - u8 no_multi_seg; - u8 enable_tcp_udp_checksum; - u8 no_tx_checksum_offload; + u8 enable_telemetry; + u16 max_simd_bitwidth; - /* Required config parameters */ - u8 coremask_set_manually; - u8 nchannels_set_manually; - u32 coremask; - u32 nchannels; - u32 num_crypto_mbufs; +#define DPDK_MAX_SIMD_BITWIDTH_DEFAULT 0 +#define DPDK_MAX_SIMD_BITWIDTH_256 256 +#define DPDK_MAX_SIMD_BITWIDTH_512 512 /* * format interface names ala xxxEthernet%d/%d/%d instead of @@ -366,9 +314,12 @@ typedef struct dpdk_device_config_t default_devconf; dpdk_device_config_t *dev_confs; uword *device_config_index_by_pci_addr; + mhash_t device_config_index_by_vmbus_addr; /* devices blacklist by pci vendor_id, device_id */ u32 *blacklist_by_pci_vendor_and_device; + /* devices blacklist by VMBUS address */ + vlib_vmbus_addr_t *blacklist_by_vmbus_addr; } dpdk_config_main_t; @@ -383,45 +334,35 @@ typedef struct u32 buffers[DPDK_RX_BURST_SZ]; u16 next[DPDK_RX_BURST_SZ]; u16 etype[DPDK_RX_BURST_SZ]; - u16 flags[DPDK_RX_BURST_SZ]; + u32 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; - /* 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 */ u8 admin_up_down_in_progress; - /* which cpus are running I/O TX */ - int hqos_cpu_first_index; - int hqos_cpu_count; - /* control interval of dpdk link state and stat polling */ f64 link_state_poll_interval; f64 stat_poll_interval; - /* convenience */ - vlib_main_t *vlib_main; - vnet_main_t *vnet_main; dpdk_config_main_t *conf; + dpdk_port_conf_t default_port_conf; /* API message ID base */ u16 msg_id_base; /* logging */ vlib_log_class_t log_default; + vlib_log_class_t log_cryptodev; } dpdk_main_t; extern dpdk_main_t dpdk_main; @@ -432,9 +373,9 @@ typedef struct u16 device_index; u8 queue_index; struct rte_mbuf mb; + u8 data[256]; /* First 256 data bytes, used for hexdump */ /* 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_trace_t; typedef struct @@ -443,14 +384,13 @@ typedef struct u16 device_index; u16 queue_index; 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 */ + vlib_buffer_t buffer; /* Copy of VLIB buffer; pkt data stored in pre_data. */ } dpdk_rx_trace_t; 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); @@ -480,9 +420,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") + format_function_t format_dpdk_device_name; format_function_t format_dpdk_device; format_function_t format_dpdk_device_errors; @@ -497,11 +467,11 @@ format_function_t format_dpdk_tx_offload_caps; 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); struct rte_pci_device *dpdk_get_pci_device (const struct rte_eth_dev_info *info); +struct rte_vmbus_device * +dpdk_get_vmbus_device (const struct rte_eth_dev_info *info); void dpdk_cli_reference (void); #if CLI_DEBUG