/* Port configuration, mildly modified Intel app values */
-static struct rte_eth_conf port_conf_template = {
- .rxmode = {
- .split_hdr_size = 0,
- .header_split = 0, /**< Header Split disabled */
- .hw_ip_checksum = 0, /**< IP checksum offload disabled */
- .hw_vlan_filter = 0, /**< VLAN filtering disabled */
- .hw_strip_crc = 0, /**< CRC stripped by hardware */
- },
- .txmode = {
- .mq_mode = ETH_MQ_TX_NONE,
- },
-};
-
static dpdk_port_type_t
port_type_from_speed_capa (struct rte_eth_dev_info *dev_info)
{
return VNET_DPDK_PORT_TYPE_UNKNOWN;
}
+static dpdk_port_type_t
+port_type_from_link_speed (u32 link_speed)
+{
+ switch (link_speed)
+ {
+ case ETH_SPEED_NUM_1G:
+ return VNET_DPDK_PORT_TYPE_ETH_1G;
+ case ETH_SPEED_NUM_2_5G:
+ return VNET_DPDK_PORT_TYPE_ETH_2_5G;
+ case ETH_SPEED_NUM_5G:
+ return VNET_DPDK_PORT_TYPE_ETH_5G;
+ case ETH_SPEED_NUM_10G:
+ return VNET_DPDK_PORT_TYPE_ETH_10G;
+ case ETH_SPEED_NUM_20G:
+ return VNET_DPDK_PORT_TYPE_ETH_20G;
+ case ETH_SPEED_NUM_25G:
+ return VNET_DPDK_PORT_TYPE_ETH_25G;
+ case ETH_SPEED_NUM_40G:
+ return VNET_DPDK_PORT_TYPE_ETH_40G;
+ case ETH_SPEED_NUM_50G:
+ return VNET_DPDK_PORT_TYPE_ETH_50G;
+ case ETH_SPEED_NUM_56G:
+ return VNET_DPDK_PORT_TYPE_ETH_56G;
+ case ETH_SPEED_NUM_100G:
+ return VNET_DPDK_PORT_TYPE_ETH_100G;
+ default:
+ return VNET_DPDK_PORT_TYPE_UNKNOWN;
+ }
+}
static u32
dpdk_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hi, u32 flags)
{
xd->lockp[q] = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES,
CLIB_CACHE_LINE_BYTES);
- memset ((void *) xd->lockp[q], 0, CLIB_CACHE_LINE_BYTES);
+ clib_memset ((void *) xd->lockp[q], 0, CLIB_CACHE_LINE_BYTES);
}
}
return 0;
}
+static int
+dpdk_port_crc_strip_enabled (dpdk_device_t * xd)
+{
+#if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0)
+ if (xd->port_conf.rxmode.hw_strip_crc)
+#else
+ if (xd->port_conf.rxmode.offloads & DEV_RX_OFFLOAD_CRC_STRIP)
+#endif
+ return 1;
+ return 0;
+}
+
static clib_error_t *
dpdk_lib_init (dpdk_main_t * dm)
{
vec_validate_aligned (dm->devices_by_hqos_cpu, tm->n_vlib_mains - 1,
CLIB_CACHE_LINE_BYTES);
-#if RTE_VERSION < RTE_VERSION_NUM(18, 5, 0, 0)
- nports = rte_eth_dev_count ();
-#else
nports = rte_eth_dev_count_avail ();
-#endif
if (nports < 1)
{
rte_eth_link_get_nowait (i, &l);
rte_eth_dev_info_get (i, &dev_info);
-#if RTE_VERSION < RTE_VERSION_NUM(18, 5, 0, 0)
- pci_dev = dev_info.pci_dev;
-#else
if (dev_info.device == 0)
{
- clib_warning ("DPDK bug: missing device info. Skipping %s device",
+ clib_warning ("DPDK bug: missing device info. Skipping %s device",
dev_info.driver_name);
continue;
}
- pci_dev = RTE_DEV_TO_PCI (dev_info.device);
-#endif
+
+ pci_dev = dpdk_get_pci_device (&dev_info);
if (pci_dev) /* bonded interface has no pci info */
{
pci_addr.bus = pci_dev->addr.bus;
pci_addr.slot = pci_dev->addr.devid;
pci_addr.function = pci_dev->addr.function;
- p =
- hash_get (dm->conf->device_config_index_by_pci_addr,
- pci_addr.as_u32);
+ p = hash_get (dm->conf->device_config_index_by_pci_addr,
+ pci_addr.as_u32);
}
if (p)
struct rte_eth_dev_info di = { 0 };
struct rte_pci_device *next_pci_dev;
rte_eth_dev_info_get (i + 1, &di);
-#if RTE_VERSION < RTE_VERSION_NUM(18, 5, 0, 0)
- next_pci_dev = di.pci_dev;
-#else
next_pci_dev = di.device ? RTE_DEV_TO_PCI (di.device) : 0;
-#endif
if (pci_dev && next_pci_dev &&
pci_addr.as_u32 != last_pci_addr.as_u32 &&
memcmp (&pci_dev->addr, &next_pci_dev->addr,
if (dm->conf->no_multi_seg)
{
+#if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0)
xd->tx_conf.txq_flags |= ETH_TXQ_FLAGS_NOMULTSEGS;
- port_conf_template.rxmode.jumbo_frame = 0;
- port_conf_template.rxmode.enable_scatter = 0;
+ xd->port_conf.rxmode.jumbo_frame = 0;
+ xd->port_conf.rxmode.enable_scatter = 0;
+#else
+ xd->port_conf.txmode.offloads &= ~DEV_TX_OFFLOAD_MULTI_SEGS;
+ xd->port_conf.rxmode.offloads &= ~DEV_RX_OFFLOAD_JUMBO_FRAME;
+ xd->port_conf.rxmode.offloads &= ~DEV_RX_OFFLOAD_SCATTER;
+#endif
}
else
{
+#if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0)
xd->tx_conf.txq_flags &= ~ETH_TXQ_FLAGS_NOMULTSEGS;
- port_conf_template.rxmode.jumbo_frame = 1;
- port_conf_template.rxmode.enable_scatter = 1;
+ xd->port_conf.rxmode.jumbo_frame = 1;
+ xd->port_conf.rxmode.enable_scatter = 1;
+#else
+ xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_MULTI_SEGS;
+ xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME;
+ xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_SCATTER;
+#endif
xd->flags |= DPDK_DEVICE_FLAG_MAYBE_MULTISEG;
}
- clib_memcpy (&xd->port_conf, &port_conf_template,
- sizeof (struct rte_eth_conf));
-
xd->tx_q_used = clib_min (dev_info.max_tx_queues, tm->n_vlib_mains);
if (devconf->num_tx_queues > 0
xd->port_conf.rx_adv_conf.rss_conf.rss_hf =
ETH_RSS_IP | ETH_RSS_UDP | ETH_RSS_TCP;
else
- xd->port_conf.rx_adv_conf.rss_conf.rss_hf = devconf->rss_fn;
+ {
+ u64 unsupported_bits;
+ xd->port_conf.rx_adv_conf.rss_conf.rss_hf = devconf->rss_fn;
+ unsupported_bits = xd->port_conf.rx_adv_conf.rss_conf.rss_hf;
+ unsupported_bits &= ~dev_info.flow_type_rss_offloads;
+ if (unsupported_bits)
+ dpdk_log_warn ("Unsupported RSS hash functions: %U",
+ format_dpdk_rss_hf_name, unsupported_bits);
+ }
+ xd->port_conf.rx_adv_conf.rss_conf.rss_hf &=
+ dev_info.flow_type_rss_offloads;
}
else
xd->rx_q_used = 1;
if (dm->conf->no_tx_checksum_offload == 0)
{
- xd->tx_conf.txq_flags &= ~ETH_TXQ_FLAGS_NOXSUMS;
+#if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0)
+ xd->tx_conf.txq_flags &= ~(ETH_TXQ_FLAGS_NOXSUMUDP |
+ ETH_TXQ_FLAGS_NOXSUMTCP);
+#else
+ xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_TCP_CKSUM;
+ xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_UDP_CKSUM;
+#endif
xd->flags |=
DPDK_DEVICE_FLAG_TX_OFFLOAD |
DPDK_DEVICE_FLAG_INTEL_PHDR_CKSUM;
case VNET_DPDK_PMD_CXGBE:
case VNET_DPDK_PMD_MLX4:
case VNET_DPDK_PMD_MLX5:
+ case VNET_DPDK_PMD_QEDE:
xd->port_type = port_type_from_speed_capa (&dev_info);
break;
case VNET_DPDK_PMD_IXGBEVF:
case VNET_DPDK_PMD_I40EVF:
xd->port_type = VNET_DPDK_PORT_TYPE_ETH_VF;
+#if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0)
xd->port_conf.rxmode.hw_strip_crc = 1;
+#else
+ xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_CRC_STRIP;
+#endif
break;
case VNET_DPDK_PMD_THUNDERX:
xd->port_type = VNET_DPDK_PORT_TYPE_ETH_VF;
+#if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0)
xd->port_conf.rxmode.hw_strip_crc = 1;
+#else
+ xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_CRC_STRIP;
+#endif
break;
case VNET_DPDK_PMD_ENA:
xd->port_type = VNET_DPDK_PORT_TYPE_ETH_VF;
+#if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0)
xd->port_conf.rxmode.enable_scatter = 0;
+#else
+ xd->port_conf.rxmode.offloads &= ~DEV_RX_OFFLOAD_SCATTER;
+#endif
break;
case VNET_DPDK_PMD_DPAA2:
/* Intel Red Rock Canyon */
case VNET_DPDK_PMD_FM10K:
xd->port_type = VNET_DPDK_PORT_TYPE_ETH_SWITCH;
+#if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0)
xd->port_conf.rxmode.hw_strip_crc = 1;
+#else
+ xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_CRC_STRIP;
+#endif
break;
/* virtio */
/* vmxnet3 */
case VNET_DPDK_PMD_VMXNET3:
xd->port_type = VNET_DPDK_PORT_TYPE_ETH_1G;
+#if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0)
xd->tx_conf.txq_flags |= ETH_TXQ_FLAGS_NOMULTSEGS;
+#else
+ xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_MULTI_SEGS;
+#endif
break;
case VNET_DPDK_PMD_AF_PACKET:
xd->port_conf.intr_conf.lsc = 1;
break;
+ case VNET_DPDK_PMD_NETVSC:
+ xd->port_type = port_type_from_link_speed (l.link_speed);
+ break;
+
default:
xd->port_type = VNET_DPDK_PORT_TYPE_UNKNOWN;
}
* MTU calculations. To interop with them increase mru but only
* if the device's settings can support it.
*/
- if (xd->port_conf.rxmode.hw_strip_crc &&
+ if (dpdk_port_crc_strip_enabled (xd) &&
(dev_info.max_rx_pktlen >= (ETHERNET_MAX_PACKET_BYTES +
sizeof (ethernet_header_t) +
4)))
max_rx_frame = ETHERNET_MAX_PACKET_BYTES;
mtu = ETHERNET_MAX_PACKET_BYTES - sizeof (ethernet_header_t);
- if (xd->port_conf.rxmode.hw_strip_crc &&
+ if (dpdk_port_crc_strip_enabled (xd) &&
(dev_info.max_rx_pktlen >= (ETHERNET_MAX_PACKET_BYTES + 4)))
{
max_rx_frame += 4;
mtu = dev_mtu;
max_rx_frame = mtu + sizeof (ethernet_header_t);
- if (xd->port_conf.rxmode.hw_strip_crc)
+ if (dpdk_port_crc_strip_enabled (xd))
{
max_rx_frame += 4;
}
}
if (dm->conf->no_tx_checksum_offload == 0)
- if (xd->flags & DPDK_DEVICE_FLAG_TX_OFFLOAD)
+ if (xd->flags & DPDK_DEVICE_FLAG_TX_OFFLOAD && hi != NULL)
hi->flags |= VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD;
dpdk_device_setup (xd);
* For cisco VIC vNIC, set default to VLAN strip enabled, unless
* specified otherwise in the startup config.
* For other NICs default to VLAN strip disabled, unless specified
- * otherwis in the startup config.
+ * otherwise in the startup config.
*/
if (xd->pmd == VNET_DPDK_PMD_ENIC)
{
int vlan_off;
vlan_off = rte_eth_dev_get_vlan_offload (xd->port_id);
vlan_off |= ETH_VLAN_STRIP_OFFLOAD;
+#if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0)
xd->port_conf.rxmode.hw_vlan_strip = vlan_off;
+#else
+ if (vlan_off)
+ xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_VLAN_STRIP;
+ else
+ xd->port_conf.rxmode.offloads &= ~DEV_RX_OFFLOAD_VLAN_STRIP;
+#endif
if (rte_eth_dev_set_vlan_offload (xd->port_id, vlan_off) == 0)
dpdk_log_info ("VLAN strip enabled for interface\n");
else
static void
dpdk_bind_devices_to_uio (dpdk_config_main_t * conf)
{
+ vlib_main_t *vm = vlib_get_main ();
clib_error_t *error;
u8 *pci_addr = 0;
int num_whitelisted = vec_len (conf->dev_confs);
vlib_pci_free_device_info (d);
d = 0;
}
- d = vlib_pci_get_device_info (addr, &error);
+ d = vlib_pci_get_device_info (vm, addr, &error);
if (error)
{
clib_error_report (error);
/* Cavium Network Adapter */
else if (d->vendor_id == 0x177d && d->device_id == 0x9712)
;
- /* Mellanox */
+ /* Cavium FastlinQ QL41000 Series */
+ else if (d->vendor_id == 0x1077 && d->device_id >= 0x8070 && d->device_id <= 0x8090)
+ ;
+ /* Mellanox mlx4 */
+ else if (d->vendor_id == 0x15b3 && d->device_id >= 0x1003 && d->device_id <= 0x1004)
+ {
+ continue;
+ }
+ /* Mellanox mlx5 */
else if (d->vendor_id == 0x15b3 && d->device_id >= 0x1013 && d->device_id <= 0x101a)
{
continue;
continue;
}
- error = vlib_pci_bind_to_uio (addr, (char *) conf->uio_driver_name);
+ error = vlib_pci_bind_to_uio (vm, addr, (char *) conf->uio_driver_name);
if (error)
{
devconf->num_rx_queues)
error =
clib_error_return (0,
- "%U: number of worker threadds must be "
+ "%U: number of worker threads must be "
"equal to number of rx queues", format_vlib_pci_addr,
&pci_addr);
dpdk_config (vlib_main_t * vm, unformat_input_t * input)
{
clib_error_t *error = 0;
- dpdk_main_t *dm = &dpdk_main;
dpdk_config_main_t *conf = &dpdk_config_main;
vlib_thread_main_t *tm = vlib_get_thread_main ();
dpdk_device_config_t *devconf;
unformat_input_t sub_input;
uword x;
u8 *s, *tmp = 0;
- u8 *rte_cmd = 0, *ethname = 0;
u32 log_level;
int ret, i;
int num_whitelisted = 0;
/* Prime the pump */
if (unformat (input, "no-hugetlb"))
{
- vec_add1 (conf->eal_init_args, (u8 *) "no-huge");
+ vec_add1 (conf->eal_init_args, (u8 *) "--no-huge");
no_huge = 1;
}
num_whitelisted++;
}
+ else if (unformat (input, "num-mem-channels %d", &conf->nchannels))
+ conf->nchannels_set_manually = 0;
else if (unformat (input, "num-mbufs %d", &conf->num_mbufs))
;
else if (unformat (input, "uio-driver %s", &conf->uio_driver_name))
tmp = format (0, "--no-pci%c", 0);
vec_add1 (conf->eal_init_args, tmp);
}
- else if (unformat (input, "poll-sleep %d", &dm->poll_sleep_usec))
- ;
#define _(a) \
else if (unformat(input, #a)) \
vec_validate(mem_by_socket, c);
- e = clib_sysfs_prealloc_hugepages(c, 2 << 10, mem_by_socket[c] / 2);
+ e = clib_sysfs_prealloc_hugepages(c, 0, mem_by_socket[c] / 2);
if (e)
clib_error_report (e);
}));
}
}
- vec_free (rte_cmd);
- vec_free (ethname);
-
if (error)
return error;
vec_add1 (conf->eal_init_args, tmp);
/* set socket-mem */
- tmp = format (0, "--socket-mem%c", 0);
- vec_add1 (conf->eal_init_args, tmp);
- tmp = format (0, "%s%c", socket_mem, 0);
- vec_add1 (conf->eal_init_args, tmp);
+ if (!no_huge)
+ {
+ tmp = format (0, "--socket-mem%c", 0);
+ vec_add1 (conf->eal_init_args, tmp);
+ tmp = format (0, "%s%c", socket_mem, 0);
+ vec_add1 (conf->eal_init_args, tmp);
+ }
/* NULL terminate the "argv" vector, in case of stupidity */
vec_add1 (conf->eal_init_args, 0);
int log_fds[2] = { 0 };
if (pipe (log_fds) == 0)
{
- FILE *f = fdopen (log_fds[1], "a");
- if (f && rte_openlog_stream (f) == 0)
+ if (fcntl (log_fds[1], F_SETFL, O_NONBLOCK) == 0)
{
- clib_file_t t = { 0 };
- t.read_function = dpdk_log_read_ready;
- t.file_descriptor = log_fds[0];
- t.description = format (0, "DPDK logging pipe");
- clib_file_add (&file_main, &t);
+ FILE *f = fdopen (log_fds[1], "a");
+ if (f && rte_openlog_stream (f) == 0)
+ {
+ clib_file_t t = { 0 };
+ t.read_function = dpdk_log_read_ready;
+ t.file_descriptor = log_fds[0];
+ t.description = format (0, "DPDK logging pipe");
+ clib_file_add (&file_main, &t);
+ }
+ }
+ else
+ {
+ close (log_fds[0]);
+ close (log_fds[1]);
}
}
return;
xd->time_last_link_update = now ? now : xd->time_last_link_update;
- memset (&xd->link, 0, sizeof (xd->link));
+ clib_memset (&xd->link, 0, sizeof (xd->link));
rte_eth_link_get_nowait (xd->port_id, &xd->link);
if (LINK_STATE_ELOGS)
* 2. Set up info and register slave link state change callback handling.
* 3. Set up info for bond interface related CLI support.
*/
-#if RTE_VERSION < RTE_VERSION_NUM(18, 5, 0, 0)
- int nports = rte_eth_dev_count ();
-#else
int nports = rte_eth_dev_count_avail ();
-#endif
if (nports > 0)
{
/* *INDENT-OFF* */
xd = &dm->devices[j];
}
}
- ASSERT (xd != NULL);
-
- if (xd->pmd == VNET_DPDK_PMD_BOND)
+ if (xd != NULL && xd->pmd == VNET_DPDK_PMD_BOND)
{
u8 addr[6];
dpdk_portid_t slink[16];
{
dpdk_main_t *dm = &dpdk_main;
clib_error_t *error = 0;
- vlib_thread_main_t *tm = vlib_get_thread_main ();
/* verify that structs are cacheline aligned */
STATIC_ASSERT (offsetof (dpdk_device_t, cacheline0) == 0,
dm->conf->num_mbufs = dm->conf->num_mbufs ? dm->conf->num_mbufs : NB_MBUF;
vec_add1 (dm->conf->eal_init_args, (u8 *) "vnet");
- vec_validate (dm->recycle, tm->n_thread_stacks - 1);
-
/* Default vlib_buffer_t flags, DISABLES tcp/udp checksumming... */
dm->buffer_flags_template =
(VLIB_BUFFER_TOTAL_LENGTH_VALID | VLIB_BUFFER_EXT_HDR_VALID