* driver to dynamically change the mtu. If/when the
* VIC firmware gets fixed, then this should be removed.
*/
- if (xd->pmd == VNET_DPDK_PMD_VICE ||
- xd->pmd == VNET_DPDK_PMD_ENIC)
+ if (xd->pmd == VNET_DPDK_PMD_ENIC)
{
struct rte_eth_dev_info dev_info;
return old;
}
-#ifdef NETMAP
-extern int rte_netmap_probe(void);
-#endif
-
void
dpdk_device_lock_init(dpdk_device_t * xd)
{
clib_error_t * error;
vlib_main_t * vm = vlib_get_main();
vlib_thread_main_t * tm = vlib_get_thread_main();
+ vlib_node_runtime_t * rt;
vnet_sw_interface_t * sw;
vnet_hw_interface_t * hi;
dpdk_device_t * xd;
dm->input_cpu_first_index = 0;
dm->input_cpu_count = 1;
+ rt = vlib_node_get_runtime (vm, dpdk_input_node.index);
+ rt->function = dpdk_input_multiarch_select();
+
/* find out which cpus will be used for input */
- p = hash_get_mem (tm->thread_registrations_by_name, "io");
+ p = hash_get_mem (tm->thread_registrations_by_name, "workers");
tr = p ? (vlib_thread_registration_t *) p[0] : 0;
- if (!tr || tr->count == 0)
- {
- /* no io threads, workers doing input */
- p = hash_get_mem (tm->thread_registrations_by_name, "workers");
- tr = p ? (vlib_thread_registration_t *) p[0] : 0;
- }
- else
- {
- dm->have_io_threads = 1;
- }
-
if (tr && tr->count > 0)
{
dm->input_cpu_first_index = tr->first_index;
vec_validate_aligned (dm->workers, tm->n_vlib_mains - 1,
CLIB_CACHE_LINE_BYTES);
-#ifdef NETMAP
- if(rte_netmap_probe() < 0)
- return clib_error_return (0, "rte netmap probe failed");
-#endif
-
nports = rte_eth_dev_count();
if (nports < 1)
{
for (i = 0; i < nports; i++)
{
u8 addr[6];
+ u8 vlan_strip = 0;
int j;
struct rte_eth_dev_info dev_info;
clib_error_t * rv;
struct rte_eth_link l;
+ dpdk_device_config_t * devconf = 0;
+ vlib_pci_addr_t pci_addr;
+ uword * p = 0;
+
+ rte_eth_dev_info_get(i, &dev_info);
+ if (dev_info.pci_dev) /* bonded interface has no pci info */
+ {
+ pci_addr.domain = dev_info.pci_dev->addr.domain;
+ pci_addr.bus = dev_info.pci_dev->addr.bus;
+ pci_addr.slot = dev_info.pci_dev->addr.devid;
+ pci_addr.function = dev_info.pci_dev->addr.function;
+ p = hash_get (dm->conf->device_config_index_by_pci_addr, pci_addr.as_u32);
+ }
+
+ if (p)
+ devconf = pool_elt_at_index (dm->conf->dev_confs, p[0]);
+ 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);
- rte_eth_dev_info_get(i, &dev_info);
clib_memcpy(&xd->tx_conf, &dev_info.default_txconf,
sizeof(struct rte_eth_txconf));
xd->tx_q_used = clib_min(dev_info.max_tx_queues, tm->n_vlib_mains);
- if (dm->conf->max_tx_queues)
- xd->tx_q_used = clib_min(xd->tx_q_used, dm->conf->max_tx_queues);
+ if (devconf->num_tx_queues > 0 && devconf->num_tx_queues < xd->tx_q_used)
+ xd->tx_q_used = clib_min(xd->tx_q_used, devconf->num_tx_queues);
+
+ if (devconf->num_rx_queues > 1 && dm->use_rss == 0)
+ {
+ rt->function = dpdk_input_rss_multiarch_select();
+ dm->use_rss = 1;
+ }
- if (dm->conf->use_rss > 1 && dev_info.max_rx_queues >= dm->conf->use_rss)
+ if (devconf->num_rx_queues > 1 && dev_info.max_rx_queues >= devconf->num_rx_queues)
{
- xd->rx_q_used = dm->conf->use_rss;
+ xd->rx_q_used = devconf->num_rx_queues;
xd->port_conf.rxmode.mq_mode = ETH_MQ_RX_RSS;
- xd->port_conf.rx_adv_conf.rss_conf.rss_hf = ETH_RSS_IP | ETH_RSS_UDP | ETH_RSS_TCP;
+ if (devconf->rss_fn == 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;
}
else
xd->rx_q_used = 1;
xd->dev_type = VNET_DPDK_DEV_ETH;
/* workaround for drivers not setting driver_name */
- if (!dev_info.driver_name)
+ if ((!dev_info.driver_name) && (dev_info.pci_dev))
dev_info.driver_name = dev_info.pci_dev->driver->name;
ASSERT(dev_info.driver_name);
xd->nb_rx_desc = DPDK_NB_RX_DESC_10GE;
xd->nb_tx_desc = DPDK_NB_TX_DESC_10GE;
break;
+ case VNET_DPDK_PMD_DPAA2:
+ xd->port_type = VNET_DPDK_PORT_TYPE_ETH_10G;
+ break;
/* Cisco VIC */
- case VNET_DPDK_PMD_VICE:
case VNET_DPDK_PMD_ENIC:
rte_eth_link_get_nowait(i, &l);
+ xd->nb_rx_desc = DPDK_NB_RX_DESC_ENIC;
if (l.link_speed == 40000)
{
xd->port_type = VNET_DPDK_PORT_TYPE_ETH_40G;
- xd->nb_rx_desc = DPDK_NB_RX_DESC_40GE;
xd->nb_tx_desc = DPDK_NB_TX_DESC_40GE;
}
else
{
xd->port_type = VNET_DPDK_PORT_TYPE_ETH_10G;
- xd->nb_rx_desc = DPDK_NB_RX_DESC_10GE;
xd->nb_tx_desc = DPDK_NB_TX_DESC_10GE;
}
break;
xd->port_type = VNET_DPDK_PORT_TYPE_UNKNOWN;
}
- #ifdef NETMAP
- if(strncmp(dev_info.driver_name, "vale", 4) == 0
- || strncmp(dev_info.driver_name, "netmap", 6) == 0)
- {
- xd->pmd = VNET_DPDK_PMD_NETMAP;
- xd->port_type = VNET_DPDK_PORT_TYPE_NETMAP;
- }
- #endif
+ if (devconf->num_rx_desc)
+ xd->nb_rx_desc = devconf->num_rx_desc;
+ if (devconf->num_tx_desc)
+ xd->nb_tx_desc = devconf->num_tx_desc;
}
/*
dpdk_device_and_queue_t * dq;
int q;
- for (q = 0; q < xd->rx_q_used; q++)
- {
- int cpu = dm->input_cpu_first_index + next_cpu;
- unsigned lcore = vlib_worker_threads[cpu].dpdk_lcore_id;
-
- /*
- * numa node for worker thread handling this queue
- * needed for taking buffers from the right mempool
- */
- vec_validate(xd->cpu_socket_id_by_queue, q);
- xd->cpu_socket_id_by_queue[q] = rte_lcore_to_socket_id(lcore);
-
- /*
- * construct vector of (device,queue) pairs for each worker thread
- */
- vec_add2(dm->devices_by_cpu[cpu], dq, 1);
- dq->device = xd->device_index;
- dq->queue_id = q;
-
- next_cpu++;
- if (next_cpu == dm->input_cpu_count)
- next_cpu = 0;
- }
+ if (devconf->workers)
+ {
+ int i;
+ q = 0;
+ clib_bitmap_foreach (i, devconf->workers, ({
+ int cpu = dm->input_cpu_first_index + i;
+ unsigned lcore = vlib_worker_threads[cpu].dpdk_lcore_id;
+ vec_validate(xd->cpu_socket_id_by_queue, q);
+ xd->cpu_socket_id_by_queue[q] = rte_lcore_to_socket_id(lcore);
+ vec_add2(dm->devices_by_cpu[cpu], dq, 1);
+ dq->device = xd->device_index;
+ dq->queue_id = q++;
+ }));
+ }
+ else
+ for (q = 0; q < xd->rx_q_used; q++)
+ {
+ int cpu = dm->input_cpu_first_index + next_cpu;
+ unsigned lcore = vlib_worker_threads[cpu].dpdk_lcore_id;
+
+ /*
+ * numa node for worker thread handling this queue
+ * needed for taking buffers from the right mempool
+ */
+ vec_validate(xd->cpu_socket_id_by_queue, q);
+ xd->cpu_socket_id_by_queue[q] = rte_lcore_to_socket_id(lcore);
+
+ /*
+ * construct vector of (device,queue) pairs for each worker thread
+ */
+ vec_add2(dm->devices_by_cpu[cpu], dq, 1);
+ dq->device = xd->device_index;
+ dq->queue_id = q;
+
+ next_cpu++;
+ if (next_cpu == dm->input_cpu_count)
+ next_cpu = 0;
+ }
vec_validate_aligned (xd->tx_vectors, tm->n_vlib_mains,
CLIB_CACHE_LINE_BYTES);
* driver to dynamically change the mtu. If/when the
* VIC firmware gets fixed, then this should be removed.
*/
- if (xd->pmd == VNET_DPDK_PMD_VICE ||
- xd->pmd == VNET_DPDK_PMD_ENIC)
+ if (xd->pmd == VNET_DPDK_PMD_ENIC)
{
/*
* Initialize mtu to what has been set by CIMC in the firmware cfg.
*/
hi->max_packet_bytes = dev_info.max_rx_pktlen;
- /*
- * remove vlan tag from VIC port to fix VLAN0 issue.
- * TODO Handle VLAN tagged traffic
- */
- int vlan_off;
- vlan_off = rte_eth_dev_get_vlan_offload(xd->device_index);
- vlan_off |= ETH_VLAN_STRIP_OFFLOAD;
- rte_eth_dev_set_vlan_offload(xd->device_index, vlan_off);
+ if (devconf->vlan_strip_offload != DPDK_DEVICE_VLAN_STRIP_OFF)
+ vlan_strip = 1; /* remove vlan tag from VIC port by default */
+ else
+ clib_warning("VLAN strip disabled for interface\n");
}
+ else if (devconf->vlan_strip_offload == DPDK_DEVICE_VLAN_STRIP_ON)
+ vlan_strip = 1;
+
+ if (vlan_strip)
+ {
+ int vlan_off;
+ vlan_off = rte_eth_dev_get_vlan_offload(xd->device_index);
+ vlan_off |= ETH_VLAN_STRIP_OFFLOAD;
+ if (rte_eth_dev_set_vlan_offload(xd->device_index, vlan_off) == 0)
+ clib_warning("VLAN strip enabled for interface\n");
+ else
+ clib_warning("VLAN strip cannot be supported by interface\n");
+ }
#if RTE_VERSION < RTE_VERSION_NUM(16, 4, 0, 0)
/*
vlib_pci_device_t * d;
pci_config_header_t * c;
u8 * pci_addr = 0;
+ int num_whitelisted = vec_len (conf->dev_confs);
pool_foreach (d, pm->pci_devs, ({
+ dpdk_device_config_t * devconf = 0;
c = &d->config0.header;
vec_reset_length (pci_addr);
pci_addr = format (pci_addr, "%U%c", format_vlib_pci_addr, &d->bus_address, 0);
if (c->device_class != PCI_CLASS_NETWORK_ETHERNET)
continue;
- /* if whitelist exists process only whitelisted devices */
- if (conf->eth_if_whitelist &&
- !strstr ((char *) conf->eth_if_whitelist, (char *) pci_addr))
- continue;
+ if (num_whitelisted)
+ {
+ uword * p = hash_get (conf->device_config_index_by_pci_addr, d->bus_address.as_u32);
+
+ if (!p)
+ continue;
+
+ devconf = pool_elt_at_index (conf->dev_confs, p[0]);
+ }
/* virtio */
if (c->vendor_id == 0x1af4 && c->device_id == 0x1000)
if (error)
{
- if (!conf->eth_if_whitelist)
- conf->eth_if_blacklist = format (conf->eth_if_blacklist, "%U ",
- format_vlib_pci_addr, &d->bus_address);
+ if (devconf == 0)
+ {
+ pool_get (conf->dev_confs, devconf);
+ hash_set (conf->device_config_index_by_pci_addr, d->bus_address.as_u32,
+ devconf - conf->dev_confs);
+ devconf->pci_addr.as_u32 = d->bus_address.as_u32;
+ }
+ devconf->is_blacklisted = 1;
clib_error_report (error);
}
}));
vec_free (pci_addr);
}
+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)
+{
+ clib_error_t * error = 0;
+ uword * p;
+ dpdk_device_config_t * devconf;
+ unformat_input_t sub_input;
+
+ if (is_default)
+ {
+ devconf = &conf->default_devconf;
+ }
+ else
+ {
+ p = hash_get (conf->device_config_index_by_pci_addr, pci_addr.as_u32);
+
+ if (!p)
+ {
+ pool_get (conf->dev_confs, devconf);
+ hash_set (conf->device_config_index_by_pci_addr, pci_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);
+ }
+
+ devconf->pci_addr.as_u32 = pci_addr.as_u32;
+
+ if (!input)
+ return 0;
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "num-rx-queues %u", &devconf->num_rx_queues))
+ ;
+ else if (unformat (input, "num-tx-queues %u", &devconf->num_tx_queues))
+ ;
+ else if (unformat (input, "num-rx-desc %u", &devconf->num_rx_desc))
+ ;
+ else if (unformat (input, "num-tx-desc %u", &devconf->num_tx_desc))
+ ;
+ else if (unformat (input, "workers %U", unformat_bitmap_list,
+ &devconf->workers))
+ ;
+ else if (unformat (input, "rss %U", unformat_vlib_cli_sub_input, &sub_input))
+ {
+ error = unformat_rss_fn(&sub_input, &devconf->rss_fn);
+ if (error)
+ break;
+ }
+ else if (unformat (input, "vlan-strip-offload off"))
+ devconf->vlan_strip_offload = DPDK_DEVICE_VLAN_STRIP_OFF;
+ else if (unformat (input, "vlan-strip-offload on"))
+ devconf->vlan_strip_offload = DPDK_DEVICE_VLAN_STRIP_ON;
+ else
+ {
+ error = clib_error_return (0, "unknown input `%U'",
+ format_unformat_error, input);
+ break;
+ }
+ }
+
+ if (error)
+ return error;
+
+ if (devconf->workers && devconf->num_rx_queues == 0)
+ devconf->num_rx_queues = clib_bitmap_count_set_bits(devconf->workers);
+ else if (devconf->workers &&
+ clib_bitmap_count_set_bits(devconf->workers) != devconf->num_rx_queues)
+ error = clib_error_return (0, "%U: number of worker threadds must be "
+ "equal to number of rx queues",
+ format_vlib_pci_addr, &pci_addr);
+
+ return error;
+}
+
static clib_error_t *
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();
- vlib_node_runtime_t * rt = vlib_node_get_runtime (vm, dpdk_input_node.index);
+ dpdk_device_config_t * devconf;
+ vlib_pci_addr_t pci_addr;
+ unformat_input_t sub_input;
u8 * s, * tmp = 0;
- u8 * pci_dev_id = 0;
u8 * rte_cmd = 0, * ethname = 0;
u32 log_level;
int ret, i;
- char * fmt;
-#ifdef NETMAP
- int rxrings, txrings, rxslots, txslots, txburst;
- char * nmnam;
-#endif
- unformat_input_t _in;
- unformat_input_t * in = &_in;
+ int num_whitelisted = 0;
u8 no_pci = 0;
u8 no_huge = 0;
u8 huge_dir = 0;
u8 file_prefix = 0;
u8 * socket_mem = 0;
+ conf->device_config_index_by_pci_addr = hash_create (0, sizeof (uword));
+
// MATT-FIXME: inverted virtio-vhost logic to use virtio by default
conf->use_virtio_vhost = 1;
else if (unformat (input, "no-multi-seg"))
conf->no_multi_seg = 1;
- else if (unformat (input, "dev %s", &pci_dev_id))
+ else if (unformat (input, "dev default %U", unformat_vlib_cli_sub_input,
+ &sub_input))
{
- if (conf->eth_if_whitelist)
- {
- /*
- * Don't add duplicate device id's.
- */
- if (strstr ((char *)conf->eth_if_whitelist, (char *)pci_dev_id))
- continue;
-
- _vec_len (conf->eth_if_whitelist) -= 1; // chomp trailing NULL.
- conf->eth_if_whitelist = format (conf->eth_if_whitelist, " %s%c",
- pci_dev_id, 0);
- }
- else
- conf->eth_if_whitelist = format (0, "%s%c", pci_dev_id, 0);
+ error = dpdk_device_config (conf, (vlib_pci_addr_t) (u32) ~1, &sub_input, 1);
+
+ if (error)
+ return error;
}
+ else if (unformat (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);
-#ifdef NETMAP
- else if (unformat(input, "netmap %s/%d:%d/%d:%d/%d",
- &nmname, &rxrings, &rxslots, &txrings, &txslots, &txburst)) {
- char * rv;
- rv = (char *)
- eth_nm_args(nmname, rxrings, rxslots, txrings, txslots, txburst);
- if (rv) {
- error = clib_error_return (0, "%s", rv);
- goto done;
- }
- }else if (unformat(input, "netmap %s", &nmname)) {
- char * rv;
- rv = (char *)
- eth_nm_args(nmname, 0, 0, 0, 0, 0);
- if (rv) {
- error = clib_error_return (0, "%s", rv);
- goto done;
- }
- }
-#endif
+ if (error)
+ return error;
+ num_whitelisted++;
+ }
+ else if (unformat (input, "dev %U", unformat_vlib_pci_addr, &pci_addr))
+ {
+ error = dpdk_device_config (conf, pci_addr, 0, 0);
+
+ if (error)
+ return error;
+
+ num_whitelisted++;
+ }
else if (unformat (input, "num-mbufs %d", &conf->num_mbufs))
;
- else if (unformat (input, "max-tx-queues %d", &conf->max_tx_queues))
- ;
else if (unformat (input, "kni %d", &conf->num_kni))
;
else if (unformat (input, "uio-driver %s", &conf->uio_driver_name))
;
else if (unformat (input, "enable-vhost-user"))
conf->use_virtio_vhost = 0;
- else if (unformat (input, "rss %d", &conf->use_rss))
+ else if (unformat (input, "poll-sleep %d", &dm->poll_sleep))
;
#define _(a) \
clib_bitmap_foreach (c, tm->cpu_socket_bitmap, (
{
vec_validate(mem_by_socket, c);
- mem_by_socket[c] = 512; /* default per-socket mem */
+ mem_by_socket[c] = 256; /* default per-socket mem */
}
));
}
if (no_pci == 0 && geteuid() == 0)
dpdk_bind_devices_to_uio(conf);
- /*
- * If there are whitelisted devices,
- * add the whitelist option & device list to the dpdk arg list...
- */
- if (conf->eth_if_whitelist)
- {
- unformat_init_string (in, (char *) conf->eth_if_whitelist,
- vec_len (conf->eth_if_whitelist) - 1);
- fmt = "-w%c";
- }
+#define _(x) \
+ if (devconf->x == 0 && conf->default_devconf.x > 0) \
+ devconf->x = conf->default_devconf.x ;
- /*
- * Otherwise add the blacklisted devices to the dpdk arg list.
- */
- else
- {
- unformat_init_string (in, (char *)conf->eth_if_blacklist,
- vec_len(conf->eth_if_blacklist) - 1);
- fmt = "-b%c";
- }
+ pool_foreach (devconf, conf->dev_confs, ({
- while (unformat_check_input (in) != UNFORMAT_END_OF_INPUT)
- {
- tmp = format (0, fmt, 0);
- vec_add1 (conf->eal_init_args, tmp);
- unformat (in, "%s", &pci_dev_id);
- vec_add1 (conf->eal_init_args, pci_dev_id);
- }
+ /* default per-device config items */
+ foreach_dpdk_device_config_item
+
+ /* add DPDK EAL whitelist/blacklist entry */
+ if (num_whitelisted > 0 && devconf->is_blacklisted == 0)
+ {
+ tmp = format (0, "-w%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);
+ }
+ else if (num_whitelisted == 0 && devconf->is_blacklisted != 0)
+ {
+ 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);
+ }
+ }));
+
+#undef _
/* set master-lcore */
tmp = format (0, "--master-lcore%c", 0);
return error;
}
- if (conf->use_rss)
- rt->function = dpdk_input_rss_multiarch_select();
- else
- rt->function = dpdk_input_multiarch_select();
done:
return error;
}
if (tm->n_vlib_mains == 1)
vlib_node_set_state (vm, dpdk_input_node.index,
VLIB_NODE_STATE_POLLING);
- else if (tm->main_thread_is_io_node)
- vlib_node_set_state (vm, dpdk_io_input_node.index,
- VLIB_NODE_STATE_POLLING);
- else if (!dm->have_io_threads)
+ else
for (i=0; i < tm->n_vlib_mains; i++)
if (vec_len(dm->devices_by_cpu[i]) > 0)
vlib_node_set_state (vlib_mains[i], dpdk_input_node.index,
dpdk_vhost_user_process_init(&vu_state);
- dm->io_thread_release = 1;
+ tm->worker_thread_release = 1;
f64 now = vlib_time_now (vm);
vec_foreach (xd, dm->devices)