X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2Fdevice%2Finit.c;h=74181ead11d54e42e47633a5be86c0ad61b05f07;hb=c36f9b567d6c95a1b099226d322cfc7ffad9b3cc;hp=f7c1cc106badf42a5817f3a169b6f9218d75d719;hpb=6d1b079bf38882458dc7634d3e302e73d33897a1;p=vpp.git diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c index f7c1cc106ba..74181ead11d 100644 --- a/src/plugins/dpdk/device/init.c +++ b/src/plugins/dpdk/device/init.c @@ -21,8 +21,10 @@ #include #include +#include #include #include +#include #include #include #include @@ -43,71 +45,69 @@ #include -#define ETHER_MAX_LEN 1518 /**< Maximum frame len, including CRC. */ - dpdk_main_t dpdk_main; dpdk_config_main_t dpdk_config_main; #define LINK_STATE_ELOGS 0 -/* Port configuration, mildly modified Intel app values */ +/* dev_info.speed_capa -> interface name mapppings */ +const struct +{ + u32 link_speed; + const char *pfx; +} if_name_prefixes[] = { + /* sorted, higher speed first */ + { RTE_ETH_LINK_SPEED_200G, "TwoHundredGigabitEthernet" }, + { RTE_ETH_LINK_SPEED_100G, "HundredGigabitEthernet" }, + { RTE_ETH_LINK_SPEED_56G, "FiftySixGigabitEthernet" }, + { RTE_ETH_LINK_SPEED_50G, "FiftyGigabitEthernet" }, + { RTE_ETH_LINK_SPEED_40G, "FortyGigabitEthernet" }, + { RTE_ETH_LINK_SPEED_25G, "TwentyFiveGigabitEthernet" }, + { RTE_ETH_LINK_SPEED_20G, "TwentyGigabitEthernet" }, + { RTE_ETH_LINK_SPEED_10G, "TenGigabitEthernet" }, + { RTE_ETH_LINK_SPEED_5G, "FiveGigabitEthernet" }, + { RTE_ETH_LINK_SPEED_2_5G, "TwoDotFiveGigabitEthernet" }, + { RTE_ETH_LINK_SPEED_1G, "GigabitEthernet" }, +}; -static dpdk_port_type_t -port_type_from_speed_capa (struct rte_eth_dev_info *dev_info) +static clib_error_t * +dpdk_set_max_frame_size (vnet_main_t *vnm, vnet_hw_interface_t *hi, + u32 frame_size) { + dpdk_main_t *dm = &dpdk_main; + dpdk_device_t *xd = vec_elt_at_index (dm->devices, hi->dev_instance); + int rv; + u32 mtu; - if (dev_info->speed_capa & ETH_LINK_SPEED_100G) - return VNET_DPDK_PORT_TYPE_ETH_100G; - else if (dev_info->speed_capa & ETH_LINK_SPEED_56G) - return VNET_DPDK_PORT_TYPE_ETH_56G; - else if (dev_info->speed_capa & ETH_LINK_SPEED_50G) - return VNET_DPDK_PORT_TYPE_ETH_50G; - else if (dev_info->speed_capa & ETH_LINK_SPEED_40G) - return VNET_DPDK_PORT_TYPE_ETH_40G; - else if (dev_info->speed_capa & ETH_LINK_SPEED_25G) - return VNET_DPDK_PORT_TYPE_ETH_25G; - else if (dev_info->speed_capa & ETH_LINK_SPEED_20G) - return VNET_DPDK_PORT_TYPE_ETH_20G; - else if (dev_info->speed_capa & ETH_LINK_SPEED_10G) - return VNET_DPDK_PORT_TYPE_ETH_10G; - else if (dev_info->speed_capa & ETH_LINK_SPEED_5G) - return VNET_DPDK_PORT_TYPE_ETH_5G; - else if (dev_info->speed_capa & ETH_LINK_SPEED_2_5G) - return VNET_DPDK_PORT_TYPE_ETH_2_5G; - else if (dev_info->speed_capa & ETH_LINK_SPEED_1G) - return VNET_DPDK_PORT_TYPE_ETH_1G; - - return VNET_DPDK_PORT_TYPE_UNKNOWN; -} + mtu = frame_size - xd->driver_frame_overhead; -static dpdk_port_type_t -port_type_from_link_speed (u32 link_speed) -{ - switch (link_speed) + rv = rte_eth_dev_set_mtu (xd->port_id, mtu); + + if (rv < 0) { - 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; + dpdk_log_err ("[%u] rte_eth_dev_set_mtu failed (mtu %u, rv %d)", + xd->port_id, mtu, rv); + switch (rv) + { + case -ENOTSUP: + return vnet_error (VNET_ERR_UNSUPPORTED, + "dpdk driver doesn't support MTU change"); + case -EBUSY: + return vnet_error (VNET_ERR_BUSY, "port is running"); + case -EINVAL: + return vnet_error (VNET_ERR_INVALID_VALUE, "invalid MTU"); + default: + return vnet_error (VNET_ERR_BUG, + "unexpected return value %d returned from " + "rte_eth_dev_set_mtu(...)", + rv); + } } + else + dpdk_log_debug ("[%u] max_frame_size set to %u by setting MTU to %u", + xd->port_id, frame_size, mtu); + + return 0; } static u32 @@ -121,15 +121,11 @@ dpdk_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hi, u32 flags) { case ETHERNET_INTERFACE_FLAG_DEFAULT_L3: /* set to L3/non-promisc mode */ - xd->flags &= ~DPDK_DEVICE_FLAG_PROMISC; + dpdk_device_flag_set (xd, DPDK_DEVICE_FLAG_PROMISC, 0); break; case ETHERNET_INTERFACE_FLAG_ACCEPT_ALL: - xd->flags |= DPDK_DEVICE_FLAG_PROMISC; + dpdk_device_flag_set (xd, DPDK_DEVICE_FLAG_PROMISC, 1); 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; } @@ -145,12 +141,6 @@ dpdk_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hi, u32 flags) return old; } -static int -dpdk_port_crc_strip_enabled (dpdk_device_t * xd) -{ - return !(xd->port_conf.rxmode.offloads & DEV_RX_OFFLOAD_KEEP_CRC); -} - /* The function check_l3cache helps check if Level 3 cache exists or not on current CPUs return value 1: exist. return value 0: not exist. @@ -192,723 +182,345 @@ check_l3cache () return 0; } -static void -dpdk_enable_l4_csum_offload (dpdk_device_t * xd) +static dpdk_device_config_t * +dpdk_find_startup_config (struct rte_eth_dev_info *di) { - xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_TCP_CKSUM; - xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_UDP_CKSUM; - xd->flags |= DPDK_DEVICE_FLAG_TX_OFFLOAD | - DPDK_DEVICE_FLAG_INTEL_PHDR_CKSUM; + dpdk_main_t *dm = &dpdk_main; + struct rte_pci_device *pci_dev; + struct rte_vmbus_device *vmbus_dev; + vlib_pci_addr_t pci_addr; + vlib_vmbus_addr_t vmbus_addr; + uword *p = 0; + + if ((pci_dev = dpdk_get_pci_device (di))) + { + pci_addr.domain = pci_dev->addr.domain; + 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); + } + + if ((vmbus_dev = dpdk_get_vmbus_device (di))) + { + unformat_input_t input_vmbus; + unformat_init_string (&input_vmbus, di->device->name, + strlen (di->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); + unformat_free (&input_vmbus); + } + + if (p) + return pool_elt_at_index (dm->conf->dev_confs, p[0]); + return &dm->conf->default_devconf; } static clib_error_t * dpdk_lib_init (dpdk_main_t * dm) { - u32 nports; - u32 mtu, max_rx_frame; - int i; - clib_error_t *error; - vlib_main_t *vm = vlib_get_main (); + vnet_main_t *vnm = vnet_get_main (); + u16 port_id; vlib_thread_main_t *tm = vlib_get_thread_main (); vnet_device_main_t *vdm = &vnet_device_main; vnet_sw_interface_t *sw; vnet_hw_interface_t *hi; dpdk_device_t *xd; - vlib_pci_addr_t last_pci_addr; - u32 last_pci_addr_port = 0; - u8 af_packet_instance_num = 0; - last_pci_addr.as_u32 = ~0; - - nports = rte_eth_dev_count_avail (); - - if (nports < 1) - { - dpdk_log_notice ("DPDK drivers found no Ethernet devices..."); - } - - if (CLIB_DEBUG > 0) - dpdk_log_notice ("DPDK drivers found %d ports...", nports); - - if (dm->conf->enable_tcp_udp_checksum) - dm->buffer_flags_template &= ~(VNET_BUFFER_F_L4_CHECKSUM_CORRECT - | VNET_BUFFER_F_L4_CHECKSUM_COMPUTED); + char *if_num_fmt; /* vlib_buffer_t template */ vec_validate_aligned (dm->per_thread_data, tm->n_vlib_mains - 1, CLIB_CACHE_LINE_BYTES); - for (i = 0; i < tm->n_vlib_mains; i++) + for (int i = 0; i < tm->n_vlib_mains; i++) { dpdk_per_thread_data_t *ptd = vec_elt_at_index (dm->per_thread_data, i); clib_memset (&ptd->buffer_template, 0, sizeof (vlib_buffer_t)); - ptd->buffer_template.flags = dm->buffer_flags_template; vnet_buffer (&ptd->buffer_template)->sw_if_index[VLIB_TX] = (u32) ~ 0; } - /* *INDENT-OFF* */ - RTE_ETH_FOREACH_DEV(i) + if_num_fmt = + dm->conf->interface_name_format_decimal ? "%d/%d/%d" : "%x/%x/%x"; + + /* device config defaults */ + dm->default_port_conf.n_rx_desc = DPDK_NB_RX_DESC_DEFAULT; + dm->default_port_conf.n_tx_desc = DPDK_NB_TX_DESC_DEFAULT; + dm->default_port_conf.n_rx_queues = 1; + dm->default_port_conf.n_tx_queues = tm->n_vlib_mains; + dm->default_port_conf.rss_hf = + RTE_ETH_RSS_IP | RTE_ETH_RSS_UDP | RTE_ETH_RSS_TCP; + dm->default_port_conf.max_lro_pkt_size = DPDK_MAX_LRO_SIZE_DEFAULT; + + if ((clib_mem_get_default_hugepage_size () == 2 << 20) && + check_l3cache () == 0) + dm->default_port_conf.n_rx_desc = dm->default_port_conf.n_tx_desc = 512; + + RTE_ETH_FOREACH_DEV (port_id) { u8 addr[6]; - 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; + int rv, q; + struct rte_eth_dev_info di; dpdk_device_config_t *devconf = 0; - vlib_pci_addr_t pci_addr; - vlib_vmbus_addr_t vmbus_addr; - uword *p = 0; + vnet_eth_interface_registration_t eir = {}; + dpdk_driver_t *dr; - if (!rte_eth_dev_is_valid_port(i)) + if (!rte_eth_dev_is_valid_port (port_id)) continue; - rte_eth_dev_info_get (i, &dev_info); - - if (dev_info.device == 0) + if ((rv = rte_eth_dev_info_get (port_id, &di)) != 0) { - dpdk_log_notice ("DPDK bug: missing device info. Skipping %s device", - dev_info.driver_name); + dpdk_log_warn ("[%u] failed to get device info. skipping device.", + port_id); continue; } - pci_dev = dpdk_get_pci_device (&dev_info); - - if (pci_dev) + if (di.device == 0) { - pci_addr.domain = pci_dev->addr.domain; - 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); + dpdk_log_warn ("[%u] missing device info. Skipping '%s' device", + port_id, di.driver_name); + continue; } - vmbus_dev = dpdk_get_vmbus_device (&dev_info); + devconf = dpdk_find_startup_config (&di); - if (vmbus_dev) + /* If device is blacklisted, we should skip it */ + if (devconf->is_blacklisted) { - 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); - } + dpdk_log_notice ("[%d] Device %s blacklisted. Skipping...", port_id, + di.driver_name); + continue; } - if (p) + vec_add2_aligned (dm->devices, xd, 1, CLIB_CACHE_LINE_BYTES); + xd->port_id = port_id; + xd->device_index = xd - dm->devices; + xd->per_interface_next_index = ~0; + + clib_memcpy (&xd->conf, &dm->default_port_conf, + sizeof (dpdk_port_conf_t)); + + /* find driver datea for this PMD */ + if ((dr = dpdk_driver_find (di.driver_name, &xd->if_desc))) { - devconf = pool_elt_at_index (dm->conf->dev_confs, p[0]); - /* If device is blacklisted, we should skip it */ - if (devconf->is_blacklisted) - { - continue; - } + xd->driver = dr; + xd->supported_flow_actions = dr->supported_flow_actions; + xd->conf.disable_rss = dr->mq_mode_none; + xd->conf.disable_rx_scatter = dr->disable_rx_scatter; + xd->conf.enable_rxq_int = dr->enable_rxq_int; + if (dr->use_intel_phdr_cksum) + dpdk_device_flag_set (xd, DPDK_DEVICE_FLAG_INTEL_PHDR_CKSUM, 1); + if (dr->int_unmaskable) + dpdk_device_flag_set (xd, DPDK_DEVICE_FLAG_INT_UNMASKABLE, 1); } else - devconf = &dm->conf->default_devconf; + dpdk_log_warn ("[%u] unknown driver '%s'", port_id, di.driver_name); - /* 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) + if (devconf->name) { xd->name = devconf->name; } - - /* Handle representor devices that share the same PCI ID */ - if (dev_info.switch_info.domain_id != RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID) - { - if (dev_info.switch_info.port_id != (uint16_t)-1) - xd->interface_name_suffix = format (0, "%d", dev_info.switch_info.port_id); - } - /* Handle interface naming for devices with multiple ports sharing same PCI ID */ - else if (pci_dev && - ((next_port_id = rte_eth_find_next (i + 1)) != RTE_MAX_ETHPORTS)) + else { - struct rte_eth_dev_info di = { 0 }; - struct rte_pci_device *next_pci_dev; - rte_eth_dev_info_get (next_port_id, &di); - next_pci_dev = di.device ? RTE_DEV_TO_PCI (di.device) : 0; - if (next_pci_dev && - pci_addr.as_u32 != last_pci_addr.as_u32 && - memcmp (&pci_dev->addr, &next_pci_dev->addr, - sizeof (struct rte_pci_addr)) == 0) - { - xd->interface_name_suffix = format (0, "0"); - last_pci_addr.as_u32 = pci_addr.as_u32; - last_pci_addr_port = i; - } - else if (pci_addr.as_u32 == last_pci_addr.as_u32) + struct rte_pci_device *pci_dev; + if (dr && dr->interface_name_prefix) { - xd->interface_name_suffix = - format (0, "%u", i - last_pci_addr_port); + /* prefix override by driver */ + xd->name = format (xd->name, "%s", dr->interface_name_prefix); } else { - last_pci_addr.as_u32 = ~0; + /* interface name prefix from speed_capa */ + u64 mask = ~((if_name_prefixes[0].link_speed << 1) - 1); + + if (di.speed_capa & mask) + dpdk_log_warn ("[%u] unknown speed capability 0x%x reported", + xd->port_id, di.speed_capa & mask); + + for (int i = 0; i < ARRAY_LEN (if_name_prefixes); i++) + if (if_name_prefixes[i].link_speed & di.speed_capa) + { + xd->name = + format (xd->name, "%s", if_name_prefixes[i].pfx); + break; + } + if (xd->name == 0) + xd->name = format (xd->name, "Ethernet"); } - } - else - last_pci_addr.as_u32 = ~0; - - clib_memcpy (&xd->tx_conf, &dev_info.default_txconf, - sizeof (struct rte_eth_txconf)); - if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_IPV4_CKSUM) - { - xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_IPV4_CKSUM; - xd->flags |= DPDK_DEVICE_FLAG_RX_IP4_CKSUM; + if (dr && dr->interface_number_from_port_id) + xd->name = format (xd->name, "%u", port_id); + else if ((pci_dev = dpdk_get_pci_device (&di))) + xd->name = format (xd->name, if_num_fmt, pci_dev->addr.bus, + pci_dev->addr.devid, pci_dev->addr.function); + else + xd->name = format (xd->name, "%u", port_id); } - if (dm->conf->enable_tcp_udp_checksum) - { - if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_UDP_CKSUM) - xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_UDP_CKSUM; - if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_TCP_CKSUM) - xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_TCP_CKSUM; - } + /* Handle representor devices that share the same PCI ID */ + if ((di.switch_info.domain_id != RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID) && + (di.switch_info.port_id != (uint16_t) -1)) + xd->name = format (xd->name, "/%d", di.switch_info.port_id); - if (dm->conf->enable_lro) + /* number of RX and TX queues */ + if (devconf->num_tx_queues > 0) { - if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_TCP_LRO) - { - xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_TCP_LRO; - if (devconf->max_lro_pkt_size) - xd->port_conf.rxmode.max_lro_pkt_size = - devconf->max_lro_pkt_size; - else - xd->port_conf.rxmode.max_lro_pkt_size = - DPDK_MAX_LRO_SIZE_DEFAULT; - } - } - if (dm->conf->no_multi_seg) - { - 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; - } - 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; - xd->flags |= DPDK_DEVICE_FLAG_MAYBE_MULTISEG; + if (di.max_tx_queues < devconf->num_tx_queues) + dpdk_log_warn ("[%u] Configured number of TX queues (%u) is " + "bigger than maximum supported (%u)", + port_id, devconf->num_tx_queues, di.max_tx_queues); + xd->conf.n_tx_queues = devconf->num_tx_queues; } - xd->tx_q_used = clib_min (dev_info.max_tx_queues, tm->n_vlib_mains); - - 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); + xd->conf.n_tx_queues = clib_min (di.max_tx_queues, xd->conf.n_tx_queues); - if (devconf->num_rx_queues > 1 - && dev_info.max_rx_queues >= devconf->num_rx_queues) + if (devconf->num_rx_queues > 1 && + di.max_rx_queues >= devconf->num_rx_queues) { - xd->rx_q_used = devconf->num_rx_queues; - xd->port_conf.rxmode.mq_mode = ETH_MQ_RX_RSS; - 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->conf.n_rx_queues = devconf->num_rx_queues; + if (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; + xd->conf.rss_hf = devconf->rss_fn; + unsupported_bits = xd->conf.rss_hf; + unsupported_bits &= ~di.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; + xd->conf.rss_hf &= di.flow_type_rss_offloads; + dpdk_log_debug ("[%u] rss_hf: %U", port_id, format_dpdk_rss_hf_name, + xd->conf.rss_hf); } - else - xd->rx_q_used = 1; - vec_validate_aligned (xd->rx_queues, xd->rx_q_used - 1, +#ifndef RTE_VLAN_HLEN +#define RTE_VLAN_HLEN 4 +#endif + xd->driver_frame_overhead = + RTE_ETHER_HDR_LEN + 2 * RTE_VLAN_HLEN + RTE_ETHER_CRC_LEN; +#if RTE_VERSION >= RTE_VERSION_NUM(21, 11, 0, 0) + q = di.max_rx_pktlen - di.max_mtu; + + /* attempt to protect from bogus value provided by pmd */ + if (q < (2 * xd->driver_frame_overhead) && q > 0 && + di.max_mtu != UINT16_MAX) + xd->driver_frame_overhead = q; + dpdk_log_debug ("[%u] min_mtu: %u, max_mtu: %u, min_rx_bufsize: %u, " + "max_rx_pktlen: %u, max_lro_pkt_size: %u", + xd->port_id, di.min_mtu, di.max_mtu, di.min_rx_bufsize, + di.max_rx_pktlen, di.max_lro_pkt_size); +#endif + dpdk_log_debug ("[%u] driver frame overhead is %u", port_id, + xd->driver_frame_overhead); + + /* number of RX and TX tescriptors */ + if (devconf->num_rx_desc) + xd->conf.n_rx_desc = devconf->num_rx_desc; + else if (dr && dr->n_rx_desc) + xd->conf.n_rx_desc = dr->n_rx_desc; + + if (devconf->num_tx_desc) + xd->conf.n_tx_desc = devconf->num_tx_desc; + else if (dr && dr->n_tx_desc) + xd->conf.n_tx_desc = dr->n_tx_desc; + + dpdk_log_debug ( + "[%u] n_rx_queues: %u n_tx_queues: %u n_rx_desc: %u n_tx_desc: %u", + port_id, xd->conf.n_rx_queues, xd->conf.n_tx_queues, + xd->conf.n_rx_desc, xd->conf.n_tx_desc); + + vec_validate_aligned (xd->rx_queues, xd->conf.n_rx_queues - 1, + CLIB_CACHE_LINE_BYTES); + vec_validate_aligned (xd->tx_queues, xd->conf.n_tx_queues - 1, CLIB_CACHE_LINE_BYTES); - xd->flags |= DPDK_DEVICE_FLAG_PMD; - - /* workaround for drivers not setting driver_name */ - if ((!dev_info.driver_name) && (pci_dev)) - dev_info.driver_name = pci_dev->driver->driver.name; - - ASSERT (dev_info.driver_name); - - if (!xd->pmd) - { - - -#define _(s,f) else if (dev_info.driver_name && \ - !strcmp(dev_info.driver_name, s)) \ - xd->pmd = VNET_DPDK_PMD_##f; - if (0) - ; - foreach_dpdk_pmd -#undef _ - else - xd->pmd = VNET_DPDK_PMD_UNKNOWN; - - xd->port_type = VNET_DPDK_PORT_TYPE_UNKNOWN; - xd->nb_rx_desc = DPDK_NB_RX_DESC_DEFAULT; - xd->nb_tx_desc = DPDK_NB_TX_DESC_DEFAULT; - - switch (xd->pmd) - { - /* Drivers with valid speed_capa set */ - case VNET_DPDK_PMD_I40E: - xd->flags |= DPDK_DEVICE_FLAG_INT_UNMASKABLE; - case VNET_DPDK_PMD_E1000EM: - case VNET_DPDK_PMD_IGB: - case VNET_DPDK_PMD_IGC: - case VNET_DPDK_PMD_IXGBE: - case VNET_DPDK_PMD_ICE: - xd->port_type = port_type_from_speed_capa (&dev_info); - xd->supported_flow_actions = VNET_FLOW_ACTION_MARK | - VNET_FLOW_ACTION_REDIRECT_TO_NODE | - VNET_FLOW_ACTION_REDIRECT_TO_QUEUE | - VNET_FLOW_ACTION_BUFFER_ADVANCE | - VNET_FLOW_ACTION_COUNT | VNET_FLOW_ACTION_DROP | - VNET_FLOW_ACTION_RSS; - - if (dm->conf->no_tx_checksum_offload == 0) - { - xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_TCP_CKSUM; - xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_UDP_CKSUM; - xd->flags |= - DPDK_DEVICE_FLAG_TX_OFFLOAD | - DPDK_DEVICE_FLAG_INTEL_PHDR_CKSUM; - } - - xd->port_conf.intr_conf.rxq = 1; - break; - case VNET_DPDK_PMD_MLX5: - if (dm->conf->no_tx_checksum_offload == 0) - { - xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_TCP_CKSUM; - xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_UDP_CKSUM; - xd->flags |= DPDK_DEVICE_FLAG_TX_OFFLOAD | - DPDK_DEVICE_FLAG_INTEL_PHDR_CKSUM; - } - xd->port_type = port_type_from_speed_capa (&dev_info); - break; - case VNET_DPDK_PMD_CXGBE: - case VNET_DPDK_PMD_MLX4: - case VNET_DPDK_PMD_QEDE: - case VNET_DPDK_PMD_BNXT: - xd->port_type = port_type_from_speed_capa (&dev_info); - break; - - /* SR-IOV VFs */ - case VNET_DPDK_PMD_I40EVF: - xd->flags |= DPDK_DEVICE_FLAG_INT_UNMASKABLE; - case VNET_DPDK_PMD_IGBVF: - case VNET_DPDK_PMD_IXGBEVF: - xd->port_type = VNET_DPDK_PORT_TYPE_ETH_VF; - if (dm->conf->no_tx_checksum_offload == 0) - { - xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_TCP_CKSUM; - xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_UDP_CKSUM; - xd->flags |= - DPDK_DEVICE_FLAG_TX_OFFLOAD | - DPDK_DEVICE_FLAG_INTEL_PHDR_CKSUM; - } - /* DPDK bug in multiqueue... */ - /* xd->port_conf.intr_conf.rxq = 1; */ - break; - - /* iAVF */ - case VNET_DPDK_PMD_IAVF: - xd->flags |= DPDK_DEVICE_FLAG_INT_UNMASKABLE; - xd->port_type = VNET_DPDK_PORT_TYPE_ETH_VF; - xd->supported_flow_actions = - VNET_FLOW_ACTION_MARK | VNET_FLOW_ACTION_REDIRECT_TO_NODE | - VNET_FLOW_ACTION_REDIRECT_TO_QUEUE | - VNET_FLOW_ACTION_BUFFER_ADVANCE | VNET_FLOW_ACTION_COUNT | - VNET_FLOW_ACTION_DROP | VNET_FLOW_ACTION_RSS; - - if (dm->conf->no_tx_checksum_offload == 0) - { - xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_TCP_CKSUM; - xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_UDP_CKSUM; - xd->flags |= - DPDK_DEVICE_FLAG_TX_OFFLOAD | - DPDK_DEVICE_FLAG_INTEL_PHDR_CKSUM; - } - /* DPDK bug in multiqueue... */ - /* xd->port_conf.intr_conf.rxq = 1; */ - break; - - case VNET_DPDK_PMD_THUNDERX: - xd->port_type = VNET_DPDK_PORT_TYPE_ETH_VF; - - if (dm->conf->no_tx_checksum_offload == 0) - { - xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_TCP_CKSUM; - xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_UDP_CKSUM; - xd->flags |= DPDK_DEVICE_FLAG_TX_OFFLOAD; - } - break; - - 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: - xd->port_type = VNET_DPDK_PORT_TYPE_ETH_10G; - break; - - /* Cisco VIC */ - case VNET_DPDK_PMD_ENIC: - { - 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 */ - case VNET_DPDK_PMD_FM10K: - xd->port_type = VNET_DPDK_PORT_TYPE_ETH_SWITCH; - break; - - /* virtio */ - case VNET_DPDK_PMD_VIRTIO: - xd->port_conf.rxmode.mq_mode = ETH_MQ_RX_NONE; - xd->port_type = VNET_DPDK_PORT_TYPE_ETH_1G; - xd->nb_rx_desc = DPDK_NB_RX_DESC_VIRTIO; - xd->nb_tx_desc = DPDK_NB_TX_DESC_VIRTIO; - /* - * Enable use of RX interrupts if supported. - * - * There is no device flag or capability for this, so - * use the same check that the virtio driver does. - */ - if (pci_dev && rte_intr_cap_multiple (&pci_dev->intr_handle)) - xd->port_conf.intr_conf.rxq = 1; - break; - - /* vmxnet3 */ - case VNET_DPDK_PMD_VMXNET3: - xd->port_type = VNET_DPDK_PORT_TYPE_ETH_1G; - xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_MULTI_SEGS; - break; - - case VNET_DPDK_PMD_AF_PACKET: - xd->port_type = VNET_DPDK_PORT_TYPE_AF_PACKET; - xd->af_packet_instance_num = af_packet_instance_num++; - break; - - case VNET_DPDK_PMD_VIRTIO_USER: - xd->port_type = VNET_DPDK_PORT_TYPE_VIRTIO_USER; - break; - - case VNET_DPDK_PMD_VHOST_ETHER: - xd->port_type = VNET_DPDK_PORT_TYPE_VHOST_ETHER; - break; - - case VNET_DPDK_PMD_LIOVF_ETHER: - xd->port_type = VNET_DPDK_PORT_TYPE_ETH_VF; - break; - - case VNET_DPDK_PMD_FAILSAFE: - xd->port_type = VNET_DPDK_PORT_TYPE_FAILSAFE; - xd->port_conf.intr_conf.lsc = 1; - break; - - case VNET_DPDK_PMD_NETVSC: - { - struct rte_eth_link l; - rte_eth_link_get_nowait (i, &l); - xd->port_type = VNET_DPDK_PORT_TYPE_ETH_VF; - } - break; - - default: - xd->port_type = VNET_DPDK_PORT_TYPE_UNKNOWN; - } - - if (devconf->num_rx_desc) - xd->nb_rx_desc = devconf->num_rx_desc; - else { - - /* If num_rx_desc is not specified by VPP user, the current CPU is working - with 2M page and has no L3 cache, default num_rx_desc is changed to 512 - from original 1024 to help reduce TLB misses. - */ - if ((clib_mem_get_default_hugepage_size () == 2 << 20) - && check_l3cache() == 0) - xd->nb_rx_desc = 512; - } - - if (devconf->num_tx_desc) - xd->nb_tx_desc = devconf->num_tx_desc; - else { - - /* If num_tx_desc is not specified by VPP user, the current CPU is working - with 2M page and has no L3 cache, default num_tx_desc is changed to 512 - from original 1024 to help reduce TLB misses. - */ - if ((clib_mem_get_default_hugepage_size () == 2 << 20) - && check_l3cache() == 0) - xd->nb_tx_desc = 512; - } - } - - if (xd->pmd == VNET_DPDK_PMD_AF_PACKET) - { - f64 now = vlib_time_now (vm); - u32 rnd; - rnd = (u32) (now * 1e6); - rnd = random_u32 (&rnd); - clib_memcpy (addr + 2, &rnd, sizeof (rnd)); - addr[0] = 2; - addr[1] = 0xfe; - } - else - rte_eth_macaddr_get (i, (void *) addr); - - xd->port_id = i; - xd->device_index = xd - dm->devices; - xd->per_interface_next_index = ~0; - - /* assign interface to input thread */ - int q; - - error = ethernet_register_interface - (dm->vnet_main, dpdk_device_class.index, xd->device_index, - /* ethernet address */ addr, - &xd->hw_if_index, dpdk_flag_change); - if (error) - return error; - - /* - * Ensure default mtu is not > the mtu read from the hardware. - * Otherwise rte_eth_dev_configure() will fail and the port will - * not be available. - * Calculate max_frame_size and mtu supported by NIC - */ - 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. - */ - max_rx_frame = dev_info.max_rx_pktlen; - mtu = dev_info.max_rx_pktlen - sizeof (ethernet_header_t); - } - else - { - /* VPP treats MTU and max_rx_pktlen both equal to - * ETHERNET_MAX_PACKET_BYTES, if dev_info.max_rx_pktlen >= - * ETHERNET_MAX_PACKET_BYTES + sizeof(ethernet_header_t) - */ - if (dev_info.max_rx_pktlen >= (ETHERNET_MAX_PACKET_BYTES + - sizeof (ethernet_header_t))) - { - mtu = ETHERNET_MAX_PACKET_BYTES; - max_rx_frame = 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 (dpdk_port_crc_strip_enabled (xd) && - (dev_info.max_rx_pktlen >= (ETHERNET_MAX_PACKET_BYTES + - sizeof (ethernet_header_t) + - 4))) - { - max_rx_frame += 4; - } - } - else - { - max_rx_frame = ETHERNET_MAX_PACKET_BYTES; - mtu = ETHERNET_MAX_PACKET_BYTES - sizeof (ethernet_header_t); - - if (dpdk_port_crc_strip_enabled (xd) && - (dev_info.max_rx_pktlen >= (ETHERNET_MAX_PACKET_BYTES + 4))) - { - max_rx_frame += 4; - } - } - } - - if (xd->pmd == VNET_DPDK_PMD_FAILSAFE) - { - /* failsafe device numerables are reported with active device only, - * need to query the mtu for current device setup to overwrite - * reported value. - */ - uint16_t dev_mtu; - if (!rte_eth_dev_get_mtu (i, &dev_mtu)) - { - mtu = dev_mtu; - max_rx_frame = mtu + sizeof (ethernet_header_t); - - if (dpdk_port_crc_strip_enabled (xd)) - { - max_rx_frame += 4; - } - } - } + rte_eth_macaddr_get (port_id, (void *) addr); + + /* create interface */ + eir.dev_class_index = dpdk_device_class.index; + eir.dev_instance = xd->device_index; + eir.address = addr; + eir.cb.flag_change = dpdk_flag_change; + eir.cb.set_max_frame_size = dpdk_set_max_frame_size; + xd->hw_if_index = vnet_eth_register_interface (vnm, &eir); + hi = vnet_get_hw_interface (vnm, xd->hw_if_index); + hi->numa_node = xd->cpu_socket = (i8) rte_eth_dev_socket_id (port_id); + sw = vnet_get_hw_sw_interface (vnm, xd->hw_if_index); + xd->sw_if_index = sw->sw_if_index; + dpdk_log_debug ("[%u] interface %s created", port_id, hi->name); - /*Set port rxmode config */ - xd->port_conf.rxmode.max_rx_pkt_len = max_rx_frame; + if (devconf->tag) + vnet_set_sw_interface_tag (vnm, devconf->tag, sw->sw_if_index); - sw = vnet_get_hw_sw_interface (dm->vnet_main, xd->hw_if_index); - xd->sw_if_index = sw->sw_if_index; - vnet_hw_if_set_input_node (dm->vnet_main, xd->hw_if_index, - dpdk_input_node.index); + ethernet_set_flags (vnm, xd->hw_if_index, + ETHERNET_INTERFACE_FLAG_DEFAULT_L3); + /* assign worker threads */ + vnet_hw_if_set_input_node (vnm, xd->hw_if_index, dpdk_input_node.index); if (devconf->workers) { - int i; + int j; q = 0; - clib_bitmap_foreach (i, devconf->workers) { + clib_bitmap_foreach (j, 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); - } + vnm, xd->hw_if_index, q++, vdm->first_worker_thread_index + j); + } } else - for (q = 0; q < xd->rx_q_used; q++) + for (q = 0; q < xd->conf.n_rx_queues; q++) { 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); + vnm, 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); + for (q = 0; q < xd->conf.n_tx_queues; q++) + { + dpdk_tx_queue_t *txq = vec_elt_at_index (xd->tx_queues, q); + txq->queue_index = + vnet_hw_if_register_tx_queue (vnm, xd->hw_if_index, q); + } - /*Override default max_packet_bytes and max_supported_bytes set in - * ethernet_register_interface() above*/ - if (hi) + for (q = 0; q < tm->n_vlib_mains; q++) { - 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->caps |= VNET_HW_INTERFACE_CAP_SUPPORTS_MAC_FILTER; - ethernet_set_flags (dm->vnet_main, xd->hw_if_index, - ETHERNET_INTERFACE_FLAG_DEFAULT_L3); + u32 qi = xd->tx_queues[q % xd->conf.n_tx_queues].queue_index; + vnet_hw_if_tx_queue_assign_thread (vnm, qi, q); } - if (dm->conf->no_tx_checksum_offload == 0) - if (xd->flags & DPDK_DEVICE_FLAG_TX_OFFLOAD && hi != NULL) - { - hi->caps |= VNET_HW_INTERFACE_CAP_SUPPORTS_TX_IP4_CKSUM | - VNET_HW_INTERFACE_CAP_SUPPORTS_TX_TCP_CKSUM | - VNET_HW_INTERFACE_CAP_SUPPORTS_TX_UDP_CKSUM; - } - if (devconf->tso == DPDK_DEVICE_TSO_ON && hi != NULL) + if (devconf->tso == DPDK_DEVICE_TSO_ON) { /*tcp_udp checksum must be enabled*/ - if ((dm->conf->enable_tcp_udp_checksum) && - (hi->caps & VNET_HW_INTERFACE_CAP_SUPPORTS_TX_CKSUM)) - { - hi->caps |= VNET_HW_INTERFACE_CAP_SUPPORTS_TCP_GSO | - VNET_HW_INTERFACE_CAP_SUPPORTS_UDP_GSO; - xd->port_conf.txmode.offloads |= - DEV_TX_OFFLOAD_TCP_TSO | DEV_TX_OFFLOAD_UDP_TSO; - } + if (xd->conf.enable_tcp_udp_checksum == 0) + dpdk_log_warn ("[%u] TCP/UDP checksum offload must be enabled", + xd->port_id); + else if ((di.tx_offload_capa & RTE_ETH_TX_OFFLOAD_TCP_TSO) == 0) + dpdk_log_warn ("[%u] TSO not supported by device", xd->port_id); else - clib_warning ("%s: TCP/UDP checksum offload must be enabled", - hi->name); + xd->conf.enable_tso = 1; } + if (devconf->max_lro_pkt_size) + xd->conf.max_lro_pkt_size = devconf->max_lro_pkt_size; + 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 (devconf->rss_queues) + { + if (vnet_hw_interface_set_rss_queues (vnet_get_main (), hi, + devconf->rss_queues)) + dpdk_log_warn ("[%u] Failed to set rss queues", port_id); + } 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); - - /* - * A note on Cisco VIC (PMD_ENIC) and VLAN: - * - * With Cisco VIC vNIC, every ingress packet is tagged. On a - * trunk vNIC (C series "standalone" server), packets on no VLAN - * are tagged with vlan 0. On an access vNIC (standalone or B - * series "blade" server), packets on the default/native VLAN - * are tagged with that vNIC's VLAN. VPP expects these packets - * to be untagged, and previously enabled VLAN strip on VIC by - * default. But it also broke vlan sub-interfaces. - * - * The VIC adapter has "untag default vlan" ingress VLAN rewrite - * mode, which removes tags from these packets. VPP now includes - * a local patch for the enic driver to use this untag mode, so - * enabling vlan stripping is no longer needed. In future, the - * driver + dpdk will have an API to set the mode after - * rte_eal_init. Then, this note and local patch will be - * removed. - */ - - /* - * VLAN stripping: default to VLAN strip disabled, unless specified - * 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; - } - - 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; - - rte_eth_dev_set_mtu (xd->port_id, mtu); -} + dpdk_log_err ("[%u] setup failed Errors:\n %U", port_id, + format_dpdk_device_errors, xd); + } - /* *INDENT-ON* */ + for (int i = 0; i < vec_len (dm->devices); i++) + vnet_hw_if_update_runtime_data (vnm, dm->devices[i].hw_if_index); return 0; } @@ -1013,9 +625,12 @@ dpdk_bind_devices_to_uio (dpdk_config_main_t * conf) else if (d->vendor_id == 0x8086 && d->device_class == PCI_CLASS_NETWORK_ETHERNET) ; /* all Intel QAT devices VFs */ - else if (d->vendor_id == 0x8086 && d->device_class == PCI_CLASS_PROCESSOR_CO && - (d->device_id == 0x0443 || d->device_id == 0x18a1 || d->device_id == 0x19e3 || - d->device_id == 0x37c9 || d->device_id == 0x6f55)) + else if (d->vendor_id == 0x8086 && + d->device_class == PCI_CLASS_PROCESSOR_CO && + (d->device_id == 0x0443 || d->device_id == 0x18a1 || + d->device_id == 0x19e3 || d->device_id == 0x37c9 || + d->device_id == 0x6f55 || d->device_id == 0x18ef || + d->device_id == 0x4941)) ; /* Cisco VIC */ else if (d->vendor_id == 0x1137 && @@ -1069,7 +684,8 @@ dpdk_bind_devices_to_uio (dpdk_config_main_t * conf) continue; } - error = vlib_pci_bind_to_uio (vm, addr, (char *) conf->uio_driver_name); + error = vlib_pci_bind_to_uio (vm, addr, (char *) conf->uio_driver_name, + conf->uio_bind_force); if (error) { @@ -1262,7 +878,9 @@ dpdk_device_config (dpdk_config_main_t *conf, void *addr, ; else if (unformat (input, "num-tx-desc %u", &devconf->num_tx_desc)) ; - else if (unformat (input, "name %s", &devconf->name)) + else if (unformat (input, "name %v", &devconf->name)) + ; + else if (unformat (input, "tag %s", &devconf->tag)) ; else if (unformat (input, "workers %U", unformat_bitmap_list, &devconf->workers)) @@ -1275,10 +893,6 @@ dpdk_device_config (dpdk_config_main_t *conf, void *addr, 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 if (unformat (input, "tso on")) { devconf->tso = DPDK_DEVICE_TSO_ON; @@ -1335,14 +949,26 @@ dpdk_log_read_ready (clib_file_t * uf) n = read (uf->file_descriptor, s + len, n_try); if (n < 0 && errno != EAGAIN) return clib_error_return_unix (0, "read"); - _vec_len (s) = len + (n < 0 ? 0 : n); + vec_set_len (s, len + (n < 0 ? 0 : n)); } unformat_init_vector (&input, s); while (unformat_user (&input, unformat_line, &line)) { - dpdk_log_notice ("%v", line); + int skip = 0; + vec_add1 (line, 0); + + /* unfortunatelly DPDK polutes log with this error messages + * even when we pass --in-memory which means no secondary process */ + if (strstr ((char *) line, "WARNING! Base virtual address hint")) + skip = 1; + else if (strstr ((char *) line, "This may cause issues with mapping " + "memory into secondary processes")) + skip = 1; + vec_pop (line); + if (!skip) + dpdk_log_notice ("%v", line); vec_free (line); } @@ -1353,6 +979,7 @@ dpdk_log_read_ready (clib_file_t * uf) static clib_error_t * dpdk_config (vlib_main_t * vm, unformat_input_t * input) { + dpdk_main_t *dm = &dpdk_main; clib_error_t *error = 0; dpdk_config_main_t *conf = &dpdk_config_main; vlib_thread_main_t *tm = vlib_get_thread_main (); @@ -1367,10 +994,13 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) int eal_no_hugetlb = 0; u8 no_pci = 0; u8 no_vmbus = 0; + u8 no_dsa = 0; u8 file_prefix = 0; u8 *socket_mem = 0; u8 *huge_dir_path = 0; u32 vendor, device, domain, bus, func; + void *fmt_func; + void *fmt_addr; huge_dir_path = format (0, "%s/hugepages%c", vlib_unix_get_runtime_dir (), 0); @@ -1391,18 +1021,21 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) conf->enable_telemetry = 1; else if (unformat (input, "enable-tcp-udp-checksum")) - conf->enable_tcp_udp_checksum = 1; - + { + dm->default_port_conf.enable_tcp_udp_checksum = 1; + if (unformat (input, "enable-outer-checksum-offload")) + dm->default_port_conf.enable_outer_checksum_offload = 1; + } else if (unformat (input, "no-tx-checksum-offload")) - conf->no_tx_checksum_offload = 1; + dm->default_port_conf.disable_tx_checksum_offload = 1; else if (unformat (input, "decimal-interface-names")) conf->interface_name_format_decimal = 1; else if (unformat (input, "no-multi-seg")) - conf->no_multi_seg = 1; + dm->default_port_conf.disable_multi_seg = 1; else if (unformat (input, "enable-lro")) - conf->enable_lro = 1; + dm->default_port_conf.enable_lro = 1; else if (unformat (input, "max-simd-bitwidth %U", unformat_max_simd_bitwidth, &conf->max_simd_bitwidth)) ; @@ -1460,13 +1093,10 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) num_whitelisted++; } - else if (unformat (input, "num-mem-channels %d", &conf->nchannels)) - conf->nchannels_set_manually = 0; - else if (unformat (input, "num-crypto-mbufs %d", - &conf->num_crypto_mbufs)) - ; else if (unformat (input, "uio-driver %s", &conf->uio_driver_name)) ; + else if (unformat (input, "uio-bind-force")) + conf->uio_bind_force = 1; else if (unformat (input, "socket-mem %s", &socket_mem)) ; else if (unformat (input, "no-pci")) @@ -1475,6 +1105,8 @@ 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, "no-dsa")) + no_dsa = 1; else if (unformat (input, "blacklist %U", unformat_vlib_vmbus_addr, &vmbus_addr)) { @@ -1540,29 +1172,14 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) vec_add1 (conf->eal_init_args, s); \ } foreach_eal_single_hyphen_arg -#undef _ -#define _(a,b) \ - else if (unformat(input, #a " %s", &s)) \ - { \ - tmp = format (0, "-%s%c", #b, 0); \ - vec_add1 (conf->eal_init_args, tmp); \ - vec_add1 (s, 0); \ - vec_add1 (conf->eal_init_args, s); \ - conf->a##_set_manually = 1; \ - } - foreach_eal_single_hyphen_mandatory_arg #undef _ else if (unformat (input, "default")) ; else if (unformat_skip_white_space (input)) ; - else - { - error = clib_error_return (0, "unknown input `%U'", + else return clib_error_return (0, "unknown input `%U'", format_unformat_error, input); - goto done; - } } if (!conf->uio_driver_name) @@ -1604,41 +1221,6 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) vec_add1 (conf->eal_init_args, tmp); } - if (error) - return error; - - /* I'll bet that -c and -n must be the first and second args... */ - if (!conf->coremask_set_manually) - { - vlib_thread_registration_t *tr; - uword *coremask = 0; - int i; - - /* main thread core */ - coremask = clib_bitmap_set (coremask, tm->main_lcore, 1); - - for (i = 0; i < vec_len (tm->registrations); i++) - { - tr = tm->registrations[i]; - coremask = clib_bitmap_or (coremask, tr->coremask); - } - - vec_insert (conf->eal_init_args, 2, 1); - conf->eal_init_args[1] = (u8 *) "-c"; - tmp = format (0, "%U%c", format_bitmap_hex, coremask, 0); - conf->eal_init_args[2] = tmp; - clib_bitmap_free (coremask); - } - - if (!conf->nchannels_set_manually) - { - vec_insert (conf->eal_init_args, 2, 3); - conf->eal_init_args[3] = (u8 *) "-n"; - tmp = format (0, "%d", conf->nchannels); - vec_terminate_c_string (tmp); - conf->eal_init_args[4] = tmp; - } - if (no_pci == 0 && geteuid () == 0) dpdk_bind_devices_to_uio (conf); @@ -1649,15 +1231,11 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) if (devconf->x == 0 && conf->default_devconf.x > 0) \ devconf->x = conf->default_devconf.x ; - /* *INDENT-OFF* */ pool_foreach (devconf, conf->dev_confs) { /* default per-device config items */ foreach_dpdk_device_config_item - /* copy vlan_strip config from default device */ - _ (vlan_strip_offload) - /* copy tso config from default device */ _ (tso) @@ -1667,56 +1245,57 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) /* copy rss_queues config from default device */ _ (rss_queues) - /* 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, "-a%c", 0); - vec_add1 (conf->eal_init_args, tmp); - if (devconf->devargs) + /* assume that default is PCI */ + fmt_func = format_vlib_pci_addr; + fmt_addr = &devconf->pci_addr; + + if (devconf->dev_addr_type == VNET_DEV_ADDR_VMBUS) + { + fmt_func = format_vlib_vmbus_addr; + fmt_addr = &devconf->vmbus_addr; + } + + /* add DPDK EAL whitelist/blacklist entry */ + if (num_whitelisted > 0 && devconf->is_blacklisted == 0) + { + tmp = format (0, "-a%c", 0); + vec_add1 (conf->eal_init_args, tmp); + if (devconf->devargs) { - tmp = format (0, "%U,%s%c", format_vlib_pci_addr, - &devconf->pci_addr, devconf->devargs, 0); + tmp = + format (0, "%U,%s%c", fmt_func, fmt_addr, devconf->devargs, 0); } else { - tmp = format (0, "%U%c", format_vlib_pci_addr, &devconf->pci_addr, 0); + tmp = format (0, "%U%c", fmt_func, fmt_addr, 0); } vec_add1 (conf->eal_init_args, tmp); - } - 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); - } + } + 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", fmt_func, fmt_addr, 0); + vec_add1 (conf->eal_init_args, tmp); + } } - /* *INDENT-ON* */ #undef _ - /* set master-lcore */ - 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); - - if (socket_mem) clib_warning ("socket-mem argument is deprecated"); /* NULL terminate the "argv" vector, in case of stupidity */ vec_add1 (conf->eal_init_args, 0); - _vec_len (conf->eal_init_args) -= 1; + vec_dec_len (conf->eal_init_args, 1); /* Set up DPDK eal and packet mbuf pool early. */ int log_fds[2] = { 0 }; if (pipe (log_fds) == 0) { - if (fcntl (log_fds[1], F_SETFL, O_NONBLOCK) == 0) + if (fcntl (log_fds[0], F_SETFL, O_NONBLOCK) == 0 && + fcntl (log_fds[1], F_SETFL, O_NONBLOCK) == 0) { FILE *f = fdopen (log_fds[1], "a"); if (f && rte_openlog_stream (f) == 0) @@ -1737,6 +1316,13 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) vm = vlib_get_main (); + if (no_dsa) + { + struct rte_bus *bus; + bus = rte_bus_find_by_name ("dsa"); + if (bus) + rte_bus_unregister (bus); + } /* make copy of args as rte_eal_init tends to mess up with arg array */ for (i = 1; i < vec_len (conf->eal_init_args); i++) conf->eal_init_args_str = format (conf->eal_init_args_str, "%s ", @@ -1747,6 +1333,8 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) 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); + if (ret < 0) + return clib_error_return (0, "rte_eal_init returned %d", ret); /* enable the AVX-512 vPMDs in DPDK */ if (clib_cpu_supports_avx512_bitalg () && @@ -1763,15 +1351,11 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) rmdir ((char *) huge_dir_path); vec_free (huge_dir_path); - if (ret < 0) - return clib_error_return (0, "rte_eal_init returned %d", ret); - /* main thread 1st */ if ((error = dpdk_buffer_pools_create (vm))) return error; -done: - return error; + return 0; } VLIB_CONFIG_FUNCTION (dpdk_config, "dpdk"); @@ -1784,10 +1368,6 @@ dpdk_update_link_state (dpdk_device_t * xd, f64 now) u32 hw_flags = 0; u8 hw_flags_chg = 0; - /* only update link state for PMD interfaces */ - if ((xd->flags & DPDK_DEVICE_FLAG_PMD) == 0) - return; - xd->time_last_link_update = now ? now : xd->time_last_link_update; clib_memset (&xd->link, 0, sizeof (xd->link)); rte_eth_link_get_nowait (xd->port_id, &xd->link); @@ -1815,35 +1395,32 @@ dpdk_update_link_state (dpdk_device_t * xd, f64 now) ed->new_link_state = (u8) xd->link.link_status; } - if ((xd->link.link_duplex != prev_link.link_duplex)) + hw_flags_chg = ((xd->link.link_duplex != prev_link.link_duplex) || + (xd->link.link_status != prev_link.link_status)); + + if (xd->link.link_speed != prev_link.link_speed) + vnet_hw_interface_set_link_speed (vnm, xd->hw_if_index, + (xd->link.link_speed == UINT32_MAX) ? + UINT32_MAX : + xd->link.link_speed * 1000); + + if (hw_flags_chg) { - hw_flags_chg = 1; + if (xd->link.link_status) + hw_flags |= VNET_HW_INTERFACE_FLAG_LINK_UP; + switch (xd->link.link_duplex) { - case ETH_LINK_HALF_DUPLEX: + case RTE_ETH_LINK_HALF_DUPLEX: hw_flags |= VNET_HW_INTERFACE_FLAG_HALF_DUPLEX; break; - case ETH_LINK_FULL_DUPLEX: + case RTE_ETH_LINK_FULL_DUPLEX: hw_flags |= VNET_HW_INTERFACE_FLAG_FULL_DUPLEX; break; default: break; } - } - if (xd->link.link_speed != prev_link.link_speed) - vnet_hw_interface_set_link_speed (vnm, xd->hw_if_index, - xd->link.link_speed * 1000); - - if (xd->link.link_status != prev_link.link_status) - { - hw_flags_chg = 1; - if (xd->link.link_status) - hw_flags |= VNET_HW_INTERFACE_FLAG_LINK_UP; - } - - if (hw_flags_chg) - { if (LINK_STATE_ELOGS) { ELOG_TYPE_DECLARE (e) = @@ -1873,6 +1450,7 @@ dpdk_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) dpdk_device_t *xd; vlib_thread_main_t *tm = vlib_get_thread_main (); + vlib_worker_thread_barrier_sync (vm); error = dpdk_lib_init (dm); if (error) @@ -1889,6 +1467,7 @@ dpdk_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) } } + vlib_worker_thread_barrier_release (vm); tm->worker_thread_release = 1; f64 now = vlib_time_now (vm); @@ -1951,35 +1530,28 @@ dpdk_init (vlib_main_t * vm) dpdk_cli_reference (); - dm->vlib_main = vm; - dm->vnet_main = vnet_get_main (); dm->conf = &dpdk_config_main; - dm->conf->nchannels = 4; vec_add1 (dm->conf->eal_init_args, (u8 *) "vnet"); - /* Default vlib_buffer_t flags, DISABLES tcp/udp checksumming... */ - dm->buffer_flags_template = (VLIB_BUFFER_TOTAL_LENGTH_VALID | - VLIB_BUFFER_EXT_HDR_VALID | - VNET_BUFFER_F_L4_CHECKSUM_COMPUTED | - VNET_BUFFER_F_L4_CHECKSUM_CORRECT); - dm->stat_poll_interval = DPDK_STATS_POLL_INTERVAL; 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; } VLIB_INIT_FUNCTION (dpdk_init); -/* - * fd.io coding-style-patch-verification: ON - * - * Local Variables: - * eval: (c-set-style "gnu") - * End: - */ +static clib_error_t * +dpdk_worker_thread_init (vlib_main_t *vm) +{ + if (rte_thread_register () < 0) + clib_panic ("dpdk: cannot register thread %u - %s", vm->thread_index, + rte_strerror (rte_errno)); + return 0; +} + +VLIB_WORKER_INIT_FUNCTION (dpdk_worker_thread_init);