X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2Fdevice%2Finit.c;h=f3d228c5820175cd747f8a39315770ca39300f40;hb=982272974;hp=ae50b7aa253b45316b0766134cf165ff0a3b665c;hpb=f539578bac8b64886b57c460c9d74273e6613f8b;p=vpp.git diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c index ae50b7aa253..f3d228c5820 100644 --- a/src/plugins/dpdk/device/init.c +++ b/src/plugins/dpdk/device/init.c @@ -113,44 +113,34 @@ dpdk_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hi, u32 flags) { dpdk_main_t *dm = &dpdk_main; dpdk_device_t *xd = vec_elt_at_index (dm->devices, hi->dev_instance); - u32 old = 0; + u32 old = (xd->flags & DPDK_DEVICE_FLAG_PROMISC) != 0; - if (ETHERNET_INTERFACE_FLAG_CONFIG_PROMISC (flags)) - { - old = (xd->flags & DPDK_DEVICE_FLAG_PROMISC) != 0; - - if (flags & ETHERNET_INTERFACE_FLAG_ACCEPT_ALL) - xd->flags |= DPDK_DEVICE_FLAG_PROMISC; - else - xd->flags &= ~DPDK_DEVICE_FLAG_PROMISC; - - if (xd->flags & DPDK_DEVICE_FLAG_ADMIN_UP) - { - if (xd->flags & DPDK_DEVICE_FLAG_PROMISC) - rte_eth_promiscuous_enable (xd->port_id); - else - rte_eth_promiscuous_disable (xd->port_id); - } - } - else if (ETHERNET_INTERFACE_FLAG_CONFIG_MTU (flags)) + switch (flags) { + case ETHERNET_INTERFACE_FLAG_DEFAULT_L3: + /* set to L3/non-promisc mode */ + xd->flags &= ~DPDK_DEVICE_FLAG_PROMISC; + break; + case ETHERNET_INTERFACE_FLAG_ACCEPT_ALL: + xd->flags |= DPDK_DEVICE_FLAG_PROMISC; + break; + case ETHERNET_INTERFACE_FLAG_MTU: xd->port_conf.rxmode.max_rx_pkt_len = hi->max_packet_bytes; dpdk_device_setup (xd); + return 0; + default: + return ~0; } - return old; -} -static void -dpdk_device_lock_init (dpdk_device_t * xd) -{ - int q; - vec_validate (xd->lockp, xd->tx_q_used - 1); - for (q = 0; q < xd->tx_q_used; q++) + if (xd->flags & DPDK_DEVICE_FLAG_ADMIN_UP) { - xd->lockp[q] = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, - CLIB_CACHE_LINE_BYTES); - clib_memset ((void *) xd->lockp[q], 0, CLIB_CACHE_LINE_BYTES); + if (xd->flags & DPDK_DEVICE_FLAG_PROMISC) + rte_eth_promiscuous_enable (xd->port_id); + else + rte_eth_promiscuous_disable (xd->port_id); } + + return old; } static int @@ -259,16 +249,16 @@ dpdk_lib_init (dpdk_main_t * dm) int vlan_off; struct rte_eth_dev_info dev_info; struct rte_pci_device *pci_dev; - struct rte_eth_link l; + 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)) continue; - rte_eth_link_get_nowait (i, &l); rte_eth_dev_info_get (i, &dev_info); if (dev_info.device == 0) @@ -290,20 +280,42 @@ dpdk_lib_init (dpdk_main_t * dm) 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 = hash_get (dm->conf->device_config_index_by_vmbus_addr, + vmbus_addr.as_u32[0]); + } + } + + 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) @@ -519,9 +531,13 @@ dpdk_lib_init (dpdk_main_t * dm) /* Cisco VIC */ case VNET_DPDK_PMD_ENIC: - xd->port_type = port_type_from_link_speed (l.link_speed); - if (dm->conf->enable_tcp_udp_checksum) - dpdk_enable_l4_csum_offload (xd); + { + struct rte_eth_link l; + rte_eth_link_get_nowait (i, &l); + xd->port_type = port_type_from_link_speed (l.link_speed); + if (dm->conf->enable_tcp_udp_checksum) + dpdk_enable_l4_csum_offload (xd); + } break; /* Intel Red Rock Canyon */ @@ -566,7 +582,11 @@ dpdk_lib_init (dpdk_main_t * dm) break; case VNET_DPDK_PMD_NETVSC: - xd->port_type = port_type_from_link_speed (l.link_speed); + { + struct rte_eth_link l; + rte_eth_link_get_nowait (i, &l); + xd->port_type = VNET_DPDK_PORT_TYPE_ETH_VF; + } break; default: @@ -613,9 +633,6 @@ dpdk_lib_init (dpdk_main_t * dm) else rte_eth_macaddr_get (i, (void *) addr); - if (xd->tx_q_used < tm->n_vlib_mains) - dpdk_device_lock_init (xd); - xd->port_id = i; xd->device_index = xd - dm->devices; xd->per_interface_next_index = ~0; @@ -623,7 +640,6 @@ dpdk_lib_init (dpdk_main_t * dm) /* assign interface to input thread */ int q; - error = ethernet_register_interface (dm->vnet_main, dpdk_device_class.index, xd->device_index, /* ethernet address */ addr, @@ -715,10 +731,10 @@ dpdk_lib_init (dpdk_main_t * dm) { int i; q = 0; - clib_bitmap_foreach (i, devconf->workers, ({ + 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); - })); + } } else for (q = 0; q < xd->rx_q_used; q++) @@ -737,6 +753,12 @@ dpdk_lib_init (dpdk_main_t * dm) hi->max_packet_bytes = mtu; hi->max_supported_packet_bytes = max_rx_frame; hi->numa_node = xd->cpu_socket; + + /* Indicate ability to support L3 DMAC filtering and + * initialize interface to L3 non-promisc mode */ + hi->flags |= VNET_HW_INTERFACE_FLAG_SUPPORTS_MAC_FILTER; + ethernet_set_flags (dm->vnet_main, xd->hw_if_index, + ETHERNET_INTERFACE_FLAG_DEFAULT_L3); } if (dm->conf->no_tx_checksum_offload == 0) @@ -760,10 +782,20 @@ dpdk_lib_init (dpdk_main_t * dm) dpdk_device_setup (xd); + /* rss queues should be configured after dpdk_device_setup() */ + if ((hi != NULL) && (devconf->rss_queues != NULL)) + { + if (vnet_hw_interface_set_rss_queues + (vnet_get_main (), hi, devconf->rss_queues)) + { + clib_warning ("%s: Failed to set rss queues", hi->name); + } + } + if (vec_len (xd->errors)) - dpdk_log_err ("setup failed for device %U. Errors:\n %U", - format_dpdk_device_name, i, - format_dpdk_device_errors, xd); + dpdk_log_err ("setup failed for device %U. Errors:\n %U", + format_dpdk_device_name, i, + format_dpdk_device_errors, xd); /* * A note on Cisco VIC (PMD_ENIC) and VLAN: @@ -790,38 +822,39 @@ dpdk_lib_init (dpdk_main_t * dm) * otherwise in the startup config. */ - vlan_off = rte_eth_dev_get_vlan_offload (xd->port_id); - if (devconf->vlan_strip_offload == DPDK_DEVICE_VLAN_STRIP_ON) - { - vlan_off |= ETH_VLAN_STRIP_OFFLOAD; - if (rte_eth_dev_set_vlan_offload (xd->port_id, vlan_off) >= 0) - dpdk_log_info ("VLAN strip enabled for interface\n"); - else - dpdk_log_warn ("VLAN strip cannot be supported by interface\n"); - xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_VLAN_STRIP; - } - else - { - if (vlan_off & ETH_VLAN_STRIP_OFFLOAD) - { - vlan_off &= ~ETH_VLAN_STRIP_OFFLOAD; - if (rte_eth_dev_set_vlan_offload (xd->port_id, vlan_off) >= 0) - dpdk_log_warn ("set VLAN offload failed\n"); - } - xd->port_conf.rxmode.offloads &= ~DEV_RX_OFFLOAD_VLAN_STRIP; - } + vlan_off = rte_eth_dev_get_vlan_offload (xd->port_id); + if (devconf->vlan_strip_offload == DPDK_DEVICE_VLAN_STRIP_ON) + { + vlan_off |= ETH_VLAN_STRIP_OFFLOAD; + if (rte_eth_dev_set_vlan_offload (xd->port_id, vlan_off) >= 0) + dpdk_log_info ("VLAN strip enabled for interface\n"); + else + dpdk_log_warn ("VLAN strip cannot be supported by interface\n"); + xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_VLAN_STRIP; + } + else + { + if (vlan_off & ETH_VLAN_STRIP_OFFLOAD) + { + vlan_off &= ~ETH_VLAN_STRIP_OFFLOAD; + if (rte_eth_dev_set_vlan_offload (xd->port_id, vlan_off) >= 0) + dpdk_log_warn ("set VLAN offload failed\n"); + } + xd->port_conf.rxmode.offloads &= ~DEV_RX_OFFLOAD_VLAN_STRIP; + } - if (hi) - hi->max_packet_bytes = xd->port_conf.rxmode.max_rx_pkt_len - - sizeof (ethernet_header_t); - else - dpdk_log_warn ("hi NULL"); + if (hi) + hi->max_packet_bytes = xd->port_conf.rxmode.max_rx_pkt_len + - sizeof (ethernet_header_t); + else + dpdk_log_warn ("hi NULL"); - if (dm->conf->no_multi_seg) - mtu = mtu > ETHER_MAX_LEN ? ETHER_MAX_LEN : mtu; + if (dm->conf->no_multi_seg) + mtu = mtu > ETHER_MAX_LEN ? ETHER_MAX_LEN : mtu; + + rte_eth_dev_set_mtu (xd->port_id, mtu); +} - rte_eth_dev_set_mtu (xd->port_id, mtu); - } /* *INDENT-ON* */ return 0; @@ -853,7 +886,8 @@ dpdk_bind_devices_to_uio (dpdk_config_main_t * conf) d = vlib_pci_get_device_info (vm, addr, &error); if (error) { - clib_error_report (error); + vlib_log_warn (dpdk_main.log_default, "%U", format_clib_error, error); + clib_error_free (error); continue; } @@ -866,9 +900,9 @@ dpdk_bind_devices_to_uio (dpdk_config_main_t * conf) if (!p) { - skipped: - continue; - } + skipped_pci: + continue; + } devconf = pool_elt_at_index (conf->dev_confs, p[0]); } @@ -892,12 +926,13 @@ dpdk_bind_devices_to_uio (dpdk_config_main_t * conf) 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 */ @@ -992,6 +1027,7 @@ dpdk_bind_devices_to_uio (dpdk_config_main_t * conf) 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); } @@ -1006,16 +1042,72 @@ dpdk_bind_vmbus_devices_to_uio (dpdk_config_main_t * conf) { 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 = hash_get (conf->device_config_index_by_vmbus_addr, + addr->as_u32[0]); + if (!p) + { + /* No devices blacklisted, but have whitelisted. blacklist all + * non-whitelisted */ + pool_get (conf->dev_confs, devconf); + hash_set (conf->device_config_index_by_vmbus_addr, + addr->as_u32[0], devconf - conf->dev_confs); + 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++) + { + u32 vmbus_as_u32 = conf->blacklist_by_vmbus_addr[i]; + if (vmbus_as_u32 == addr->as_u32[0]) + { + if (devconf == 0) + { + /* Device not whitelisted */ + pool_get (conf->dev_confs, devconf); + hash_set (conf->device_config_index_by_vmbus_addr, + addr->as_u32[0], devconf - conf->dev_confs); + 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); + hash_set (conf->device_config_index_by_vmbus_addr, + addr->as_u32[0], devconf - conf->dev_confs); + devconf->vmbus_addr = *addr; + } + devconf->dev_addr_type = VNET_DEV_ADDR_VMBUS; + devconf->is_blacklisted = 1; clib_error_report (error); } } @@ -1023,36 +1115,66 @@ dpdk_bind_vmbus_devices_to_uio (dpdk_config_main_t * conf) } 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 = hash_get (conf->device_config_index_by_vmbus_addr, + ((vlib_vmbus_addr_t *) (addr))->as_u32[0]); + + if (!p) + { + pool_get (conf->dev_confs, devconf); + hash_set (conf->device_config_index_by_vmbus_addr, + ((vlib_vmbus_addr_t *) (addr))->as_u32[0], + devconf - conf->dev_confs); + } + else + return clib_error_return ( + 0, "duplicate configuration for VMBUS address %U", + format_vlib_vmbus_addr, addr); } - devconf->pci_addr.as_u32 = pci_addr.as_u32; - devconf->tso = DPDK_DEVICE_TSO_DEFAULT; + 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; @@ -1095,6 +1217,9 @@ dpdk_device_config (dpdk_config_main_t * conf, vlib_pci_addr_t pci_addr, } else if (unformat (input, "devargs %s", &devconf->devargs)) ; + else if (unformat (input, "rss-queues %U", + unformat_bitmap_list, &devconf->rss_queues)) + ; else { error = clib_error_return (0, "unknown input `%U'", @@ -1111,11 +1236,10 @@ dpdk_device_config (dpdk_config_main_t * conf, vlib_pci_addr_t pci_addr, 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; } @@ -1158,23 +1282,26 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) 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; int ret, i; int num_whitelisted = 0; + int eal_no_hugetlb = 0; u8 no_pci = 0; u8 no_vmbus = 0; u8 file_prefix = 0; u8 *socket_mem = 0; u8 *huge_dir_path = 0; - u32 vendor, device; + u32 vendor, device, domain, bus, func; huge_dir_path = format (0, "%s/hugepages%c", vlib_unix_get_runtime_dir (), 0); conf->device_config_index_by_pci_addr = hash_create (0, sizeof (uword)); + conf->device_config_index_by_vmbus_addr = hash_create (0, sizeof (uword)); while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { @@ -1182,7 +1309,10 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) if (unformat (input, "no-hugetlb")) { vec_add1 (conf->eal_init_args, (u8 *) "--no-huge"); + eal_no_hugetlb = 1; } + else if (unformat (input, "telemetry")) + conf->enable_telemetry = 1; else if (unformat (input, "enable-tcp-udp-checksum")) conf->enable_tcp_udp_checksum = 1; @@ -1200,8 +1330,7 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * 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; @@ -1211,7 +1340,8 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) (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; @@ -1220,7 +1350,30 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) } 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; @@ -1242,6 +1395,21 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) 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.as_u32[0]); + } + else + if (unformat + (input, "blacklist %x:%x:%x.%x", &domain, &bus, &device, &func)) + { + tmp = format (0, "-b%c", 0); + vec_add1 (conf->eal_init_args, tmp); + tmp = + format (0, "%04x:%02x:%02x.%x%c", domain, bus, device, func, 0); + vec_add1 (conf->eal_init_args, tmp); + } else if (unformat (input, "blacklist %x:%x", &vendor, &device)) { u32 blacklist_entry; @@ -1320,22 +1488,33 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) if (!conf->uio_driver_name) conf->uio_driver_name = format (0, "auto%c", 0); - default_hugepage_sz = clib_mem_get_default_hugepage_size (); + if (eal_no_hugetlb == 0) + { + vec_add1 (conf->eal_init_args, (u8 *) "--in-memory"); - /* *INDENT-OFF* */ - clib_bitmap_foreach (x, tm->cpu_socket_bitmap, ( + default_hugepage_sz = clib_mem_get_default_hugepage_size (); + + /* *INDENT-OFF* */ + clib_bitmap_foreach (x, tm->cpu_socket_bitmap) + { + clib_error_t *e; + uword n_pages; + /* preallocate at least 16MB of hugepages per socket, + if more is needed it is up to consumer to preallocate more */ + n_pages = round_pow2 ((uword) 16 << 20, default_hugepage_sz); + n_pages /= default_hugepage_sz; + + if ((e = clib_sysfs_prealloc_hugepages(x, 0, n_pages))) + clib_error_report (e); + } + /* *INDENT-ON* */ + } + + /* on/off dpdk's telemetry thread */ + if (conf->enable_telemetry == 0) { - clib_error_t *e; - uword n_pages; - /* preallocate at least 16MB of hugepages per socket, - if more is needed it is up to consumer to preallocate more */ - n_pages = round_pow2 ((uword) 16 << 20, default_hugepage_sz); - n_pages /= default_hugepage_sz; - - if ((e = clib_sysfs_prealloc_hugepages(x, 0, n_pages))) - clib_error_report (e); - })); - /* *INDENT-ON* */ + vec_add1 (conf->eal_init_args, (u8 *) "--no-telemetry"); + } if (!file_prefix) { @@ -1391,27 +1570,28 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) 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) - /* 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) { @@ -1423,20 +1603,21 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) } 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); @@ -1482,7 +1663,7 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) vec_terminate_c_string (conf->eal_init_args_str); - dpdk_log_warn ("EAL init args: %s", conf->eal_init_args_str); + dpdk_log_notice ("EAL init args: %s", conf->eal_init_args_str); ret = rte_eal_init (vec_len (conf->eal_init_args), (char **) conf->eal_init_args); @@ -1611,7 +1792,10 @@ dpdk_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) error = dpdk_cryptodev_init (vm); if (error) - clib_error_report (error); + { + vlib_log_warn (dpdk_main.log_cryptodev, "%U", format_clib_error, error); + clib_error_free (error); + } tm->worker_thread_release = 1; @@ -1683,7 +1867,6 @@ dpdk_init (vlib_main_t * vm) dm->conf->nchannels = 4; vec_add1 (dm->conf->eal_init_args, (u8 *) "vnet"); - vec_add1 (dm->conf->eal_init_args, (u8 *) "--in-memory"); /* Default vlib_buffer_t flags, DISABLES tcp/udp checksumming... */ dm->buffer_flags_template = (VLIB_BUFFER_TOTAL_LENGTH_VALID | @@ -1695,6 +1878,8 @@ dpdk_init (vlib_main_t * vm) dm->link_state_poll_interval = DPDK_LINK_POLL_INTERVAL; dm->log_default = vlib_log_register_class ("dpdk", 0); + dm->log_cryptodev = vlib_log_register_class ("dpdk", "cryptodev"); + dm->log_ipsec = vlib_log_register_class ("dpdk", "ipsec"); return error; }