X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2Fdevice%2Fdpdk.h;h=a0c57ea21b3202ed80ffb1a0eea0fae0e458a632;hb=71612d61930e57e7c8ebf9e5647b15a4b23720b2;hp=2a1a62057c363eb4a632b89b0789a18d825da99f;hpb=c3a814be9dc769be942ff8029c7b6eccd4b3af05;p=vpp.git diff --git a/src/plugins/dpdk/device/dpdk.h b/src/plugins/dpdk/device/dpdk.h index 2a1a62057c3..a0c57ea21b3 100644 --- a/src/plugins/dpdk/device/dpdk.h +++ b/src/plugins/dpdk/device/dpdk.h @@ -22,32 +22,23 @@ #include #include -#include #include -#include -#include #include #include -#include -#include #include -#include #include #include -#include #include #include -#include -#include #include #include #include #include #include -#include #include #include #include +#include #include #include @@ -64,7 +55,6 @@ extern vnet_device_class_t dpdk_device_class; extern vlib_node_registration_t dpdk_input_node; -extern vlib_node_registration_t handoff_dispatch_node; #define foreach_dpdk_pmd \ _ ("net_thunderx", THUNDERX) \ @@ -79,11 +69,14 @@ extern vlib_node_registration_t handoff_dispatch_node; _ ("net_enic", ENIC) \ _ ("net_vmxnet3", VMXNET3) \ _ ("AF_PACKET PMD", AF_PACKET) \ - _ ("rte_bond_pmd", BOND) \ + _ ("net_bonding", BOND) \ _ ("net_fm10k", FM10K) \ _ ("net_cxgbe", CXGBE) \ + _ ("net_mlx4", MLX4) \ _ ("net_mlx5", MLX5) \ - _ ("net_dpaa2", DPAA2) + _ ("net_dpaa2", DPAA2) \ + _ ("net_virtio_user", VIRTIO_USER) \ + _ ("net_vhost", VHOST_ETHER) typedef enum { @@ -98,11 +91,16 @@ typedef enum { VNET_DPDK_PORT_TYPE_ETH_1G, VNET_DPDK_PORT_TYPE_ETH_10G, + VNET_DPDK_PORT_TYPE_ETH_25G, VNET_DPDK_PORT_TYPE_ETH_40G, + VNET_DPDK_PORT_TYPE_ETH_50G, 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; @@ -154,7 +152,7 @@ typedef struct /* Instance ID */ u32 device_index; - u32 vlib_hw_if_index; + u32 hw_if_index; u32 vlib_sw_if_index; /* next node index if we decide to steal the rx graph arc */ @@ -174,10 +172,14 @@ typedef struct #define DPDK_DEVICE_FLAG_ADMIN_UP (1 << 0) #define DPDK_DEVICE_FLAG_PROMISC (1 << 1) #define DPDK_DEVICE_FLAG_PMD (1 << 2) -#define DPDK_DEVICE_FLAG_PMD_SUPPORTS_PTYPE (1 << 3) +#define DPDK_DEVICE_FLAG_PMD_INIT_FAIL (1 << 3) #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); @@ -199,8 +201,12 @@ typedef struct dpdk_device_hqos_per_worker_thread_t *hqos_wt; dpdk_device_hqos_per_hqos_thread_t *hqos_ht; - /* af_packet */ - u8 af_packet_port_id; + /* af_packet or BondEthernet instance number */ + u8 port_id; + + /* Bonded interface port# of a slave - + only valid if DPDK_DEVICE_FLAG_BOND_SLAVE bit is set */ + u8 bond_port; struct rte_eth_link link; f64 time_last_link_update; @@ -215,6 +221,9 @@ typedef struct /* mac address */ u8 *default_mac_address; + + /* error string */ + clib_error_t *errors; } dpdk_device_t; #define DPDK_STATS_POLL_INTERVAL (10.0) @@ -302,7 +311,6 @@ typedef struct u8 *uio_driver_name; u8 no_multi_seg; u8 enable_tcp_udp_checksum; - u8 cryptodev; /* Required config parameters */ u8 coremask_set_manually; @@ -310,7 +318,6 @@ typedef struct u32 coremask; u32 nchannels; u32 num_mbufs; - u8 num_kni; /* while kni_init allows u32, port_id in callback fn is only u8 */ /* * format interface names ala xxxEthernet%d/%d/%d instead of @@ -325,19 +332,21 @@ typedef struct } dpdk_config_main_t; -dpdk_config_main_t dpdk_config_main; +extern dpdk_config_main_t dpdk_config_main; typedef struct { /* Devices */ dpdk_device_t *devices; - dpdk_device_and_queue_t **devices_by_cpu; dpdk_device_and_queue_t **devices_by_hqos_cpu; /* per-thread recycle lists */ u32 **recycle; + /* per-thread buffer templates */ + vlib_buffer_t *buffer_templates; + /* buffer flags template, configurable to enable/disable tcp / udp cksum */ u32 buffer_flags_template; @@ -354,12 +363,6 @@ typedef struct u32 pcap_sw_if_index; u32 pcap_pkts_to_capture; - /* hashes */ - uword *dpdk_device_by_kni_port_id; - uword *vu_sw_if_index_by_listener_fd; - uword *vu_sw_if_index_by_sock_fd; - u32 *vu_inactive_interfaces_device_index; - /* * flag indicating that a posted admin up/down * (via post_sw_interface_set_flags) is in progress @@ -368,10 +371,6 @@ typedef struct u8 use_rss; - /* which cpus are running dpdk-input */ - int input_cpu_first_index; - int input_cpu_count; - /* which cpus are running I/O TX */ int hqos_cpu_first_index; int hqos_cpu_count; @@ -380,8 +379,8 @@ typedef struct f64 link_state_poll_interval; f64 stat_poll_interval; - /* Sleep for this many MS after each device poll */ - u32 poll_sleep; + /* Sleep for this many usec after each device poll */ + u32 poll_sleep_usec; /* convenience */ vlib_main_t *vlib_main; @@ -395,7 +394,7 @@ typedef struct u16 msg_id_base; } dpdk_main_t; -dpdk_main_t dpdk_main; +extern dpdk_main_t dpdk_main; typedef struct { @@ -417,21 +416,18 @@ typedef struct u8 data[256]; /* First 256 data bytes, used for hexdump */ } dpdk_rx_dma_trace_t; -void vnet_buffer_needs_dpdk_mb (vlib_buffer_t * b); - -clib_error_t *dpdk_set_mac_address (vnet_hw_interface_t * hi, char *address); - -clib_error_t *dpdk_set_mc_filter (vnet_hw_interface_t * hi, - struct ether_addr mc_addr_vec[], int naddr); - -void dpdk_thread_input (dpdk_main_t * dm, dpdk_device_t * xd); - -clib_error_t *dpdk_port_setup (dpdk_main_t * dm, dpdk_device_t * xd); +void dpdk_device_setup (dpdk_device_t * xd); +void dpdk_device_start (dpdk_device_t * xd); +void dpdk_device_stop (dpdk_device_t * xd); -u32 dpdk_interface_tx_vector (vlib_main_t * vm, u32 dev_instance); - -struct rte_mbuf *dpdk_replicate_packet_mb (vlib_buffer_t * b); -struct rte_mbuf *dpdk_zerocopy_replicate_packet_mb (vlib_buffer_t * b); +#if DPDK_VOID_CALLBACK +void dpdk_port_state_callback (uint8_t port_id, + enum rte_eth_event_type type, void *param); +#else +int dpdk_port_state_callback (uint8_t port_id, + enum rte_eth_event_type type, + void *param, void *ret_param); +#endif #define foreach_dpdk_error \ _(NONE, "no error") \ @@ -450,27 +446,16 @@ typedef enum DPDK_N_ERROR, } dpdk_error_t; -int dpdk_set_stat_poll_interval (f64 interval); -int dpdk_set_link_state_poll_interval (f64 interval); void dpdk_update_link_state (dpdk_device_t * xd, f64 now); -void dpdk_device_lock_init (dpdk_device_t * xd); -void dpdk_device_lock_free (dpdk_device_t * xd); - -void dpdk_rx_trace (dpdk_main_t * dm, - vlib_node_runtime_t * node, - dpdk_device_t * xd, - u16 queue_id, u32 * buffers, uword n_buffers); - -#define EFD_OPERATION_LESS_THAN 0 -#define EFD_OPERATION_GREATER_OR_EQUAL 1 format_function_t format_dpdk_device_name; format_function_t format_dpdk_device; +format_function_t format_dpdk_device_errors; format_function_t format_dpdk_tx_dma_trace; format_function_t format_dpdk_rx_dma_trace; format_function_t format_dpdk_rte_mbuf; format_function_t format_dpdk_rx_rte_mbuf; -unformat_function_t unformat_socket_mem; +unformat_function_t unformat_dpdk_log_level; 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); @@ -479,6 +464,14 @@ uword admin_up_down_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f); +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__ */ /*