X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2Fdevice%2Fformat.c;h=8ef46512c6fadd3d45255ed9558b103f447c8af5;hb=548d70de6;hp=d7685ebe6276fe27e45485fa6e31a03d5c4e4bac;hpb=93468adfc4c5a449532fbfecd575f17d9cae7099;p=vpp.git diff --git a/src/plugins/dpdk/device/format.c b/src/plugins/dpdk/device/format.c index d7685ebe627..8ef46512c6f 100644 --- a/src/plugins/dpdk/device/format.c +++ b/src/plugins/dpdk/device/format.c @@ -46,24 +46,22 @@ _ (rx_errors, q_errors) #define foreach_dpdk_rss_hf \ - _(ETH_RSS_IPV4, "ipv4") \ _(ETH_RSS_FRAG_IPV4, "ipv4-frag") \ _(ETH_RSS_NONFRAG_IPV4_TCP, "ipv4-tcp") \ _(ETH_RSS_NONFRAG_IPV4_UDP, "ipv4-udp") \ _(ETH_RSS_NONFRAG_IPV4_SCTP, "ipv4-sctp") \ _(ETH_RSS_NONFRAG_IPV4_OTHER, "ipv4-other") \ - _(ETH_RSS_IPV6, "ipv6") \ + _(ETH_RSS_IPV4, "ipv4") \ + _(ETH_RSS_IPV6_TCP_EX, "ipv6-tcp-ex") \ + _(ETH_RSS_IPV6_UDP_EX, "ipv6-udp-ex") \ _(ETH_RSS_FRAG_IPV6, "ipv6-frag") \ _(ETH_RSS_NONFRAG_IPV6_TCP, "ipv6-tcp") \ _(ETH_RSS_NONFRAG_IPV6_UDP, "ipv6-udp") \ _(ETH_RSS_NONFRAG_IPV6_SCTP, "ipv6-sctp") \ _(ETH_RSS_NONFRAG_IPV6_OTHER, "ipv6-other") \ - _(ETH_RSS_IPV6_TCP_EX, "ipv6-tcp-ex") \ - _(ETH_RSS_IPV6_UDP_EX, "ipv6-udp-ex") \ - _(ETH_RSS_L2_PAYLOAD, "l2-payload") \ _(ETH_RSS_IPV6_EX, "ipv6-ex") \ - _(ETH_RSS_IPV6_TCP_EX, "ipv6-tcp-ex") \ - _(ETH_RSS_IPV6_UDP_EX, "ipv6-udp-ex") \ + _(ETH_RSS_IPV6, "ipv6") \ + _(ETH_RSS_L2_PAYLOAD, "l2-payload") \ _(ETH_RSS_PORT, "port") \ _(ETH_RSS_VXLAN, "vxlan") \ _(ETH_RSS_GENEVE, "geneve") \ @@ -135,16 +133,6 @@ foreach_dpdk_pkt_rx_offload_flag \ foreach_dpdk_pkt_tx_offload_flag -#define foreach_dpdk_log_level \ - _ (EMERG, "emergency") \ - _ (ALERT, "alert") \ - _ (CRIT, "critical") \ - _ (ERR, "error") \ - _ (WARNING, "warning") \ - _ (NOTICE, "notice") \ - _ (INFO, "info") \ - _ (DEBUG, "debug") - u8 * format_dpdk_device_name (u8 * s, va_list * args) { @@ -152,16 +140,20 @@ format_dpdk_device_name (u8 * s, va_list * args) char *devname_format; char *device_name; u32 i = va_arg (*args, u32); + dpdk_device_t *xd = vec_elt_at_index (dm->devices, i); struct rte_eth_dev_info dev_info; struct rte_pci_device *pci_dev; u8 *ret; + if (xd->name) + return format (s, "%s", xd->name); + if (dm->conf->interface_name_format_decimal) devname_format = "%s%d/%d/%d"; else devname_format = "%s%x/%x/%x"; - switch (dm->devices[i].port_type) + switch (xd->port_type) { case VNET_DPDK_PORT_TYPE_ETH_1G: device_name = "GigabitEthernet"; @@ -203,9 +195,6 @@ format_dpdk_device_name (u8 * s, va_list * args) device_name = "HundredGigabitEthernet"; break; - case VNET_DPDK_PORT_TYPE_ETH_BOND: - return format (s, "BondEthernet%d", dm->devices[i].bond_instance_num); - case VNET_DPDK_PORT_TYPE_ETH_SWITCH: device_name = "EthernetSwitch"; break; @@ -215,8 +204,7 @@ format_dpdk_device_name (u8 * s, va_list * args) break; case VNET_DPDK_PORT_TYPE_AF_PACKET: - rte_eth_dev_info_get (i, &dev_info); - return format (s, "af_packet%d", dm->devices[i].af_packet_instance_num); + return format (s, "af_packet%d", xd->af_packet_instance_num); case VNET_DPDK_PORT_TYPE_VIRTIO_USER: device_name = "VirtioUser"; @@ -236,17 +224,17 @@ format_dpdk_device_name (u8 * s, va_list * args) break; } - rte_eth_dev_info_get (i, &dev_info); + rte_eth_dev_info_get (xd->port_id, &dev_info); pci_dev = dpdk_get_pci_device (&dev_info); - if (pci_dev && dm->devices[i].port_type != VNET_DPDK_PORT_TYPE_FAILSAFE) + if (pci_dev && xd->port_type != VNET_DPDK_PORT_TYPE_FAILSAFE) ret = format (s, devname_format, device_name, pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function); else - ret = format (s, "%s%d", device_name, dm->devices[i].port_id); + ret = format (s, "%s%d", device_name, xd->port_id); - if (dm->devices[i].interface_name_suffix) - return format (ret, "/%s", dm->devices[i].interface_name_suffix); + if (xd->interface_name_suffix) + return format (ret, "/%s", xd->interface_name_suffix); return ret; } @@ -290,6 +278,10 @@ format_dpdk_device_type (u8 * s, va_list * args) dev_type = "Intel X710/XL710 Family VF"; break; + case VNET_DPDK_PMD_ICE: + dev_type = "Intel E810 Family"; + break; + case VNET_DPDK_PMD_FM10K: dev_type = "Intel FM10000 Family Ethernet Switch"; break; @@ -334,10 +326,6 @@ format_dpdk_device_type (u8 * s, va_list * args) dev_type = "af_packet"; break; - case VNET_DPDK_PMD_BOND: - dev_type = "Ethernet Bonding"; - break; - case VNET_DPDK_PMD_DPAA2: dev_type = "NXP DPAA2 Mac"; break; @@ -374,6 +362,10 @@ format_dpdk_device_type (u8 * s, va_list * args) dev_type = "Microsoft Hyper-V Netvsc"; break; + case VNET_DPDK_PMD_BNXT: + dev_type = "Broadcom NetXtreme E/S-Series"; + break; + default: case VNET_DPDK_PMD_UNKNOWN: dev_type = "### UNKNOWN ###"; @@ -398,8 +390,8 @@ format_dpdk_link_status (u8 * s, va_list * args) s = format (s, "%s duplex ", (l->link_duplex == ETH_LINK_FULL_DUPLEX) ? "full" : "half"); - s = format (s, "speed %u mtu %d %s\n", l->link_speed, - hi->max_packet_bytes, promisc ? " promisc" : ""); + s = format (s, "mtu %d %s\n", hi->max_packet_bytes, promisc ? + " promisc" : ""); } else s = format (s, "\n"); @@ -568,10 +560,13 @@ format_dpdk_device (u8 * s, va_list * args) rte_eth_dev_info_get (xd->port_id, &di); s = format (s, "%U\n%Ucarrier %U", - format_dpdk_device_type, xd->port_id, + format_dpdk_device_type, dev_instance, format_white_space, indent + 2, format_dpdk_link_status, xd); s = format (s, "%Uflags: %U\n", format_white_space, indent + 2, format_dpdk_device_flags, xd); + if (di.device->devargs && di.device->devargs->args) + s = format (s, "%UDevargs: %s\n", + format_white_space, indent + 2, di.device->devargs->args); s = format (s, "%Urx: queues %d (max %d), desc %d " "(min %d max %d align %d)\n", format_white_space, indent + 2, xd->rx_q_used, di.max_rx_queues, @@ -591,6 +586,7 @@ format_dpdk_device (u8 * s, va_list * args) int retval; rss_conf.rss_key = 0; + rss_conf.rss_hf = 0; retval = rte_eth_dev_rss_hash_conf_get (xd->port_id, &rss_conf); if (retval < 0) clib_warning ("rte_eth_dev_rss_hash_conf_get returned %d", retval); @@ -613,8 +609,11 @@ format_dpdk_device (u8 * s, va_list * args) vec_free (s2); } - s = format (s, "%Umodule: %U\n", format_white_space, indent + 2, - format_dpdk_device_module_info, xd); + if (1 < verbose) + { + s = format (s, "%Umodule: %U\n", format_white_space, indent + 2, + format_dpdk_device_module_info, xd); + } s = format (s, "%Umax rx packet len: %d\n", format_white_space, indent + 2, di.max_rx_pktlen); @@ -657,11 +656,11 @@ format_dpdk_device (u8 * s, va_list * args) /* $$$ MIB counters */ { #define _(N, V) \ - if ((xd->stats.V - xd->last_cleared_stats.V) != 0) { \ + if (xd->stats.V != 0) { \ s = format (s, "\n%U%-40U%16Lu", \ format_white_space, indent + 2, \ format_c_identifier, #N, \ - xd->stats.V - xd->last_cleared_stats.V); \ + xd->stats.V); \ } \ foreach_dpdk_counter @@ -670,35 +669,32 @@ format_dpdk_device (u8 * s, va_list * args) u8 *xs = 0; u32 i = 0; - struct rte_eth_xstat *xstat, *last_xstat; + struct rte_eth_xstat *xstat; struct rte_eth_xstat_name *xstat_names = 0; - int len = rte_eth_xstats_get_names (xd->port_id, NULL, 0); + int len = vec_len (xd->xstats); vec_validate (xstat_names, len - 1); - rte_eth_xstats_get_names (xd->port_id, xstat_names, len); - - ASSERT (vec_len (xd->xstats) == vec_len (xd->last_cleared_xstats)); + int ret = rte_eth_xstats_get_names (xd->port_id, xstat_names, len); - /* *INDENT-OFF* */ - vec_foreach_index(i, xd->xstats) + if (ret >= 0 && ret <= len) { - u64 delta = 0; - xstat = vec_elt_at_index(xd->xstats, i); - last_xstat = vec_elt_at_index(xd->last_cleared_xstats, i); - - delta = xstat->value - last_xstat->value; - if (verbose == 2 || (verbose && delta)) + /* *INDENT-OFF* */ + vec_foreach_index(i, xd->xstats) { - /* format_c_identifier doesn't like c strings inside vector */ - u8 * name = format(0,"%s", xstat_names[i].name); - xs = format(xs, "\n%U%-38U%16Lu", - format_white_space, indent + 4, - format_c_identifier, name, delta); - vec_free(name); + xstat = vec_elt_at_index(xd->xstats, i); + if (verbose == 2 || (verbose && xstat->value)) + { + /* format_c_identifier doesn't like c strings inside vector */ + u8 * name = format(0,"%s", xstat_names[i].name); + xs = format(xs, "\n%U%-38U%16Lu", + format_white_space, indent + 4, + format_c_identifier, name, xstat->value); + vec_free(name); + } } - } - /* *INDENT-ON* */ + /* *INDENT-ON* */ - vec_free (xstat_names); + vec_free (xstat_names); + } if (xs) { @@ -917,39 +913,6 @@ unformat_rss_fn (unformat_input_t * input, uword * rss_fn) return 0; } -uword -unformat_dpdk_log_level (unformat_input_t * input, va_list * args) -{ - u32 *r = va_arg (*args, u32 *); - - if (0); -#define _(v,s) else if (unformat (input, s)) *r = RTE_LOG_##v; - foreach_dpdk_log_level -#undef _ - else - return 0; - return 1; -} - -clib_error_t * -unformat_hqos (unformat_input_t * input, dpdk_device_config_hqos_t * hqos) -{ - clib_error_t *error = 0; - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "hqos-thread %u", &hqos->hqos_thread)) - hqos->hqos_thread_valid = 1; - else - { - error = clib_error_return (0, "unknown input `%U'", - format_unformat_error, input); - break; - } - } - - return error; -} /* * fd.io coding-style-patch-verification: ON