X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2Fvnet%2Fdevices%2Fdpdk%2Finit.c;h=8ee59ff8327eedf044f78abdb88f7424b7487ee5;hb=1c80e831b728ab378949714d5059a0b5b1822a0a;hp=67ed251c88fc2a007228a53301a44d2c9d7c5a50;hpb=aed4d03268ab970208c9173892715d9cebcf75d2;p=vpp.git diff --git a/vnet/vnet/devices/dpdk/init.c b/vnet/vnet/devices/dpdk/init.c index 67ed251c88f..8ee59ff8327 100644 --- a/vnet/vnet/devices/dpdk/init.c +++ b/vnet/vnet/devices/dpdk/init.c @@ -16,10 +16,12 @@ #include #include #include +#include #include #include #include +#include #include #include @@ -86,6 +88,11 @@ dpdk_port_setup (dpdk_main_t * dm, dpdk_device_t * xd) { rv = rte_eth_tx_queue_setup(xd->device_index, j, xd->nb_tx_desc, xd->cpu_socket, &xd->tx_conf); + + /* retry with any other CPU socket */ + if (rv < 0) + rv = rte_eth_tx_queue_setup(xd->device_index, j, xd->nb_tx_desc, + SOCKET_ID_ANY, &xd->tx_conf); if (rv < 0) break; } @@ -100,6 +107,12 @@ dpdk_port_setup (dpdk_main_t * dm, dpdk_device_t * xd) rv = rte_eth_rx_queue_setup(xd->device_index, j, xd->nb_rx_desc, xd->cpu_socket, 0, bm->pktmbuf_pools[xd->cpu_socket_id_by_queue[j]]); + + /* retry with any other CPU socket */ + if (rv < 0) + rv = rte_eth_rx_queue_setup(xd->device_index, j, xd->nb_rx_desc, + SOCKET_ID_ANY, 0, + bm->pktmbuf_pools[xd->cpu_socket_id_by_queue[j]]); if (rv < 0) return clib_error_return (0, "rte_eth_rx_queue_setup[%d]: err %d", xd->device_index, rv); @@ -158,23 +171,6 @@ static u32 dpdk_flag_change (vnet_main_t * vnm, { int rv; - /* - * DAW-FIXME: The DPDK VMXNET3 driver does not currently support - * multi-buffer packets. Max out at 1518 bytes for now. - * - * If/when the driver gets fixed, then this should be - * removed. - */ - if ((xd->pmd == VNET_DPDK_PMD_VMXNET3) && - (hi->max_packet_bytes > 1518)) - { - hi->max_packet_bytes = 1518; - - vlib_cli_output (vlib_get_main(), - "VMXNET3 driver does not support jumbo frames " - "yet -- setting mtu to 1518!"); - } - xd->port_conf.rxmode.max_rx_pkt_len = hi->max_packet_bytes; if (xd->admin_up) @@ -204,6 +200,32 @@ static u32 dpdk_flag_change (vnet_main_t * vnm, extern int rte_netmap_probe(void); #endif +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++) + { + 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); + } + xd->need_txlock = 1; +} + +void +dpdk_device_lock_free(dpdk_device_t * xd) +{ + int q; + + for (q = 0; q < vec_len(xd->lockp); q++) + clib_mem_free((void *) xd->lockp[q]); + vec_free(xd->lockp); + xd->lockp = 0; + xd->need_txlock = 0; +} + static clib_error_t * dpdk_lib_init (dpdk_main_t * dm) { @@ -289,7 +311,7 @@ dpdk_lib_init (dpdk_main_t * dm) xd->cpu_socket = (i8) rte_eth_dev_socket_id(i); rte_eth_dev_info_get(i, &dev_info); - memcpy(&xd->tx_conf, &dev_info.default_txconf, + clib_memcpy(&xd->tx_conf, &dev_info.default_txconf, sizeof(struct rte_eth_txconf)); if (dm->no_multi_seg) { @@ -302,10 +324,12 @@ dpdk_lib_init (dpdk_main_t * dm) port_conf_template.rxmode.jumbo_frame = 1; } - memcpy(&xd->port_conf, &port_conf_template, sizeof(struct rte_eth_conf)); + clib_memcpy(&xd->port_conf, &port_conf_template, sizeof(struct rte_eth_conf)); - xd->tx_q_used = dev_info.max_tx_queues < tm->n_vlib_mains ? - 1 : tm->n_vlib_mains; + xd->tx_q_used = clib_min(dev_info.max_tx_queues, tm->n_vlib_mains); + + if (dm->max_tx_queues) + xd->tx_q_used = clib_min(xd->tx_q_used, dm->max_tx_queues); if (dm->use_rss > 1 && dev_info.max_rx_queues >= dm->use_rss) { @@ -356,7 +380,7 @@ dpdk_lib_init (dpdk_main_t * dm) /* Cisco VIC */ case VNET_DPDK_PMD_VICE: case VNET_DPDK_PMD_ENIC: - rte_eth_link_get_nowait(xd->device_index, &l); + rte_eth_link_get_nowait(i, &l); if (l.link_speed == 40000) { xd->port_type = VNET_DPDK_PORT_TYPE_ETH_40G; @@ -389,7 +413,7 @@ dpdk_lib_init (dpdk_main_t * dm) xd->port_type = VNET_DPDK_PORT_TYPE_ETH_40G; break; case I40E_DEV_ID_VF: - rte_eth_link_get_nowait(xd->device_index, &l); + rte_eth_link_get_nowait(i, &l); xd->port_type = l.link_speed == 10000 ? VNET_DPDK_PORT_TYPE_ETH_10G : VNET_DPDK_PORT_TYPE_ETH_40G; break; @@ -437,6 +461,10 @@ dpdk_lib_init (dpdk_main_t * dm) xd->af_packet_port_id = af_packet_port_id++; break; + case VNET_DPDK_PMD_BOND: + xd->port_type = VNET_DPDK_PORT_TYPE_ETH_BOND; + break; + default: xd->port_type = VNET_DPDK_PORT_TYPE_UNKNOWN; } @@ -457,18 +485,44 @@ dpdk_lib_init (dpdk_main_t * dm) * Otherwise rte_eth_dev_configure() will fail and the port will * not be available. */ - xd->port_conf.rxmode.max_rx_pkt_len = - (ETHERNET_MAX_PACKET_BYTES > dev_info.max_rx_pktlen) ? - dev_info.max_rx_pktlen : ETHERNET_MAX_PACKET_BYTES; + if (ETHERNET_MAX_PACKET_BYTES > dev_info.max_rx_pktlen) + { + /* + * This device does not support the platforms's max frame + * size. Use it's advertised mru instead. + */ + xd->port_conf.rxmode.max_rx_pkt_len = dev_info.max_rx_pktlen; + } + else + { + xd->port_conf.rxmode.max_rx_pkt_len = ETHERNET_MAX_PACKET_BYTES; + /* + * Some platforms do not account for Ethernet FCS (4 bytes) in + * MTU calculations. To interop with them increase mru but only + * if the device's settings can support it. + */ + if ((dev_info.max_rx_pktlen >= (ETHERNET_MAX_PACKET_BYTES + 4)) && + xd->port_conf.rxmode.hw_strip_crc) + { + /* + * Allow additional 4 bytes (for Ethernet FCS). These bytes are + * stripped by h/w and so will not consume any buffer memory. + */ + xd->port_conf.rxmode.max_rx_pkt_len += 4; + } + } + +#if RTE_VERSION < RTE_VERSION_NUM(16, 4, 0, 0) /* - * DAW-FIXME: VMXNET3 driver doesn't support jumbo / multi-buffer pkts + * Older VMXNET3 driver doesn't support jumbo / multi-buffer pkts */ if (xd->pmd == VNET_DPDK_PMD_VMXNET3) { xd->port_conf.rxmode.max_rx_pkt_len = 1518; xd->port_conf.rxmode.jumbo_frame = 0; } +#endif if (xd->pmd == VNET_DPDK_PMD_AF_PACKET) { @@ -476,7 +530,7 @@ dpdk_lib_init (dpdk_main_t * dm) u32 rnd; rnd = (u32) (now * 1e6); rnd = random_u32 (&rnd); - memcpy (addr+2, &rnd, sizeof(rnd)); + clib_memcpy (addr+2, &rnd, sizeof(rnd)); addr[0] = 2; addr[1] = 0xfe; } @@ -484,11 +538,7 @@ dpdk_lib_init (dpdk_main_t * dm) rte_eth_macaddr_get(i,(struct ether_addr *)addr); if (xd->tx_q_used < tm->n_vlib_mains) - { - xd->lockp = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, - CLIB_CACHE_LINE_BYTES); - memset ((void *) xd->lockp, 0, CLIB_CACHE_LINE_BYTES); - } + dpdk_device_lock_init(xd); xd->device_index = xd - dm->devices; ASSERT(i == xd->device_index); @@ -586,11 +636,14 @@ dpdk_lib_init (dpdk_main_t * dm) vlan_off |= ETH_VLAN_STRIP_OFFLOAD; rte_eth_dev_set_vlan_offload(xd->device_index, vlan_off); } + +#if RTE_VERSION < RTE_VERSION_NUM(16, 4, 0, 0) /* - * DAW-FIXME: VMXNET3 driver doesn't support jumbo / multi-buffer pkts + * Older VMXNET3 driver doesn't support jumbo / multi-buffer pkts */ else if (xd->pmd == VNET_DPDK_PMD_VMXNET3) hi->max_packet_bytes = 1518; +#endif hi->max_l3_packet_bytes[VLIB_RX] = hi->max_l3_packet_bytes[VLIB_TX] = xd->port_conf.rxmode.max_rx_pkt_len - sizeof(ethernet_header_t); @@ -598,6 +651,7 @@ dpdk_lib_init (dpdk_main_t * dm) rte_eth_dev_set_mtu(xd->device_index, hi->max_packet_bytes); } +#ifdef RTE_LIBRTE_KNI if (dm->num_kni) { clib_warning("Initializing KNI interfaces..."); rte_kni_init(dm->num_kni); @@ -653,7 +707,7 @@ dpdk_lib_init (dpdk_main_t * dm) rnd = (u32) (now * 1e6); rnd = random_u32 (&rnd); - memcpy (addr+2, &rnd, sizeof(rnd)); + clib_memcpy (addr+2, &rnd, sizeof(rnd)); addr[0] = 2; addr[1] = 0xfe; } @@ -674,6 +728,7 @@ dpdk_lib_init (dpdk_main_t * dm) hi = vnet_get_hw_interface (dm->vnet_main, xd->vlib_hw_if_index); } } +#endif if (nb_desc > dm->num_mbufs) clib_warning ("%d mbufs allocated but total rx/tx ring size is %d\n", @@ -685,268 +740,62 @@ dpdk_lib_init (dpdk_main_t * dm) return 0; } -/* - * Tell the vlib physical memory allocator that we've handled - * the initialization. We don't actually do so until - * vlib_main(...) callls the dpdk config function. - */ -int vlib_app_physmem_init (vlib_main_t * vm, physmem_main_t * pm, - int physmem_required) -{ - return 1; -} - -static clib_error_t * -write_sys_fs (char * file_name, char * fmt, ...) -{ - u8 * s; - int fd; - - fd = open (file_name, O_WRONLY); - if (fd < 0) - return clib_error_return_unix (0, "open `%s'", file_name); - - va_list va; - va_start (va, fmt); - s = va_format (0, fmt, &va); - va_end (va); - vec_add1 (s, 0); // terminate c string - - if (write (fd, s, vec_len (s)) < 0) - return clib_error_return_unix (0, "write '%s' to '%s'", s, file_name); - - vec_free (s); - close (fd); - return 0; -} - -#define VIRTIO_PCI_NAME "virtio-pci" - -static clib_error_t * dpdk_bind_eth_kernel_drivers (vlib_main_t * vm, - char * pci_dev_id, - char * kernel_driver) +static void +dpdk_bind_devices_to_uio (dpdk_main_t * dm) { - dpdk_main_t * dm = &dpdk_main; - unformat_input_t _in; - unformat_input_t * in = &_in; - clib_error_t * error = 0; - u8 * line = 0, * modcmd = 0, * path = 0; - u8 * pci_vid = 0, *pci_did = 0, * devname = 0; - char *driver_name = kernel_driver; - FILE * fp; - - /* - * Bail out now if we're not running as root. - * This allows non-privileged use of the packet generator, etc. - */ - if (geteuid() != 0) - return 0; - - /* - * Get all ethernet pci device numbers for the device type specified. - */ - modcmd = format (0, "lspci -nDd %s | grep 0200 | " - "awk '{ print $1, $3 }'%c", pci_dev_id, 0); - if ((fp = popen ((const char *)modcmd, "r")) == NULL) - { - error = clib_error_return_unix (0, - "Unable to get %s ethernet pci devices.", - pci_dev_id); - goto done; - } - - vec_validate (line, BUFSIZ); - vec_validate (path, BUFSIZ); - while (fgets ((char *)line, BUFSIZ, fp) != NULL) - { - struct stat st; - u8 bind_uio = 1; - line[strlen ((char *)line) - 1] = 0; // chomp trailing newline. - - unformat_init_string (in, (char *)line, strlen((char *)line) + 1); - unformat(in, "%s %s:%s", &devname, &pci_vid, &pci_did); - unformat_free (in); - - /* - * Blacklist all ethernet interfaces in the - * linux IP routing tables (route --inet --inet6) - */ - if (strstr ((char *)dm->eth_if_blacklist, (char *)devname)) - continue; - - /* - * If there are any devices whitelisted, then blacklist all devices - * which are not explicitly whitelisted. - */ - if (dm->eth_if_whitelist && - !strstr ((char *)dm->eth_if_whitelist, (char *)devname)) - continue; - -#ifdef NETMAP - /* - * Optimistically open the device as a netmap device. - */ - if (eth_nm_open((char *)devname)) + vlib_pci_main_t * pm = &pci_main; + clib_error_t * error; + vlib_pci_device_t * d; + pci_config_header_t * c; + u8 * pci_addr = 0; + + pool_foreach (d, pm->pci_devs, ({ + 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 (dm->eth_if_whitelist && + !strstr ((char *) dm->eth_if_whitelist, (char *) pci_addr)) + continue; + + /* virtio */ + if (c->vendor_id == 0x1af4 && c->device_id == 0x1000) + ; + /* vmxnet3 */ + else if (c->vendor_id == 0x15ad && c->device_id == 0x07b0) + ; + /* all Intel devices */ + else if (c->vendor_id == 0x8086) + ; + /* Cisco VIC */ + else if (c->vendor_id == 0x1137 && c->device_id == 0x0043) + ; + /* Chelsio T4/T5 */ + else if (c->vendor_id == 0x1425 && (c->device_id & 0xe000) == 0x4000) + ; + else + { + clib_warning ("Unsupported Ethernet PCI device 0x%04x:0x%04x found " + "at PCI address %s\n", (u16) c->vendor_id, (u16) c->device_id, + pci_addr); continue; -#endif - - _vec_len (path) = 0; - path = format (path, "/sys/bus/pci/devices/%s/driver/unbind%c", - devname, 0); - - /* - * If the device is bound to a driver... - */ - if (stat ((const char *)path, &st) == 0) - { - u8 * device_path; - - /* - * If the interface is not a virtio... - */ - if (!driver_name || strcmp(driver_name, VIRTIO_PCI_NAME)) - { - /* - * If it is already bound to driver, don't unbind/bind it. - */ - device_path = format (0, "/sys/bus/pci/drivers/%s/%s/device%c", - driver_name, devname, 0); - if (stat ((const char *)device_path, &st) == 0) - bind_uio = 0; - - vec_free (device_path); - } - - /* - * unbind it from the current driver - */ - if (bind_uio) - { - _vec_len (path) -= 1; - path = format (path, "%c", 0); - error = write_sys_fs ((char *)path, "%s", devname); - if (error) - goto done; - } - } - - /* - * DAW-FIXME: The following bind/unbind dance is necessary for the dpdk - * virtio poll-mode driver to work. - */ - - if (driver_name && !strcmp(driver_name, VIRTIO_PCI_NAME)) - { - /* - * bind interface to the native kernel module - */ - _vec_len (path) = 0; - path = format (path, "/sys/bus/pci/drivers/%s/bind%c", - driver_name, 0); - error = write_sys_fs ((char *)path, "%s", devname); - if (error) - goto done; - - /* - * unbind interface from the native kernel module - */ - _vec_len (path) -= 5; - path = format (path, "unbind%c", 0); - error = write_sys_fs ((char *)path, "%s", devname); - if (error) - goto done; - } - - /* - * bind the interface to igb_uio - */ - if (bind_uio) - { - _vec_len (path) = 0; - path = format (path, "/sys/bus/pci/drivers/%s/new_id%c", driver_name, 0); - error = write_sys_fs ((char *) path, "%s %s", pci_vid, pci_did); - if (error) - continue; - - _vec_len (path) = 0; - path = format (path, "/sys/bus/pci/drivers/%s/bind%c", driver_name, 0); - error = write_sys_fs ((char *) path, "%s", devname); - if (error) - { - error = 0; - continue; - } - } - } - - done: - vec_free (line); - vec_free (path); - vec_free (devname); - vec_free (pci_vid); - vec_free (pci_did); - vec_free (modcmd); - pclose (fp); - return error; -} - -static uword -unformat_socket_mem (unformat_input_t * input, va_list * va) -{ - uword ** r = va_arg (* va, uword **); - int i = 0; - u32 mem; - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, ",")) - hash_set (*r, i, 1024); - else if (unformat (input, "%u,", &mem)) - hash_set (*r, i, mem); - else if (unformat (input, "%u", &mem)) - hash_set (*r, i, mem); - else - { - unformat_put_input (input); - goto done; - } - i++; - } - -done: - return 1; -} - -static u32 -get_node_free_hugepages_num (u32 node, u32 page_size) -{ - FILE * fp; - u8 * tmp; - - tmp = format (0, "/sys/devices/system/node/node%u/hugepages/hugepages-%ukB/" - "free_hugepages%c", node, page_size, 0); - fp = fopen ((char *) tmp, "r"); - vec_free(tmp); - - if (fp != NULL) - { - u8 * buffer = 0; - u32 pages_avail = 0; + } - vec_validate (buffer, 256-1); - if (fgets ((char *)buffer, 256, fp)) - { - unformat_input_t in; - unformat_init_string (&in, (char *) buffer, strlen ((char *) buffer)); - unformat(&in, "%u", &pages_avail); - unformat_free (&in); - } - vec_free(buffer); - fclose(fp); - return pages_avail; - } + error = vlib_pci_bind_to_uio (d, (char *) dm->uio_driver_name); - return 0; + if (error) + { + if (!dm->eth_if_whitelist) + dm->eth_if_blacklist = format (dm->eth_if_blacklist, "%U ", + format_vlib_pci_addr, &d->bus_address); + clib_error_report (error); + } + })); + vec_free (pci_addr); } static clib_error_t * @@ -955,10 +804,10 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) clib_error_t * error = 0; dpdk_main_t * dm = &dpdk_main; vlib_thread_main_t * tm = vlib_get_thread_main(); + vlib_node_runtime_t * rt = vlib_node_get_runtime (vm, dpdk_input_node.index); u8 * s, * tmp = 0; u8 * pci_dev_id = 0; u8 * rte_cmd = 0, * ethname = 0; - FILE * rte_fp; u32 log_level; int ret, i; char * fmt; @@ -986,6 +835,12 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) no_huge = 1; } + else if (unformat (input, "enable-tcp-udp-checksum")) + { + dm->buffer_flags_template &= + ~(IP_BUFFER_L4_CHECKSUM_CORRECT | IP_BUFFER_L4_CHECKSUM_COMPUTED); + } + else if (unformat (input, "decimal-interface-names")) dm->interface_name_format_decimal = 1; @@ -1033,10 +888,14 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) else if (unformat (input, "num-mbufs %d", &dm->num_mbufs)) ; + else if (unformat (input, "max-tx-queues %d", &dm->max_tx_queues)) + ; else if (unformat (input, "kni %d", &dm->num_kni)) ; else if (unformat (input, "uio-driver %s", &dm->uio_driver_name)) ; + else if (unformat (input, "socket-mem %s", &socket_mem)) + ; else if (unformat (input, "vhost-user-coalesce-frames %d", &dm->vhost_coalesce_frames)) ; else if (unformat (input, "vhost-user-coalesce-time %f", &dm->vhost_coalesce_time)) @@ -1064,8 +923,6 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) huge_dir = 1; \ else if (!strncmp(#a, "file-prefix", 11)) \ file_prefix = 1; \ - else if (!strncmp(#a, "socket-mem", 10)) \ - socket_mem = vec_dup (s); \ tmp = format (0, "--%s%c", #a, 0); \ vec_add1 (dm->eal_init_args, tmp); \ vec_add1 (s, 0); \ @@ -1109,56 +966,119 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) } if (!dm->uio_driver_name) - dm->uio_driver_name = format (0, "igb_uio"); + dm->uio_driver_name = format (0, "igb_uio%c", 0); /* * Use 1G huge pages if available. */ if (!no_huge && !huge_dir) { - uword * mem_by_socket = hash_create (0, sizeof (uword)); - uword c; + u32 x, * mem_by_socket = 0; + uword c = 0; u8 use_1g = 1; u8 use_2m = 1; + u8 less_than_1g = 1; int rv; umount(DEFAULT_HUGE_DIR); /* Process "socket-mem" parameter value */ if (vec_len (socket_mem)) - { - unformat_input_t in; - unformat_init_vector(&in, socket_mem); - unformat(&in, "%U", unformat_socket_mem, &mem_by_socket); - unformat_free(&in); - } + { + unformat_input_t in; + unformat_init_vector(&in, socket_mem); + while (unformat_check_input (&in) != UNFORMAT_END_OF_INPUT) + { + if (unformat (&in, "%u,", &x)) + ; + else if (unformat (&in, "%u", &x)) + ; + else if (unformat (&in, ",")) + x = 0; + else + break; + + vec_add1(mem_by_socket, x); + + if (x > 1023) + less_than_1g = 0; + } + /* Note: unformat_free vec_frees(in.buffer), aka socket_mem... */ + unformat_free(&in); + socket_mem = 0; + } else - use_1g = 0; + { + clib_bitmap_foreach (c, tm->cpu_socket_bitmap, ( + { + vec_validate(mem_by_socket, c); + mem_by_socket[c] = 512; /* default per-socket mem */ + } + )); + } /* check if available enough 1GB pages for each socket */ - clib_bitmap_foreach (c, tm->cpu_socket_bitmap, ({ - uword * p = hash_get (mem_by_socket, c); - if (p) - { - u32 mem = p[0]; - if (mem) - { - u32 pages_num_1g = mem / 1024; - u32 pages_num_2m = mem / 2; - u32 pages_avail; - - pages_avail = get_node_free_hugepages_num(c, 1048576); - if (!(pages_avail >= pages_num_1g)) - use_1g = 0; - - pages_avail = get_node_free_hugepages_num(c, 2048); - if (!(pages_avail >= pages_num_2m)) - use_2m = 0; - } - } + clib_bitmap_foreach (c, tm->cpu_socket_bitmap, ( + { + u32 pages_avail, page_size, mem; + u8 *s = 0; + u8 *p = 0; + char * numa_path = "/sys/devices/system/node/node%u/"; + char * nonnuma_path = "/sys/kernel/mm/"; + char * suffix = "hugepages/hugepages-%ukB/free_hugepages%c"; + char * path = NULL; + struct stat sb_numa, sb_nonnuma; + + p = format(p, numa_path, c); + stat(numa_path, &sb_numa); + stat(nonnuma_path, &sb_nonnuma); + + if (S_ISDIR(sb_numa.st_mode)) { + path = (char*)format((u8*)path, "%s%s", p, suffix); + } else if (S_ISDIR(sb_nonnuma.st_mode)) { + path = (char*)format((u8*)path, "%s%s", nonnuma_path, suffix); + } else { + use_1g = 0; + use_2m = 0; + vec_free(p); + break; + } + + vec_validate(mem_by_socket, c); + mem = mem_by_socket[c]; + + page_size = 1024; + pages_avail = 0; + s = format (s, path, page_size * 1024, 0); + vlib_sysfs_read ((char *) s, "%u", &pages_avail); + vec_reset_length (s); + + if (page_size * pages_avail < mem) + use_1g = 0; + + page_size = 2; + pages_avail = 0; + s = format (s, path, page_size * 1024, 0); + vlib_sysfs_read ((char *) s, "%u", &pages_avail); + vec_reset_length (s); + + if (page_size * pages_avail < mem) + use_2m = 0; + + vec_free(s); + vec_free(p); + vec_free(path); })); + _vec_len (mem_by_socket) = c + 1; - hash_free (mem_by_socket); + /* regenerate socket_mem string */ + vec_foreach_index (x, mem_by_socket) + socket_mem = format (socket_mem, "%s%u", + socket_mem ? "," : "", + mem_by_socket[x]); + socket_mem = format (socket_mem, "%c", 0); + + vec_free (mem_by_socket); rv = mkdir(VPP_RUN_DIR, 0755); if (rv && errno != EEXIST) @@ -1176,7 +1096,7 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) goto done; } - if (use_1g) + if (use_1g && !(less_than_1g && use_2m)) { rv = mount("none", DEFAULT_HUGE_DIR, "hugetlbfs", 0, "pagesize=1G"); } @@ -1208,91 +1128,6 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) } } - /* - * Blacklist all ethernet interfaces in the linux IP routing tables. - */ - dm->eth_if_blacklist = format (0, "%c", 0); - rte_cmd = format (0, "route --inet --inet6 -n|awk '{print $7}'|sort -u|" - "egrep $(echo $(ls -1d /sys/class/net/*/device|" - "cut -d/ -f5)|sed -s 's/ /|/g')%c", 0); - if ((rte_fp = popen ((const char *)rte_cmd, "r")) == NULL) - { - error = clib_error_return_unix (0, "Unable to find blacklist ethernet" - " interface(s) in linux routing tables."); - goto rte_cmd_err; - - } - - vec_validate (ethname, BUFSIZ); - while (fgets ((char *)ethname, BUFSIZ, rte_fp) != NULL) - { - FILE *rlnk_fp; - u8 * rlnk_cmd = 0, * devname = 0; - - ethname[strlen ((char *)ethname) - 1] = 0; // chomp trailing newline. - - rlnk_cmd = format (0, "readlink /sys/class/net/%s%c", - ethname, 0); - - if ((rlnk_fp = popen ((const char *)rlnk_cmd, "r")) == NULL) - { - error = clib_error_return_unix (0, "Unable to read %s link.", - ethname); - goto rlnk_cmd_err; - } - - vec_validate (devname, BUFSIZ); - while (fgets ((char *)devname, BUFSIZ, rlnk_fp) != NULL) - { - char * pci_id = 0; - - /* - * Extract the device PCI ID name from the link. It is the first - * PCI ID searching backwards from the end of the link pathname. - * For example: - * readlink /sys/class/net/eth0 - * ../../devices/pci0000:00/0000:00:0a.0/virtio4/net/eth0 - */ - for (pci_id = (char *)((devname + strlen((char *)devname))); - ((u8 *)pci_id > devname) && *pci_id != '.'; pci_id--) - ; - - /* - * Verify that the field found is a valid PCI ID. - */ - if ((*(pci_id - 1) == '.') || ((u8 *)(pci_id - 11) < devname) || - (*(pci_id - 11) != '/') || (*(pci_id - 3) != ':') || - (*(pci_id - 6) != ':')) - { - devname[strlen ((char *)devname) - 1] = 0; // chomp trailing newline. - clib_warning ("Unable to extract %s PCI ID (0x%llx \"%s\") " - "from 0x%llx \"%s\"", ethname, pci_id, pci_id, - devname, devname); - continue; - } - - pci_id[2] = 0; - pci_id -= 10; - - /* Don't blacklist any interfaces which have been whitelisted. - */ - if (dm->eth_if_whitelist && - strstr ((char *)dm->eth_if_whitelist, (char *)pci_id)) - continue; - - _vec_len (dm->eth_if_blacklist) -= 1; // chomp trailing NULL. - dm->eth_if_blacklist = format (dm->eth_if_blacklist, " %s%c", - pci_id, 0); - } - - rlnk_cmd_err: - pclose (rlnk_fp); - vec_free (rlnk_cmd); - vec_free (devname); - } - - rte_cmd_err: - pclose (rte_fp); vec_free (rte_cmd); vec_free (ethname); @@ -1303,24 +1138,23 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) if (!dm->coremask_set_manually) { vlib_thread_registration_t * tr; - uword coremask; + uword * coremask = 0; int i; /* main thread core */ - coremask = 1 << tm->main_lcore; + coremask = clib_bitmap_set(coremask, tm->main_lcore, 1); for (i = 0; i < vec_len (tm->registrations); i++) { tr = tm->registrations[i]; - if (clib_bitmap_is_zero(tr->coremask)) - continue; - coremask |= tr->coremask[0]; + coremask = clib_bitmap_or(coremask, tr->coremask); } vec_insert (dm->eal_init_args, 2, 1); dm->eal_init_args[1] = (u8 *) "-c"; - tmp = format (0, "%x%c", coremask, 0); + tmp = format (0, "%U%c", format_bitmap_hex, coremask, 0); dm->eal_init_args[2] = tmp; + clib_bitmap_free(coremask); } if (!dm->nchannels_set_manually) @@ -1331,6 +1165,9 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) dm->eal_init_args[4] = tmp; } + if (no_pci == 0 && geteuid() == 0) + dpdk_bind_devices_to_uio(dm); + /* * If there are whitelisted devices, * add the whitelist option & device list to the dpdk arg list... @@ -1360,41 +1197,18 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) vec_add1 (dm->eal_init_args, pci_dev_id); } - if (no_pci == 0) - { - /* - * Bind Virtio pci devices to the igb_uio kernel driver. - */ - error = dpdk_bind_eth_kernel_drivers (vm, "1af4:1000", VIRTIO_PCI_NAME); - if (error) - return error; - - /* - * Bind vmxnet3 pci devices to the igb_uio kernel driver. - */ - error = dpdk_bind_eth_kernel_drivers (vm, "15ad:07b0", - (char *) dm->uio_driver_name); - if (error) - return error; - - /* - * Bind Intel ethernet pci devices to igb_uio kernel driver. - */ - error = dpdk_bind_eth_kernel_drivers (vm, "8086:", - (char *) dm->uio_driver_name); - /* - * Bind Cisco VIC ethernet pci devices to igb_uio kernel driver. - */ - error = dpdk_bind_eth_kernel_drivers (vm, "1137:0043", - (char *) dm->uio_driver_name); - } - /* set master-lcore */ tmp = format (0, "--master-lcore%c", 0); vec_add1 (dm->eal_init_args, tmp); tmp = format (0, "%u%c", tm->main_lcore, 0); vec_add1 (dm->eal_init_args, tmp); + /* set socket-mem */ + tmp = format (0, "--socket-mem%c", 0); + vec_add1 (dm->eal_init_args, tmp); + tmp = format (0, "%s%c", socket_mem, 0); + vec_add1 (dm->eal_init_args, tmp); + /* NULL terminate the "argv" vector, in case of stupidity */ vec_add1 (dm->eal_init_args, 0); _vec_len(dm->eal_init_args) -= 1; @@ -1407,6 +1221,11 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) vm = dm->vlib_main; + /* make copy of args as rte_eal_init tends to mess up with arg array */ + for (i = 1; i < vec_len(dm->eal_init_args); i++) + dm->eal_init_args_str = format(dm->eal_init_args_str, "%s ", + dm->eal_init_args[i]); + ret = rte_eal_init(vec_len(dm->eal_init_args), (char **) dm->eal_init_args); /* lazy umount hugepages */ @@ -1415,24 +1234,27 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) if (ret < 0) return clib_error_return (0, "rte_eal_init returned %d", ret); + /* Dump the physical memory layout prior to creating the mbuf_pool */ + fprintf(stdout, "DPDK physical memory layout:\n"); + rte_dump_physmem_layout(stdout); + /* main thread 1st */ - error = vlib_buffer_pool_create(vm, dm->num_mbufs, MBUF_SIZE, rte_socket_id()); + error = vlib_buffer_pool_create(vm, dm->num_mbufs, rte_socket_id()); if (error) return error; for (i = 0; i < RTE_MAX_LCORE; i++) { - error = vlib_buffer_pool_create(vm, dm->num_mbufs, MBUF_SIZE, + error = vlib_buffer_pool_create(vm, dm->num_mbufs, rte_lcore_to_socket_id(i)); if (error) return error; } if (dm->use_rss) - { - vlib_node_runtime_t * rt = vlib_node_get_runtime (vm, dpdk_input_node.index); - rt->function = dpdk_input_rss; - } + rt->function = dpdk_input_rss_multiarch_select(); + else + rt->function = dpdk_input_multiarch_select(); done: return error; } @@ -1498,6 +1320,35 @@ void dpdk_update_link_state (dpdk_device_t * xd, f64 now) break; } } +#if RTE_VERSION >= RTE_VERSION_NUM(16, 4, 0, 0) + if (hw_flags_chg || (xd->link.link_speed != prev_link.link_speed)) + { + hw_flags_chg = 1; + switch (xd->link.link_speed) + { + case ETH_SPEED_NUM_10M: + hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_10M; + break; + case ETH_SPEED_NUM_100M: + hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_100M; + break; + case ETH_SPEED_NUM_1G: + hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_1G; + break; + case ETH_SPEED_NUM_10G: + hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_10G; + break; + case ETH_SPEED_NUM_40G: + hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_40G; + break; + case 0: + break; + default: + clib_warning("unknown link speed %d", xd->link.link_speed); + break; + } + } +#else if (hw_flags_chg || (xd->link.link_speed != prev_link.link_speed)) { hw_flags_chg = 1; @@ -1525,6 +1376,7 @@ void dpdk_update_link_state (dpdk_device_t * xd, f64 now) break; } } +#endif if (hw_flags_chg) { if (LINK_STATE_ELOGS) @@ -1551,7 +1403,9 @@ dpdk_process (vlib_main_t * vm, vlib_frame_t * f) { clib_error_t * error; + vnet_main_t * vnm = vnet_get_main(); dpdk_main_t * dm = &dpdk_main; + ethernet_main_t * em = ðernet_main; dpdk_device_t * xd; vlib_thread_main_t * tm = vlib_get_thread_main(); void *vu_state; @@ -1592,9 +1446,79 @@ dpdk_process (vlib_main_t * vm, dpdk_update_link_state (xd, now); } +{ // Extra set up for bond interfaces: + // 1. Setup MACs for bond interfaces and their slave links which was set + // in dpdk_port_setup() but needs to be done again here to take effect. + // 2. Set max L3 packet size of each bond interface to the lowerst value of + // its slave links + // 3. Set up info for bond interface related CLI support. + int nports = rte_eth_dev_count(); + if (nports > 0) { + for (i = 0; i < nports; i++) { + struct rte_eth_dev_info dev_info; + rte_eth_dev_info_get(i, &dev_info); + if (!dev_info.driver_name) + dev_info.driver_name = dev_info.pci_dev->driver->name; + ASSERT(dev_info.driver_name); + if (strncmp(dev_info.driver_name, "rte_bond_pmd", 12) == 0) { + u8 addr[6]; + u8 slink[16]; + int nlink = rte_eth_bond_slaves_get(i, slink, 16); + if (nlink > 0) { + vnet_hw_interface_t * bhi; + ethernet_interface_t * bei; + /* Get MAC of 1st slave link */ + rte_eth_macaddr_get(slink[0], (struct ether_addr *)addr); + /* Set MAC of bounded interface to that of 1st slave link */ + rte_eth_bond_mac_address_set(i, (struct ether_addr *)addr); + /* Populate MAC of bonded interface in VPP hw tables */ + bhi = vnet_get_hw_interface( + vnm, dm->devices[i].vlib_hw_if_index); + bei = pool_elt_at_index(em->interfaces, bhi->hw_instance); + clib_memcpy(bhi->hw_address, addr, 6); + clib_memcpy(bei->address, addr, 6); + /* Init l3 packet size allowed on bonded interface */ + bhi->max_l3_packet_bytes[VLIB_RX] = + bhi->max_l3_packet_bytes[VLIB_TX] = + ETHERNET_MAX_PACKET_BYTES - sizeof(ethernet_header_t); + while (nlink >= 1) { /* for all slave links */ + int slave = slink[--nlink]; + dpdk_device_t * sdev = &dm->devices[slave]; + vnet_hw_interface_t * shi; + vnet_sw_interface_t * ssi; + /* Add MAC to all slave links except the first one */ + if (nlink) rte_eth_dev_mac_addr_add( + slave, (struct ether_addr *)addr, 0); + /* Set slaves bitmap for bonded interface */ + bhi->bond_info = clib_bitmap_set( + bhi->bond_info, sdev->vlib_hw_if_index, 1); + /* Set slave link flags on slave interface */ + shi = vnet_get_hw_interface(vnm, sdev->vlib_hw_if_index); + ssi = vnet_get_sw_interface(vnm, sdev->vlib_sw_if_index); + shi->bond_info = VNET_HW_INTERFACE_BOND_INFO_SLAVE; + ssi->flags |= VNET_SW_INTERFACE_FLAG_BOND_SLAVE; + /* Set l3 packet size allowed as the lowest of slave */ + if (bhi->max_l3_packet_bytes[VLIB_RX] > + shi->max_l3_packet_bytes[VLIB_RX]) + bhi->max_l3_packet_bytes[VLIB_RX] = + bhi->max_l3_packet_bytes[VLIB_TX] = + shi->max_l3_packet_bytes[VLIB_RX]; + } + } + } + } + } +} + while (1) { - vlib_process_wait_for_event_or_clock (vm, 5.0); + /* + * check each time through the loop in case intervals are changed + */ + f64 min_wait = dm->link_state_poll_interval < dm->stat_poll_interval ? + dm->link_state_poll_interval : dm->stat_poll_interval; + + vlib_process_wait_for_event_or_clock (vm, min_wait); if (dpdk_get_admin_up_down_in_progress()) /* skip the poll if an admin up down is in progress (on any interface) */ @@ -1603,9 +1527,9 @@ dpdk_process (vlib_main_t * vm, vec_foreach (xd, dm->devices) { f64 now = vlib_time_now (vm); - if ((now - xd->time_last_stats_update) >= DPDK_STATS_POLL_INTERVAL) + if ((now - xd->time_last_stats_update) >= dm->stat_poll_interval) dpdk_update_counters (xd, now); - if ((now - xd->time_last_link_update) >= DPDK_LINK_POLL_INTERVAL) + if ((now - xd->time_last_link_update) >= dm->link_state_poll_interval) dpdk_update_link_state (xd, now); if (xd->dev_type == VNET_DPDK_DEV_VHOST_USER) @@ -1626,6 +1550,26 @@ VLIB_REGISTER_NODE (dpdk_process_node,static) = { .process_log2_n_stack_bytes = 17, }; +int dpdk_set_stat_poll_interval (f64 interval) +{ + if (interval < DPDK_MIN_STATS_POLL_INTERVAL) + return (VNET_API_ERROR_INVALID_VALUE); + + dpdk_main.stat_poll_interval = interval; + + return 0; +} + +int dpdk_set_link_state_poll_interval (f64 interval) +{ + if (interval < DPDK_MIN_LINK_POLL_INTERVAL) + return (VNET_API_ERROR_INVALID_VALUE); + + dpdk_main.link_state_poll_interval = interval; + + return 0; +} + clib_error_t * dpdk_init (vlib_main_t * vm) { @@ -1640,79 +1584,6 @@ dpdk_init (vlib_main_t * vm) ASSERT(offsetof(dpdk_worker_t, cacheline0) == 0); ASSERT(offsetof(frame_queue_trace_t, cacheline0) == 0); - /* Add references to DPDK Driver Constructor functions to get the dynamic - * loader to pull in the driver library & run the constructors. - */ -#define _(d) \ -do { \ - void devinitfn_ ##d(void); \ - __attribute__((unused)) void (* volatile pf)(void); \ - pf = devinitfn_ ##d; \ -} while(0); - -#ifdef RTE_LIBRTE_EM_PMD - _(em_pmd_drv) -#endif - -#ifdef RTE_LIBRTE_IGB_PMD - _(pmd_igb_drv) -#endif - -#ifdef RTE_LIBRTE_IXGBE_PMD - _(rte_ixgbe_driver) -#endif - -#ifdef RTE_LIBRTE_I40E_PMD - _(rte_i40e_driver) - _(rte_i40evf_driver) -#endif - -#ifdef RTE_LIBRTE_FM10K_PMD - _(rte_fm10k_driver) -#endif - -#ifdef RTE_LIBRTE_VIRTIO_PMD - _(rte_virtio_driver) -#endif - -#ifdef RTE_LIBRTE_VMXNET3_PMD - _(rte_vmxnet3_driver) -#endif - -#ifdef RTE_LIBRTE_VICE_PMD - _(rte_vice_driver) -#endif - -#ifdef RTE_LIBRTE_ENIC_PMD - _(rte_enic_driver) -#endif - -#ifdef RTE_LIBRTE_PMD_AF_PACKET - _(pmd_af_packet_drv) -#endif - -#ifdef RTE_LIBRTE_CXGBE_PMD - _(rte_cxgbe_driver) -#endif - -#undef _ - -/* - * At the moment, the ThunderX NIC driver doesn't have - * an entry point named "devinitfn_rte_xxx_driver" - */ -#define _(d) \ -do { \ - void d(void); \ - __attribute__((unused)) void (* volatile pf)(void); \ - pf = d; \ -} while(0); - -#ifdef RTE_LIBRTE_THUNDERVNIC_PMD -_(rte_nicvf_pmd_init) -#endif -#undef _ - dm->vlib_main = vm; dm->vnet_main = vnet_get_main(); @@ -1744,6 +1615,15 @@ _(rte_nicvf_pmd_init) dm->vhost_coalesce_frames = 32; dm->vhost_coalesce_time = 1e-3; + /* Default vlib_buffer_t flags, DISABLES tcp/udp checksumming... */ + dm->buffer_flags_template = + (VLIB_BUFFER_TOTAL_LENGTH_VALID + | IP_BUFFER_L4_CHECKSUM_COMPUTED + | IP_BUFFER_L4_CHECKSUM_CORRECT); + + dm->stat_poll_interval = DPDK_STATS_POLL_INTERVAL; + dm->link_state_poll_interval = DPDK_LINK_POLL_INTERVAL; + /* init CLI */ if ((error = vlib_call_init_function (vm, dpdk_cli_init))) return error;