#include <vlib/log.h>
#include <vnet/ethernet/ethernet.h>
+#include <vnet/interface/rx_queue_funcs.h>
#include <dpdk/buffer.h>
#include <dpdk/device/dpdk.h>
#include <dpdk/cryptodev/cryptodev.h>
#include <vlib/vmbus/vmbus.h>
#include <rte_ring.h>
+#include <rte_vect.h>
#include <stdio.h>
#include <stdlib.h>
int vlan_off;
struct rte_eth_dev_info dev_info;
struct rte_pci_device *pci_dev;
+ struct rte_vmbus_device *vmbus_dev;
dpdk_portid_t next_port_id;
dpdk_device_config_t *devconf = 0;
vlib_pci_addr_t pci_addr;
+ vlib_vmbus_addr_t vmbus_addr;
uword *p = 0;
if (!rte_eth_dev_is_valid_port(i))
pci_addr.as_u32);
}
+ vmbus_dev = dpdk_get_vmbus_device (&dev_info);
+
+ if (vmbus_dev)
+ {
+ unformat_input_t input_vmbus;
+
+ unformat_init_vector (&input_vmbus, (u8 *) dev_info.device->name);
+ if (unformat (&input_vmbus, "%U", unformat_vlib_vmbus_addr,
+ &vmbus_addr))
+ {
+ p = mhash_get (&dm->conf->device_config_index_by_vmbus_addr,
+ &vmbus_addr);
+ }
+ }
+
+ if (p)
+ {
+ devconf = pool_elt_at_index (dm->conf->dev_confs, p[0]);
+ /* If device is blacklisted, we should skip it */
+ if (devconf->is_blacklisted)
+ {
+ continue;
+ }
+ }
+ else
+ devconf = &dm->conf->default_devconf;
/* Create vnet interface */
vec_add2_aligned (dm->devices, xd, 1, CLIB_CACHE_LINE_BYTES);
xd->nb_rx_desc = DPDK_NB_RX_DESC_DEFAULT;
xd->nb_tx_desc = DPDK_NB_TX_DESC_DEFAULT;
xd->cpu_socket = (i8) rte_eth_dev_socket_id (i);
-
if (p)
{
- devconf = pool_elt_at_index (dm->conf->dev_confs, p[0]);
xd->name = devconf->name;
}
- else
- devconf = &dm->conf->default_devconf;
/* Handle representor devices that share the same PCI ID */
if (dev_info.switch_info.domain_id != RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID)
else
xd->rx_q_used = 1;
+ vec_validate_aligned (xd->rx_queues, xd->rx_q_used - 1,
+ CLIB_CACHE_LINE_BYTES);
+
xd->flags |= DPDK_DEVICE_FLAG_PMD;
/* workaround for drivers not setting driver_name */
DPDK_DEVICE_FLAG_INTEL_PHDR_CKSUM;
}
+ xd->port_conf.intr_conf.rxq = 1;
break;
case VNET_DPDK_PMD_CXGBE:
DPDK_DEVICE_FLAG_TX_OFFLOAD |
DPDK_DEVICE_FLAG_INTEL_PHDR_CKSUM;
}
+ /*xd->port_conf.intr_conf.rxq = 1;*/
break;
/* iAVF */
DPDK_DEVICE_FLAG_TX_OFFLOAD |
DPDK_DEVICE_FLAG_INTEL_PHDR_CKSUM;
}
- break;
+ xd->port_conf.intr_conf.rxq = 1;
+ break;
case VNET_DPDK_PMD_THUNDERX:
xd->port_type = VNET_DPDK_PORT_TYPE_ETH_VF;
case VNET_DPDK_PMD_ENA:
xd->port_type = VNET_DPDK_PORT_TYPE_ETH_VF;
xd->port_conf.rxmode.offloads &= ~DEV_RX_OFFLOAD_SCATTER;
+ xd->port_conf.intr_conf.rxq = 1;
break;
case VNET_DPDK_PMD_DPAA2:
sw = vnet_get_hw_sw_interface (dm->vnet_main, xd->hw_if_index);
xd->sw_if_index = sw->sw_if_index;
- vnet_hw_interface_set_input_node (dm->vnet_main, xd->hw_if_index,
- dpdk_input_node.index);
+ vnet_hw_if_set_input_node (dm->vnet_main, xd->hw_if_index,
+ dpdk_input_node.index);
if (devconf->workers)
{
int i;
q = 0;
- clib_bitmap_foreach (i, devconf->workers, ({
- vnet_hw_interface_assign_rx_thread (dm->vnet_main, xd->hw_if_index, q++,
- vdm->first_worker_thread_index + i);
- }));
+ clib_bitmap_foreach (i, devconf->workers) {
+ dpdk_rx_queue_t *rxq = vec_elt_at_index (xd->rx_queues, q);
+ rxq->queue_index = vnet_hw_if_register_rx_queue (
+ dm->vnet_main, xd->hw_if_index, q++,
+ vdm->first_worker_thread_index + i);
+ }
}
else
for (q = 0; q < xd->rx_q_used; q++)
{
- vnet_hw_interface_assign_rx_thread (dm->vnet_main, xd->hw_if_index, q, /* any */
- ~1);
+ dpdk_rx_queue_t *rxq = vec_elt_at_index (xd->rx_queues, q);
+ rxq->queue_index = vnet_hw_if_register_rx_queue (
+ dm->vnet_main, xd->hw_if_index, q, VNET_HW_IF_RXQ_THREAD_ANY);
}
+ vnet_hw_if_update_runtime_data (dm->vnet_main, xd->hw_if_index);
+
/*Get vnet hardware interface */
hi = vnet_get_hw_interface (dm->vnet_main, xd->hw_if_index);
if (!p)
{
- skipped:
- continue;
- }
+ skipped_pci:
+ continue;
+ }
devconf = pool_elt_at_index (conf->dev_confs, p[0]);
}
hash_set (conf->device_config_index_by_pci_addr, addr->as_u32,
devconf - conf->dev_confs);
devconf->pci_addr.as_u32 = addr->as_u32;
- devconf->is_blacklisted = 1;
- goto skipped;
- }
- else /* explicitly whitelisted, ignore the device blacklist */
- break;
- }
+ devconf->dev_addr_type = VNET_DEV_ADDR_PCI;
+ devconf->is_blacklisted = 1;
+ goto skipped_pci;
+ }
+ else /* explicitly whitelisted, ignore the device blacklist */
+ break;
+ }
}
/* virtio */
devconf - conf->dev_confs);
devconf->pci_addr.as_u32 = addr->as_u32;
}
+ devconf->dev_addr_type = VNET_DEV_ADDR_PCI;
devconf->is_blacklisted = 1;
clib_error_report (error);
}
{
clib_error_t *error;
vlib_vmbus_addr_t *addrs, *addr = 0;
+ int num_whitelisted = vec_len (conf->dev_confs);
+ int i;
addrs = vlib_vmbus_get_all_dev_addrs ();
/* *INDENT-OFF* */
vec_foreach (addr, addrs)
{
- error = vlib_vmbus_bind_to_uio (addr);
+ dpdk_device_config_t *devconf = 0;
+ if (num_whitelisted)
+ {
+ uword *p =
+ mhash_get (&conf->device_config_index_by_vmbus_addr, addr);
+ if (!p)
+ {
+ /* No devices blacklisted, but have whitelisted. blacklist all
+ * non-whitelisted */
+ pool_get (conf->dev_confs, devconf);
+ mhash_set (&conf->device_config_index_by_vmbus_addr, addr,
+ devconf - conf->dev_confs, 0);
+ devconf->vmbus_addr = *addr;
+ devconf->dev_addr_type = VNET_DEV_ADDR_VMBUS;
+ devconf->is_blacklisted = 1;
+ skipped_vmbus:
+ continue;
+ }
+
+ devconf = pool_elt_at_index (conf->dev_confs, p[0]);
+ }
+ /* Enforce Device blacklist by vmbus_addr */
+ for (i = 0; i < vec_len (conf->blacklist_by_vmbus_addr); i++)
+ {
+ vlib_vmbus_addr_t *a1 = &conf->blacklist_by_vmbus_addr[i];
+ vlib_vmbus_addr_t *a2 = addr;
+ if (memcmp (a1, a2, sizeof (vlib_vmbus_addr_t)) == 0)
+ {
+ if (devconf == 0)
+ {
+ /* Device not whitelisted */
+ pool_get (conf->dev_confs, devconf);
+ mhash_set (&conf->device_config_index_by_vmbus_addr, addr,
+ devconf - conf->dev_confs, 0);
+ devconf->vmbus_addr = *addr;
+ devconf->dev_addr_type = VNET_DEV_ADDR_VMBUS;
+ devconf->is_blacklisted = 1;
+ goto skipped_vmbus;
+ }
+ else
+ {
+ break;
+ }
+ }
+ }
+
+ error = vlib_vmbus_bind_to_uio (addr);
if (error)
{
+ if (devconf == 0)
+ {
+ pool_get (conf->dev_confs, devconf);
+ mhash_set (&conf->device_config_index_by_vmbus_addr, addr,
+ devconf - conf->dev_confs, 0);
+ devconf->vmbus_addr = *addr;
+ }
+ devconf->dev_addr_type = VNET_DEV_ADDR_VMBUS;
+ devconf->is_blacklisted = 1;
clib_error_report (error);
}
}
}
static clib_error_t *
-dpdk_device_config (dpdk_config_main_t * conf, vlib_pci_addr_t pci_addr,
- unformat_input_t * input, u8 is_default)
+dpdk_device_config (dpdk_config_main_t *conf, void *addr,
+ dpdk_device_addr_type_t addr_type, unformat_input_t *input,
+ u8 is_default)
{
clib_error_t *error = 0;
uword *p;
- dpdk_device_config_t *devconf;
+ dpdk_device_config_t *devconf = 0;
unformat_input_t sub_input;
if (is_default)
{
devconf = &conf->default_devconf;
}
- else
+ else if (addr_type == VNET_DEV_ADDR_PCI)
{
- p = hash_get (conf->device_config_index_by_pci_addr, pci_addr.as_u32);
+ p = hash_get (conf->device_config_index_by_pci_addr,
+ ((vlib_pci_addr_t *) (addr))->as_u32);
if (!p)
{
pool_get (conf->dev_confs, devconf);
- hash_set (conf->device_config_index_by_pci_addr, pci_addr.as_u32,
+ hash_set (conf->device_config_index_by_pci_addr,
+ ((vlib_pci_addr_t *) (addr))->as_u32,
devconf - conf->dev_confs);
}
else
return clib_error_return (0,
"duplicate configuration for PCI address %U",
- format_vlib_pci_addr, &pci_addr);
+ format_vlib_pci_addr, addr);
}
+ else if (addr_type == VNET_DEV_ADDR_VMBUS)
+ {
+ p = mhash_get (&conf->device_config_index_by_vmbus_addr,
+ (vlib_vmbus_addr_t *) (addr));
- devconf->pci_addr.as_u32 = pci_addr.as_u32;
- devconf->tso = DPDK_DEVICE_TSO_DEFAULT;
+ if (!p)
+ {
+ pool_get (conf->dev_confs, devconf);
+ mhash_set (&conf->device_config_index_by_vmbus_addr, addr,
+ devconf - conf->dev_confs, 0);
+ }
+ else
+ return clib_error_return (
+ 0, "duplicate configuration for VMBUS address %U",
+ format_vlib_vmbus_addr, addr);
+ }
+
+ if (addr_type == VNET_DEV_ADDR_PCI)
+ {
+ devconf->pci_addr.as_u32 = ((vlib_pci_addr_t *) (addr))->as_u32;
+ devconf->tso = DPDK_DEVICE_TSO_DEFAULT;
+ devconf->dev_addr_type = VNET_DEV_ADDR_PCI;
+ }
+ else if (addr_type == VNET_DEV_ADDR_VMBUS)
+ {
+ devconf->vmbus_addr = *((vlib_vmbus_addr_t *) (addr));
+ devconf->tso = DPDK_DEVICE_TSO_DEFAULT;
+ devconf->dev_addr_type = VNET_DEV_ADDR_VMBUS;
+ }
if (!input)
return 0;
else if (devconf->workers &&
clib_bitmap_count_set_bits (devconf->workers) !=
devconf->num_rx_queues)
- error =
- clib_error_return (0,
- "%U: number of worker threads must be "
- "equal to number of rx queues", format_vlib_pci_addr,
- &pci_addr);
+ error = clib_error_return (0,
+ "%U: number of worker threads must be "
+ "equal to number of rx queues",
+ format_vlib_pci_addr, addr);
return error;
}
dpdk_config_main_t *conf = &dpdk_config_main;
vlib_thread_main_t *tm = vlib_get_thread_main ();
dpdk_device_config_t *devconf;
- vlib_pci_addr_t pci_addr;
+ vlib_pci_addr_t pci_addr = { 0 };
+ vlib_vmbus_addr_t vmbus_addr = { 0 };
unformat_input_t sub_input;
uword default_hugepage_sz, x;
u8 *s, *tmp = 0;
format (0, "%s/hugepages%c", vlib_unix_get_runtime_dir (), 0);
conf->device_config_index_by_pci_addr = hash_create (0, sizeof (uword));
+ mhash_init (&conf->device_config_index_by_vmbus_addr, sizeof (uword),
+ sizeof (vlib_vmbus_addr_t));
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
&sub_input))
{
error =
- dpdk_device_config (conf, (vlib_pci_addr_t) (u32) ~ 1, &sub_input,
- 1);
+ dpdk_device_config (conf, 0, VNET_DEV_ADDR_ANY, &sub_input, 1);
if (error)
return error;
(input, "dev %U %U", unformat_vlib_pci_addr, &pci_addr,
unformat_vlib_cli_sub_input, &sub_input))
{
- error = dpdk_device_config (conf, pci_addr, &sub_input, 0);
+ error = dpdk_device_config (conf, &pci_addr, VNET_DEV_ADDR_PCI,
+ &sub_input, 0);
if (error)
return error;
}
else if (unformat (input, "dev %U", unformat_vlib_pci_addr, &pci_addr))
{
- error = dpdk_device_config (conf, pci_addr, 0, 0);
+ error =
+ dpdk_device_config (conf, &pci_addr, VNET_DEV_ADDR_PCI, 0, 0);
+
+ if (error)
+ return error;
+
+ num_whitelisted++;
+ }
+ else if (unformat (input, "dev %U %U", unformat_vlib_vmbus_addr,
+ &vmbus_addr, unformat_vlib_cli_sub_input, &sub_input))
+ {
+ error = dpdk_device_config (conf, &vmbus_addr, VNET_DEV_ADDR_VMBUS,
+ &sub_input, 0);
+
+ if (error)
+ return error;
+
+ num_whitelisted++;
+ }
+ else if (unformat (input, "dev %U", unformat_vlib_vmbus_addr,
+ &vmbus_addr))
+ {
+ error =
+ dpdk_device_config (conf, &vmbus_addr, VNET_DEV_ADDR_VMBUS, 0, 0);
if (error)
return error;
tmp = format (0, "--no-pci%c", 0);
vec_add1 (conf->eal_init_args, tmp);
}
+ else if (unformat (input, "blacklist %U", unformat_vlib_vmbus_addr,
+ &vmbus_addr))
+ {
+ vec_add1 (conf->blacklist_by_vmbus_addr, vmbus_addr);
+ }
else
if (unformat
(input, "blacklist %x:%x:%x.%x", &domain, &bus, &device, &func))
default_hugepage_sz = clib_mem_get_default_hugepage_size ();
/* *INDENT-OFF* */
- clib_bitmap_foreach (x, tm->cpu_socket_bitmap, (
+ clib_bitmap_foreach (x, tm->cpu_socket_bitmap)
{
clib_error_t *e;
uword n_pages;
if ((e = clib_sysfs_prealloc_hugepages(x, 0, n_pages)))
clib_error_report (e);
- }));
+ }
/* *INDENT-ON* */
}
devconf->x = conf->default_devconf.x ;
/* *INDENT-OFF* */
- pool_foreach (devconf, conf->dev_confs, ({
+ pool_foreach (devconf, conf->dev_confs) {
/* default per-device config items */
foreach_dpdk_device_config_item
- /* copy vlan_strip config from default device */
- if (devconf->vlan_strip_offload == 0 &&
- conf->default_devconf.vlan_strip_offload > 0)
- devconf->vlan_strip_offload =
- conf->default_devconf.vlan_strip_offload;
+ /* copy vlan_strip config from default device */
+ _ (vlan_strip_offload)
- /* copy tso config from default device */
- _(tso)
+ /* copy tso config from default device */
+ _ (tso)
- /* copy tso config from default device */
- _(devargs)
+ /* copy tso config from default device */
+ _ (devargs)
- /* copy rss_queues config from default device */
- _(rss_queues)
+ /* copy rss_queues config from default device */
+ _ (rss_queues)
- /* add DPDK EAL whitelist/blacklist entry */
- if (num_whitelisted > 0 && devconf->is_blacklisted == 0)
+ /* add DPDK EAL whitelist/blacklist entry */
+ if (num_whitelisted > 0 && devconf->is_blacklisted == 0 &&
+ devconf->dev_addr_type == VNET_DEV_ADDR_PCI)
{
- tmp = format (0, "-w%c", 0);
+ tmp = format (0, "-a%c", 0);
vec_add1 (conf->eal_init_args, tmp);
if (devconf->devargs)
{
- tmp = format (0, "%U,%s", format_vlib_pci_addr, &devconf->pci_addr, devconf->devargs, 0);
+ tmp = format (0, "%U,%s%c", format_vlib_pci_addr,
+ &devconf->pci_addr, devconf->devargs, 0);
}
else
{
}
vec_add1 (conf->eal_init_args, tmp);
}
- else if (num_whitelisted == 0 && devconf->is_blacklisted != 0)
+ else if (num_whitelisted == 0 && devconf->is_blacklisted != 0 &&
+ devconf->dev_addr_type == VNET_DEV_ADDR_PCI)
{
tmp = format (0, "-b%c", 0);
vec_add1 (conf->eal_init_args, tmp);
tmp = format (0, "%U%c", format_vlib_pci_addr, &devconf->pci_addr, 0);
vec_add1 (conf->eal_init_args, tmp);
}
- }));
+ }
/* *INDENT-ON* */
#undef _
/* set master-lcore */
- tmp = format (0, "--master-lcore%c", 0);
+ tmp = format (0, "--main-lcore%c", 0);
vec_add1 (conf->eal_init_args, tmp);
tmp = format (0, "%u%c", tm->main_lcore, 0);
vec_add1 (conf->eal_init_args, tmp);
ret = rte_eal_init (vec_len (conf->eal_init_args),
(char **) conf->eal_init_args);
+ /* enable the AVX-512 vPMDs in DPDK */
+ if (clib_cpu_supports_avx512_bitalg ())
+ rte_vect_set_max_simd_bitwidth (RTE_VECT_SIMD_512);
+
/* lazy umount hugepages */
umount2 ((char *) huge_dir_path, MNT_DETACH);
rmdir ((char *) huge_dir_path);
Code Review / vpp.git / blobdiff