X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2Fdevice%2Finit.c;h=6c34981b2a20f63ea10045eed2970d6203a36b75;hb=c2a6bf0c5001ba293d211196f29646e08eb445ba;hp=1ee03323d613240cd63ce927f656a779d6f39482;hpb=2a8d3083747e3b881bdc71ad6c1add79850e8731;p=vpp.git diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c index 1ee03323d61..6c34981b2a2 100644 --- a/src/plugins/dpdk/device/init.c +++ b/src/plugins/dpdk/device/init.c @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -43,41 +44,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 */ + { ETH_LINK_SPEED_200G, "TwoHundredGigabitEthernet" }, + { ETH_LINK_SPEED_100G, "HundredGigabitEthernet" }, + { ETH_LINK_SPEED_56G, "FiftySixGigabitEthernet" }, + { ETH_LINK_SPEED_50G, "FiftyGigabitEthernet" }, + { ETH_LINK_SPEED_40G, "FortyGigabitEthernet" }, + { ETH_LINK_SPEED_25G, "TwentyFiveGigabitEthernet" }, + { ETH_LINK_SPEED_20G, "TwentyGigabitEthernet" }, + { ETH_LINK_SPEED_10G, "TenGigabitEthernet" }, + { ETH_LINK_SPEED_5G, "FiveGigabitEthernet" }, + { ETH_LINK_SPEED_2_5G, "TwoDotFiveGigabitEthernet" }, + { 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; + + rv = rte_eth_dev_set_mtu (xd->port_id, mtu); + + if (rv < 0) + { + 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 @@ -91,15 +120,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; } @@ -115,12 +140,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. @@ -162,43 +181,53 @@ 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) { vnet_main_t *vnm = vnet_get_main (); - u32 nports; - u32 mtu, max_rx_frame; u16 port_id; - clib_error_t *error; - vlib_main_t *vm = vlib_get_main (); 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); + char *if_num_fmt; /* vlib_buffer_t template */ vec_validate_aligned (dm->per_thread_data, tm->n_vlib_mains - 1, @@ -210,11 +239,16 @@ dpdk_lib_init (dpdk_main_t * dm) vnet_buffer (&ptd->buffer_template)->sw_if_index[VLIB_TX] = (u32) ~ 0; } + 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 = ETH_RSS_IP | ETH_RSS_UDP | 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) @@ -223,513 +257,193 @@ dpdk_lib_init (dpdk_main_t * dm) RTE_ETH_FOREACH_DEV (port_id) { u8 addr[6]; + int rv, q; struct rte_eth_dev_info di; - struct rte_pci_device *pci_dev; - struct rte_vmbus_device *vmbus_dev; - dpdk_portid_t next_port_id; dpdk_device_config_t *devconf = 0; - vlib_pci_addr_t pci_addr; - vlib_vmbus_addr_t vmbus_addr; - uword *p = 0; + vnet_eth_interface_registration_t eir = {}; + dpdk_driver_t *dr; if (!rte_eth_dev_is_valid_port (port_id)) continue; - rte_eth_dev_info_get (port_id, &di); - - if (di.device == 0) + if ((rv = rte_eth_dev_info_get (port_id, &di)) != 0) { - dpdk_log_notice ("DPDK bug: missing device info. Skipping %s device", - di.driver_name); + dpdk_log_warn ("[%u] failed to get device info. skipping device.", + port_id); continue; } - pci_dev = dpdk_get_pci_device (&di); - - 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 (&di); + 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_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) - { - devconf = pool_elt_at_index (dm->conf->dev_confs, p[0]); - /* If device is blacklisted, we should skip it */ - if (devconf->is_blacklisted) - { - continue; - } + dpdk_log_notice ("[%d] Device %s blacklisted. Skipping...", port_id, + di.driver_name); + continue; } - else - devconf = &dm->conf->default_devconf; - /* Create vnet interface */ vec_add2_aligned (dm->devices, xd, 1, CLIB_CACHE_LINE_BYTES); - xd->cpu_socket = (i8) rte_eth_dev_socket_id (port_id); + 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)); - if (p) + /* find driver datea for this PMD */ + if ((dr = dpdk_driver_find (di.driver_name, &xd->if_desc))) { - xd->name = devconf->name; + 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; + 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 + dpdk_log_warn ("[%u] unknown driver '%s'", port_id, di.driver_name); - /* Handle representor devices that share the same PCI ID */ - if (di.switch_info.domain_id != RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID) + if (devconf->name) { - if (di.switch_info.port_id != (uint16_t) -1) - xd->interface_name_suffix = - format (0, "%d", di.switch_info.port_id); + xd->name = devconf->name; } - /* Handle interface naming for devices with multiple ports sharing same - * PCI ID */ - else if (pci_dev && ((next_port_id = rte_eth_find_next (port_id + 1)) != - RTE_MAX_ETHPORTS)) + else { - struct rte_eth_dev_info next_di = { 0 }; - struct rte_pci_device *next_pci_dev; - rte_eth_dev_info_get (next_port_id, &next_di); - next_pci_dev = next_di.device ? RTE_DEV_TO_PCI (next_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) + struct rte_pci_device *pci_dev; + if (dr && dr->interface_name_prefix) { - xd->interface_name_suffix = format (0, "0"); - last_pci_addr.as_u32 = pci_addr.as_u32; - last_pci_addr_port = port_id; - } - else if (pci_addr.as_u32 == last_pci_addr.as_u32) - { - xd->interface_name_suffix = - format (0, "%u", port_id - 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; - if (di.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 (xd->conf.enable_tcp_udp_checksum) - { - if (di.rx_offload_capa & DEV_RX_OFFLOAD_UDP_CKSUM) - xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_UDP_CKSUM; - if (di.rx_offload_capa & DEV_RX_OFFLOAD_TCP_CKSUM) - xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_TCP_CKSUM; - if (di.tx_offload_capa & DEV_TX_OFFLOAD_IPV4_CKSUM) - xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_IPV4_CKSUM; - - if (xd->conf.enable_outer_checksum_offload) - { - if (di.tx_offload_capa & DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM) - xd->port_conf.txmode.offloads |= - DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM; - if (di.tx_offload_capa & DEV_TX_OFFLOAD_OUTER_UDP_CKSUM) - xd->port_conf.txmode.offloads |= - DEV_TX_OFFLOAD_OUTER_UDP_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 (xd->conf.enable_lro) - { - if (di.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 (xd->conf.no_multi_seg) + /* number of RX and TX queues */ + if (devconf->num_tx_queues > 0) { - 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->conf.n_tx_queues = clib_min (di.max_tx_queues, xd->conf.n_tx_queues); - if (devconf->num_tx_queues > 0 && - devconf->num_tx_queues < xd->conf.n_tx_queues) - xd->conf.n_tx_queues = devconf->num_tx_queues; - if (devconf->num_rx_queues > 1 && di.max_rx_queues >= devconf->num_rx_queues) { xd->conf.n_rx_queues = 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 + 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; + 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 &= - di.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); } + 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; + + if (q < xd->driver_frame_overhead && q > 0) + 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); - /* workaround for drivers not setting driver_name */ - if ((!di.driver_name) && (pci_dev)) - di.driver_name = pci_dev->driver->driver.name; - - ASSERT (di.driver_name); - - if (!xd->pmd) - { - -#define _(s, f) \ - else if (di.driver_name && !strcmp (di.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; - - switch (xd->pmd) - { - /* Drivers with valid speed_capa set */ - case VNET_DPDK_PMD_I40E: - xd->flags |= DPDK_DEVICE_FLAG_INT_UNMASKABLE; - /* fall through */ - 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 (&di); - 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 (xd->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 (xd->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 (&di); - 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 (&di); - break; - - /* SR-IOV VFs */ - case VNET_DPDK_PMD_I40EVF: - xd->flags |= DPDK_DEVICE_FLAG_INT_UNMASKABLE; - /* fall through */ - case VNET_DPDK_PMD_IGBVF: - case VNET_DPDK_PMD_IXGBEVF: - xd->port_type = VNET_DPDK_PORT_TYPE_ETH_VF; - if (xd->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 (xd->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 (xd->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; - if (xd->conf.no_tx_checksum_offload == 0) - { - xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_IPV4_CKSUM; - 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_DPAA2: - xd->port_type = VNET_DPDK_PORT_TYPE_ETH_10G; - break; - - /* Cisco VIC */ - case VNET_DPDK_PMD_ENIC: - { - xd->port_type = port_type_from_speed_capa (&di); - if (xd->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->conf.n_rx_desc = DPDK_NB_RX_DESC_VIRTIO; - xd->conf.n_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; - /* TCP csum offload not working although udp might work. Left - * disabled for now */ - if (0 && (xd->conf.no_tx_checksum_offload == 0)) - { - xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_IPV4_CKSUM; - 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_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: - { - xd->port_type = VNET_DPDK_PORT_TYPE_ETH_VF; - } - break; - - default: - xd->port_type = VNET_DPDK_PORT_TYPE_UNKNOWN; - } - } - - 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 (port_id, (void *) addr); - - xd->port_id = port_id; - xd->device_index = xd - dm->devices; - xd->per_interface_next_index = ~0; - - /* assign interface to input thread */ - int q; - - error = ethernet_register_interface ( - vnm, 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 > di.max_rx_pktlen) - { - /* - * This device does not support the platforms's max frame - * size. Use it's advertised mru instead. - */ - max_rx_frame = di.max_rx_pktlen; - mtu = di.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 (di.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) && - (di.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) && - (di.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 (port_id, &dev_mtu)) - { - mtu = dev_mtu; - max_rx_frame = mtu + sizeof (ethernet_header_t); - - if (dpdk_port_crc_strip_enabled (xd)) - { - max_rx_frame += 4; - } - } - } - - /*Set port rxmode config */ - xd->port_conf.rxmode.max_rx_pkt_len = max_rx_frame; + 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; - vnet_hw_if_set_input_node (vnm, xd->hw_if_index, dpdk_input_node.index); + dpdk_log_debug ("[%u] interface %s created", port_id, hi->name); + 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 j; @@ -749,89 +463,39 @@ dpdk_lib_init (dpdk_main_t * dm) vnm, xd->hw_if_index, q, VNET_HW_IF_RXQ_THREAD_ANY); } - vnet_hw_if_update_runtime_data (vnm, xd->hw_if_index); - - /*Get vnet hardware interface */ - hi = vnet_get_hw_interface (vnm, xd->hw_if_index); - - /*Override default max_packet_bytes and max_supported_bytes set in - * ethernet_register_interface() above*/ - if (hi) - { - 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_IF_CAP_MAC_FILTER; - ethernet_set_flags (vnm, xd->hw_if_index, - ETHERNET_INTERFACE_FLAG_DEFAULT_L3); - } - - if (xd->conf.no_tx_checksum_offload == 0) - if (xd->flags & DPDK_DEVICE_FLAG_TX_OFFLOAD && hi != NULL) - { - hi->caps |= VNET_HW_IF_CAP_TX_IP4_CKSUM | - VNET_HW_IF_CAP_TX_TCP_CKSUM | - VNET_HW_IF_CAP_TX_UDP_CKSUM; - if (xd->conf.enable_outer_checksum_offload) - { - hi->caps |= VNET_HW_IF_CAP_TX_IP4_OUTER_CKSUM | - VNET_HW_IF_CAP_TX_UDP_OUTER_CKSUM; - } - } - if (devconf->tso == DPDK_DEVICE_TSO_ON && hi != NULL) + if (devconf->tso == DPDK_DEVICE_TSO_ON) { /*tcp_udp checksum must be enabled*/ - if ((xd->conf.enable_tcp_udp_checksum) && - (hi->caps & VNET_HW_IF_CAP_TX_CKSUM)) - { - hi->caps |= VNET_HW_IF_CAP_TCP_GSO; - xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_TCP_TSO; - - if (xd->conf.enable_outer_checksum_offload && - (di.tx_offload_capa & DEV_TX_OFFLOAD_VXLAN_TNL_TSO)) - { - xd->port_conf.txmode.offloads |= - DEV_TX_OFFLOAD_VXLAN_TNL_TSO; - hi->caps |= VNET_HW_IF_CAP_VXLAN_TNL_GSO; - } - } + 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 & DEV_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 (devconf->rss_queues) { if (vnet_hw_interface_set_rss_queues (vnet_get_main (), hi, devconf->rss_queues)) - { - clib_warning ("%s: Failed to set rss queues", hi->name); - } + 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, port_id, + dpdk_log_err ("[%u] setup failed Errors:\n %U", port_id, format_dpdk_device_errors, xd); - - 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 (xd->conf.no_multi_seg) - mtu = mtu > ETHER_MAX_LEN ? ETHER_MAX_LEN : mtu; - - rte_eth_dev_set_mtu (xd->port_id, mtu); } + 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; } @@ -1184,7 +848,7 @@ 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, "workers %U", unformat_bitmap_list, &devconf->workers)) @@ -1260,7 +924,19 @@ dpdk_log_read_ready (clib_file_t * uf) 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); } @@ -1316,13 +992,13 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) dm->default_port_conf.enable_outer_checksum_offload = 1; } else if (unformat (input, "no-tx-checksum-offload")) - dm->default_port_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")) - dm->default_port_conf.no_multi_seg = 1; + dm->default_port_conf.disable_multi_seg = 1; else if (unformat (input, "enable-lro")) dm->default_port_conf.enable_lro = 1; else if (unformat (input, "max-simd-bitwidth %U",