Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Coordinate known Ethernet speeds with Linux kernel and DPDK
[vpp.git]
/
src
/
plugins
/
dpdk
/
device
/
dpdk.h
diff --git
a/src/plugins/dpdk/device/dpdk.h
b/src/plugins/dpdk/device/dpdk.h
index
849e687
..
1f43a48
100644
(file)
--- a/
src/plugins/dpdk/device/dpdk.h
+++ b/
src/plugins/dpdk/device/dpdk.h
@@
-39,6
+39,7
@@
#include <rte_eth_bond.h>
#include <rte_sched.h>
#include <rte_net.h>
#include <rte_eth_bond.h>
#include <rte_sched.h>
#include <rte_net.h>
+#include <rte_bus_pci.h>
#include <vnet/unix/pcap.h>
#include <vnet/devices/devices.h>
#include <vnet/unix/pcap.h>
#include <vnet/devices/devices.h>
@@
-76,7
+77,8
@@
extern vlib_node_registration_t dpdk_input_node;
_ ("net_mlx5", MLX5) \
_ ("net_dpaa2", DPAA2) \
_ ("net_virtio_user", VIRTIO_USER) \
_ ("net_mlx5", MLX5) \
_ ("net_dpaa2", DPAA2) \
_ ("net_virtio_user", VIRTIO_USER) \
- _ ("net_vhost", VHOST_ETHER)
+ _ ("net_vhost", VHOST_ETHER) \
+ _ ("net_ena", ENA)
typedef enum
{
typedef enum
{
@@
-90,10
+92,14
@@
typedef enum
typedef enum
{
VNET_DPDK_PORT_TYPE_ETH_1G,
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_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_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_BOND,
VNET_DPDK_PORT_TYPE_ETH_SWITCH,
VNET_DPDK_PORT_TYPE_ETH_100G,
VNET_DPDK_PORT_TYPE_ETH_BOND,
VNET_DPDK_PORT_TYPE_ETH_SWITCH,
@@
-115,6
+121,8
@@
typedef struct
u64 tx_tail;
} tx_ring_hdr_t;
u64 tx_tail;
} tx_ring_hdr_t;
+typedef uint16_t dpdk_portid_t;
+
typedef struct
{
struct rte_ring *swq;
typedef struct
{
struct rte_ring *swq;
@@
-150,7
+158,7
@@
typedef struct
volatile u32 **lockp;
/* Instance ID */
volatile u32 **lockp;
/* Instance ID */
-
u32
device_index;
+
dpdk_portid_t
device_index;
u32 hw_if_index;
u32 vlib_sw_if_index;
u32 hw_if_index;
u32 vlib_sw_if_index;
@@
-162,9
+170,6
@@
typedef struct
struct rte_mbuf ***tx_vectors; /* one per worker thread */
struct rte_mbuf ***rx_vectors;
struct rte_mbuf ***tx_vectors; /* one per worker thread */
struct rte_mbuf ***rx_vectors;
- /* vector of traced contexts, per device */
- u32 **d_trace_buffers;
-
dpdk_pmd_t pmd:8;
i8 cpu_socket;
dpdk_pmd_t pmd:8;
i8 cpu_socket;
@@
-194,6
+199,7
@@
typedef struct
u16 rx_q_used;
u16 nb_rx_desc;
u16 *cpu_socket_id_by_queue;
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;
struct rte_eth_conf port_conf;
struct rte_eth_txconf tx_conf;
@@
-202,11
+208,11
@@
typedef struct
dpdk_device_hqos_per_hqos_thread_t *hqos_ht;
/* af_packet or BondEthernet instance number */
dpdk_device_hqos_per_hqos_thread_t *hqos_ht;
/* af_packet or BondEthernet instance number */
-
u8
port_id;
+
dpdk_portid_t
port_id;
/* Bonded interface port# of a slave -
only valid if DPDK_DEVICE_FLAG_BOND_SLAVE bit is set */
/* Bonded interface port# of a slave -
only valid if DPDK_DEVICE_FLAG_BOND_SLAVE bit is set */
-
u8
bond_port;
+
dpdk_portid_t
bond_port;
struct rte_eth_link link;
f64 time_last_link_update;
struct rte_eth_link link;
f64 time_last_link_update;
@@
-311,6
+317,7
@@
typedef struct
u8 *uio_driver_name;
u8 no_multi_seg;
u8 enable_tcp_udp_checksum;
u8 *uio_driver_name;
u8 no_multi_seg;
u8 enable_tcp_udp_checksum;
+ u8 no_tx_checksum_offload;
/* Required config parameters */
u8 coremask_set_manually;
/* Required config parameters */
u8 coremask_set_manually;
@@
-332,7
+339,7
@@
typedef struct
} dpdk_config_main_t;
} dpdk_config_main_t;
-dpdk_config_main_t dpdk_config_main;
+
extern
dpdk_config_main_t dpdk_config_main;
typedef struct
{
typedef struct
{
@@
-350,12
+357,6
@@
typedef struct
/* buffer flags template, configurable to enable/disable tcp / udp cksum */
u32 buffer_flags_template;
/* buffer flags template, configurable to enable/disable tcp / udp cksum */
u32 buffer_flags_template;
- /* vlib buffer free list, must be same size as an rte_mbuf */
- u32 vlib_buffer_free_list_index;
-
- /* Ethernet input node index */
- u32 ethernet_input_node_index;
-
/* pcap tracing [only works if (CLIB_DEBUG > 0)] */
int tx_pcap_enable;
pcap_main_t pcap_main;
/* pcap tracing [only works if (CLIB_DEBUG > 0)] */
int tx_pcap_enable;
pcap_main_t pcap_main;
@@
-369,8
+370,6
@@
typedef struct
*/
u8 admin_up_down_in_progress;
*/
u8 admin_up_down_in_progress;
- u8 use_rss;
-
/* which cpus are running I/O TX */
int hqos_cpu_first_index;
int hqos_cpu_count;
/* which cpus are running I/O TX */
int hqos_cpu_first_index;
int hqos_cpu_count;
@@
-404,6
+403,7
@@
typedef struct
struct rte_mbuf mb;
/* Copy of VLIB buffer; packet data stored in pre_data. */
vlib_buffer_t buffer;
struct rte_mbuf mb;
/* 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_dma_trace_t;
typedef struct
} dpdk_tx_dma_trace_t;
typedef struct
@@
-420,14
+420,9
@@
void dpdk_device_setup (dpdk_device_t * xd);
void dpdk_device_start (dpdk_device_t * xd);
void dpdk_device_stop (dpdk_device_t * xd);
void dpdk_device_start (dpdk_device_t * xd);
void dpdk_device_stop (dpdk_device_t * xd);
-#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,
+int dpdk_port_state_callback (dpdk_portid_t port_id,
enum rte_eth_event_type type,
void *param, void *ret_param);
enum rte_eth_event_type type,
void *param, void *ret_param);
-#endif
#define foreach_dpdk_error \
_(NONE, "no error") \
#define foreach_dpdk_error \
_(NONE, "no error") \
@@
-464,9
+459,20
@@
uword
admin_up_down_process (vlib_main_t * vm,
vlib_node_runtime_t * rt, vlib_frame_t * f);
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);
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__ */
/*
#endif /* __included_dpdk_h__ */
/*