X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2Fdevice%2Finit.c;h=461bae0ba628091e9b3c2f0b78ba58b38a68ddb7;hb=d723161;hp=b5a8e3bcd4bcb1667b36309434c8011f01fa6619;hpb=a059a000f81a7251ffed2821f69dd96cfd94c8c7;p=vpp.git diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c index b5a8e3bcd4b..461bae0ba62 100644 --- a/src/plugins/dpdk/device/init.c +++ b/src/plugins/dpdk/device/init.c @@ -227,7 +227,12 @@ dpdk_lib_init (dpdk_main_t * dm) vec_validate_aligned (dm->devices_by_hqos_cpu, tm->n_vlib_mains - 1, CLIB_CACHE_LINE_BYTES); +#if RTE_VERSION < RTE_VERSION_NUM(18, 5, 0, 0) nports = rte_eth_dev_count (); +#else + nports = rte_eth_dev_count_avail (); +#endif + if (nports < 1) { dpdk_log_notice ("DPDK drivers found no ports..."); @@ -260,19 +265,36 @@ dpdk_lib_init (dpdk_main_t * dm) u8 addr[6]; u8 vlan_strip = 0; struct rte_eth_dev_info dev_info; + struct rte_pci_device *pci_dev; struct rte_eth_link l; dpdk_device_config_t *devconf = 0; vlib_pci_addr_t pci_addr; uword *p = 0; + if (!rte_eth_dev_is_valid_port(i)) + continue; + rte_eth_link_get_nowait (i, &l); rte_eth_dev_info_get (i, &dev_info); - if (dev_info.pci_dev) /* bonded interface has no pci info */ + +#if RTE_VERSION < RTE_VERSION_NUM(18, 5, 0, 0) + pci_dev = dev_info.pci_dev; +#else + if (dev_info.device == 0) + { + clib_warning ("DPDK bug: missing device info. Skipping %s device", + dev_info.driver_name); + continue; + } + pci_dev = RTE_DEV_TO_PCI (dev_info.device); +#endif + + if (pci_dev) /* bonded interface has no pci info */ { - pci_addr.domain = dev_info.pci_dev->addr.domain; - pci_addr.bus = dev_info.pci_dev->addr.bus; - pci_addr.slot = dev_info.pci_dev->addr.devid; - pci_addr.function = dev_info.pci_dev->addr.function; + 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); @@ -290,12 +312,19 @@ dpdk_lib_init (dpdk_main_t * dm) xd->cpu_socket = (i8) rte_eth_dev_socket_id (i); /* Handle interface naming for devices with multiple ports sharing same PCI ID */ - if (dev_info.pci_dev) + if (pci_dev) { struct rte_eth_dev_info di = { 0 }; + struct rte_pci_device *next_pci_dev; rte_eth_dev_info_get (i + 1, &di); - if (di.pci_dev && pci_addr.as_u32 != last_pci_addr.as_u32 && - memcmp (&dev_info.pci_dev->addr, &di.pci_dev->addr, +#if RTE_VERSION < RTE_VERSION_NUM(18, 5, 0, 0) + next_pci_dev = di.pci_dev; +#else + next_pci_dev = di.device ? RTE_DEV_TO_PCI (di.device) : 0; +#endif + if (pci_dev && 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"); @@ -358,8 +387,8 @@ dpdk_lib_init (dpdk_main_t * dm) xd->flags |= DPDK_DEVICE_FLAG_PMD; /* workaround for drivers not setting driver_name */ - if ((!dev_info.driver_name) && (dev_info.pci_dev)) - dev_info.driver_name = dev_info.pci_dev->driver->driver.name; + if ((!dev_info.driver_name) && (pci_dev)) + dev_info.driver_name = pci_dev->driver->driver.name; ASSERT (dev_info.driver_name); @@ -481,6 +510,11 @@ dpdk_lib_init (dpdk_main_t * dm) 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; + default: xd->port_type = VNET_DPDK_PORT_TYPE_UNKNOWN; } @@ -610,6 +644,26 @@ dpdk_lib_init (dpdk_main_t * dm) } } } + + 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 (xd->port_conf.rxmode.hw_strip_crc) + { + max_rx_frame += 4; + } + } + } + /*Set port rxmode config */ xd->port_conf.rxmode.max_rx_pkt_len = max_rx_frame; @@ -693,8 +747,8 @@ dpdk_lib_init (dpdk_main_t * dm) } if (hi) - 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); + hi->max_packet_bytes = xd->port_conf.rxmode.max_rx_pkt_len + - sizeof (ethernet_header_t); else clib_warning ("hi NULL"); @@ -1533,7 +1587,11 @@ dpdk_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) * 2. Set up info and register slave link state change callback handling. * 3. Set up info for bond interface related CLI support. */ +#if RTE_VERSION < RTE_VERSION_NUM(18, 5, 0, 0) int nports = rte_eth_dev_count (); +#else + int nports = rte_eth_dev_count_avail (); +#endif if (nports > 0) { /* *INDENT-OFF* */ @@ -1582,9 +1640,6 @@ dpdk_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) /* Init l3 packet size allowed on bonded interface */ bhi->max_packet_bytes = ETHERNET_MAX_PACKET_BYTES; - 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]; @@ -1623,11 +1678,9 @@ dpdk_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) clib_memcpy (shi->hw_address, addr, 6); clib_memcpy (sei->address, addr, 6); /* 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]; + if (bhi->max_packet_bytes > shi->max_packet_bytes) + bhi->max_packet_bytes = bhi->max_packet_bytes; + /* Set max packet size allowed as the lowest of slave */ if (bhi->max_packet_bytes > shi->max_packet_bytes) bhi->max_packet_bytes = shi->max_packet_bytes; @@ -1691,6 +1744,8 @@ dpdk_init (vlib_main_t * vm) "Data in cache line 0 is bigger than cache line size"); STATIC_ASSERT (offsetof (frame_queue_trace_t, cacheline0) == 0, "Cache line marker must be 1st element in frame_queue_trace_t"); + STATIC_ASSERT (RTE_CACHE_LINE_SIZE == 1 << CLIB_LOG2_CACHE_LINE_BYTES, + "DPDK RTE CACHE LINE SIZE does not match with 1<vlib_main = vm; dm->vnet_main = vnet_get_main ();