#include <rte_mempool.h>
#include <rte_mbuf.h>
#include <rte_version.h>
-#include <rte_eth_bond.h>
#include <rte_sched.h>
#include <rte_net.h>
#include <rte_bus_pci.h>
#include <rte_flow.h>
-#include <vnet/unix/pcap.h>
#include <vnet/devices/devices.h>
#if CLIB_DEBUG > 0
#include <vlib/pci/pci.h>
#include <vnet/flow/flow.h>
-#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) \
_ ("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_bonding", BOND) \
_ ("net_fm10k", FM10K) \
_ ("net_cxgbe", CXGBE) \
_ ("net_mlx4", MLX4) \
_ ("net_ena", ENA) \
_ ("net_failsafe", FAILSAFE) \
_ ("net_liovf", LIOVF_ETHER) \
- _ ("net_qede", QEDE)
+ _ ("net_qede", QEDE) \
+ _ ("net_netvsc", NETVSC) \
+ _ ("net_bnxt", BNXT)
typedef enum
{
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_FAILSAFE,
+ VNET_DPDK_PORT_TYPE_NETVSC,
VNET_DPDK_PORT_TYPE_UNKNOWN,
} dpdk_port_type_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;
- 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") \
_( 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") \
- _(11, RX_FLOW_OFFLOAD, "rx-flow-offload")
+ _(11, RX_FLOW_OFFLOAD, "rx-flow-offload") \
+ _(12, RX_IP4_CKSUM, "rx-ip4-cksum")
enum
{
u16 nb_tx_desc;
CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
+ u8 *name;
u8 *interface_name_suffix;
/* number of sub-interfaces */
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 */
+ /* af_packet instance number */
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 */
- dpdk_portid_t bond_port;
struct rte_eth_link link;
f64 time_last_link_update;
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;
#define HQOS_FLUSH_COUNT_THRESHOLD 100000
#endif
-typedef struct dpdk_device_config_hqos_t
-{
- 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);
-void dpdk_device_config_hqos_default (dpdk_device_config_hqos_t * hqos);
-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) \
typedef struct
{
vlib_pci_addr_t pci_addr;
+ u8 *name;
u8 is_blacklisted;
u8 vlan_strip_offload;
#define DPDK_DEVICE_VLAN_STRIP_DEFAULT 0
foreach_dpdk_device_config_item
#undef _
clib_bitmap_t * workers;
- u32 hqos_enabled;
- dpdk_device_config_hqos_t hqos;
+ u8 tso;
+ u8 *devargs;
+
+#define DPDK_DEVICE_TSO_DEFAULT 0
+#define DPDK_DEVICE_TSO_OFF 1
+#define DPDK_DEVICE_TSO_ON 2
} dpdk_device_config_t;
typedef struct
u8 nchannels_set_manually;
u32 coremask;
u32 nchannels;
- u32 num_mbufs;
+ u32 num_crypto_mbufs;
/*
* format interface names ala xxxEthernet%d/%d/%d instead of
dpdk_device_config_t *dev_confs;
uword *device_config_index_by_pci_addr;
+ /* devices blacklist by pci vendor_id, device_id */
+ u32 *blacklist_by_pci_vendor_and_device;
+
} dpdk_config_main_t;
extern dpdk_config_main_t dpdk_config_main;
u32 buffers[DPDK_RX_BURST_SZ];
u16 next[DPDK_RX_BURST_SZ];
u16 etype[DPDK_RX_BURST_SZ];
- u8 flags[DPDK_RX_BURST_SZ];
+ u16 flags[DPDK_RX_BURST_SZ];
vlib_buffer_t buffer_template;
} dpdk_per_thread_data_t;
-typedef struct
-{
- int pcap_enable;
- pcap_main_t pcap_main;
- u8 *pcap_filename;
- u32 pcap_sw_if_index;
- u32 pcap_pkts_to_capture;
-} dpdk_pcap_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;
-
/* buffer flags template, configurable to enable/disable tcp / udp cksum */
u32 buffer_flags_template;
- /* 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;
- u32 pcap_pkts_to_capture;
-
/*
* 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;
vnet_main_t *vnet_main;
dpdk_config_main_t *conf;
- /* mempool */
- struct rte_mempool **pktmbuf_pools;
-
/* API message ID base */
u16 msg_id_base;
format_function_t format_dpdk_rte_mbuf;
format_function_t format_dpdk_rx_rte_mbuf;
format_function_t format_dpdk_flow;
-unformat_function_t unformat_dpdk_log_level;
+format_function_t format_dpdk_rss_hf_name;
+format_function_t format_dpdk_rx_offload_caps;
+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);
-
-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);
+struct rte_pci_device *dpdk_get_pci_device (const struct rte_eth_dev_info
+ *info);
+void dpdk_cli_reference (void);
#if CLI_DEBUG
int dpdk_buffer_validate_trajectory_all (u32 * uninitialized);
Code Review / vpp.git / blobdiff