X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2Fdevice%2Fformat.c;h=1baf314acc98270d089844c444e7ba2c1c712de5;hb=b2c31b685fd2cf28436ca32bc93e23eb24c74878;hp=28e8f0a445cfab64dd1a3d6da41cbf7cad941a29;hpb=3901a038edf47a35665c57961e6620efdd01dbbd;p=vpp.git diff --git a/src/plugins/dpdk/device/format.c b/src/plugins/dpdk/device/format.c index 28e8f0a445c..1baf314acc9 100644 --- a/src/plugins/dpdk/device/format.c +++ b/src/plugins/dpdk/device/format.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #define __USE_GNU @@ -45,66 +44,6 @@ _ (tx_bytes_ok, q_obytes) \ _ (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_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_PORT, "port") \ - _(ETH_RSS_VXLAN, "vxlan") \ - _(ETH_RSS_GENEVE, "geneve") \ - _(ETH_RSS_NVGRE, "nvgre") - - -#define foreach_dpdk_rx_offload_caps \ - _(DEV_RX_OFFLOAD_VLAN_STRIP, "vlan-strip") \ - _(DEV_RX_OFFLOAD_IPV4_CKSUM, "ipv4-cksum") \ - _(DEV_RX_OFFLOAD_UDP_CKSUM , "udp-cksum") \ - _(DEV_RX_OFFLOAD_TCP_CKSUM , "tcp-cksum") \ - _(DEV_RX_OFFLOAD_TCP_LRO , "rcp-lro") \ - _(DEV_RX_OFFLOAD_QINQ_STRIP, "qinq-strip") \ - _(DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM, "outer-ipv4-cksum") \ - _(DEV_RX_OFFLOAD_MACSEC_STRIP, "macsec-strip") \ - _(DEV_RX_OFFLOAD_HEADER_SPLIT, "header-split") \ - _(DEV_RX_OFFLOAD_VLAN_FILTER, "vlan-filter") \ - _(DEV_RX_OFFLOAD_VLAN_EXTEND, "vlan-extend") \ - _(DEV_RX_OFFLOAD_JUMBO_FRAME, "jumbo-frame") \ - _(DEV_RX_OFFLOAD_CRC_STRIP, "crc-strip") \ - _(DEV_RX_OFFLOAD_SCATTER, "scatter") \ - _(DEV_RX_OFFLOAD_TIMESTAMP, "timestamp") \ - _(DEV_RX_OFFLOAD_SECURITY, "security") - -#define foreach_dpdk_tx_offload_caps \ - _(DEV_TX_OFFLOAD_VLAN_INSERT, "vlan-insert") \ - _(DEV_TX_OFFLOAD_IPV4_CKSUM, "ipv4-cksum") \ - _(DEV_TX_OFFLOAD_UDP_CKSUM , "udp-cksum") \ - _(DEV_TX_OFFLOAD_TCP_CKSUM , "tcp-cksum") \ - _(DEV_TX_OFFLOAD_SCTP_CKSUM , "sctp-cksum") \ - _(DEV_TX_OFFLOAD_TCP_TSO , "tcp-tso") \ - _(DEV_TX_OFFLOAD_UDP_TSO , "udp-tso") \ - _(DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM, "outer-ipv4-cksum") \ - _(DEV_TX_OFFLOAD_QINQ_INSERT, "qinq-insert") \ - _(DEV_TX_OFFLOAD_VXLAN_TNL_TSO, "vxlan-tnl-tso") \ - _(DEV_TX_OFFLOAD_GRE_TNL_TSO, "gre-tnl-tso") \ - _(DEV_TX_OFFLOAD_IPIP_TNL_TSO, "ipip-tnl-tso") \ - _(DEV_TX_OFFLOAD_GENEVE_TNL_TSO, "geneve-tnl-tso") \ - _(DEV_TX_OFFLOAD_MACSEC_INSERT, "macsec-insert") \ - _(DEV_TX_OFFLOAD_MT_LOCKFREE, "mt-lockfree") \ - #define foreach_dpdk_pkt_rx_offload_flag \ _ (PKT_RX_VLAN, "RX packet is a 802.1q VLAN packet") \ _ (PKT_RX_RSS_HASH, "RX packet with RSS hash result") \ @@ -117,8 +56,7 @@ _ (PKT_RX_L4_CKSUM_GOOD, "L4 cksum of RX pkt. is valid") \ _ (PKT_RX_IEEE1588_PTP, "RX IEEE1588 L2 Ethernet PT Packet") \ _ (PKT_RX_IEEE1588_TMST, "RX IEEE1588 L2/L4 timestamped packet") \ - _ (PKT_RX_QINQ_STRIPPED, "RX packet QinQ tags stripped") \ - _ (PKT_RX_TIMESTAMP, "Timestamp field is valid") + _ (PKT_RX_QINQ_STRIPPED, "RX packet QinQ tags stripped") #define foreach_dpdk_pkt_type \ _ (L2, ETHER, "Ethernet packet") \ @@ -171,15 +109,8 @@ 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") +#define foreach_dpdk_pkt_dyn_rx_offload_flag \ + _ (RX_TIMESTAMP, 0, "Timestamp field is valid") u8 * format_dpdk_device_name (u8 * s, va_list * args) @@ -188,16 +119,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"; @@ -239,9 +174,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; @@ -251,8 +183,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"; @@ -272,17 +203,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) + 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; } @@ -326,6 +257,14 @@ 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_IAVF: + dev_type = "Intel iAVF"; + break; + case VNET_DPDK_PMD_FM10K: dev_type = "Intel FM10000 Family Ethernet Switch"; break; @@ -370,10 +309,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; @@ -406,6 +341,14 @@ format_dpdk_device_type (u8 * s, va_list * args) dev_type = "Cavium QLogic FastLinQ QL4xxxx"; break; + case VNET_DPDK_PMD_NETVSC: + 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 ###"; @@ -430,8 +373,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"); @@ -439,7 +382,7 @@ format_dpdk_link_status (u8 * s, va_list * args) return s; } -#define _(v, str) \ +#define _(n, v, str) \ if (bitmap & v) { \ if (format_get_indent (s) > 72) \ s = format(s,"\n%U", format_white_space, indent); \ @@ -458,16 +401,59 @@ format_dpdk_rss_hf_name (u8 * s, va_list * args) foreach_dpdk_rss_hf return s; } +#undef _ + +/* Convert to all lower case e.g "VLAN_STRIP" -> "vlan-strip" + Works for both vector names and null terminated c strings. */ +static u8 * +format_offload (u8 * s, va_list * va) +{ + u8 *id = va_arg (*va, u8 *); + uword i, l; + + l = ~0; + if (clib_mem_is_vec (id)) + l = vec_len (id); + + if (id) + for (i = 0; id[i] != 0 && i < l; i++) + { + u8 c = id[i]; + + if (c == '_') + c = '-'; + else + c = tolower (c); + vec_add1 (s, c); + } + + return s; +} + +#define _(v, func) \ +if (bitmap & v) { \ + if (format_get_indent (s) > 72) \ + s = format(s,"\n%U", format_white_space, indent); \ + s = format(s, "%U ", format_offload, func (v)); \ +} + u8 * format_dpdk_rx_offload_caps (u8 * s, va_list * args) { u64 bitmap = va_arg (*args, u32); u32 indent = format_get_indent (s); + uword i; if (!bitmap) return format (s, "none"); - foreach_dpdk_rx_offload_caps return s; + for (i = 0; i < 64; i++) + { + u64 mask = (u64) 1 << i; + + _(mask, rte_eth_dev_rx_offload_name); + } + return s; } u8 * @@ -475,10 +461,18 @@ format_dpdk_tx_offload_caps (u8 * s, va_list * args) { u64 bitmap = va_arg (*args, u32); u32 indent = format_get_indent (s); + uword i; + if (!bitmap) return format (s, "none"); - foreach_dpdk_tx_offload_caps return s; + for (i = 0; i < 64; i++) + { + u64 mask = (u64) 1 << i; + + _(mask, rte_eth_dev_tx_offload_name); + } + return s; } #undef _ @@ -533,6 +527,20 @@ ptr2sname (void *p) return info.dli_sname; } +static u8 * +format_switch_info (u8 * s, va_list * args) +{ + struct rte_eth_switch_info *si = + va_arg (*args, struct rte_eth_switch_info *); + + if (si->name) + s = format (s, "name %s ", si->name); + + s = format (s, "domain id %d port id %d", si->domain_id, si->port_id); + + return s; +} + u8 * format_dpdk_device (u8 * s, va_list * args) { @@ -543,16 +551,20 @@ format_dpdk_device (u8 * s, va_list * args) u32 indent = format_get_indent (s); f64 now = vlib_time_now (dm->vlib_main); struct rte_eth_dev_info di; + struct rte_eth_burst_mode mode; dpdk_update_counters (xd, now); dpdk_update_link_state (xd, now); 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, @@ -572,6 +584,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); @@ -594,8 +607,18 @@ 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 (di.switch_info.domain_id != RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID) + { + s = + format (s, "%Uswitch info: %U\n", format_white_space, indent + 2, + format_switch_info, &di.switch_info); + } + + 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); @@ -627,22 +650,46 @@ format_dpdk_device (u8 * s, va_list * args) format_dpdk_rss_hf_name, di.flow_type_rss_offloads, format_white_space, indent + 2, format_dpdk_rss_hf_name, rss_conf.rss_hf); - s = format (s, "%Utx burst function: %s\n", - format_white_space, indent + 2, - ptr2sname (rte_eth_devices[xd->port_id].tx_pkt_burst)); - s = format (s, "%Urx burst function: %s\n", - format_white_space, indent + 2, - ptr2sname (rte_eth_devices[xd->port_id].rx_pkt_burst)); + + if (rte_eth_tx_burst_mode_get (xd->port_id, 0, &mode) == 0) + { + s = format (s, "%Utx burst mode: %s%s\n", + format_white_space, indent + 2, + mode.info, + mode.flags & RTE_ETH_BURST_FLAG_PER_QUEUE ? + " (per queue)" : ""); + } + else + { + s = format (s, "%Utx burst function: %s\n", + format_white_space, indent + 2, + ptr2sname (rte_eth_devices[xd->port_id].tx_pkt_burst)); + } + + if (rte_eth_rx_burst_mode_get (xd->port_id, 0, &mode) == 0) + { + s = format (s, "%Urx burst mode: %s%s\n", + format_white_space, indent + 2, + mode.info, + mode.flags & RTE_ETH_BURST_FLAG_PER_QUEUE ? + " (per queue)" : ""); + } + else + { + s = format (s, "%Urx burst function: %s\n", + format_white_space, indent + 2, + ptr2sname (rte_eth_devices[xd->port_id].rx_pkt_burst)); + } } /* $$$ 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 @@ -651,35 +698,30 @@ 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)) + { + xs = format(xs, "\n%U%-38s%16Lu", + format_white_space, indent + 4, + xstat_names[i].name, + xstat->value); + } } - } - /* *INDENT-ON* */ + /* *INDENT-ON* */ - vec_free (xstat_names); + vec_free (xstat_names); + } if (xs) { @@ -798,6 +840,8 @@ format_dpdk_pkt_offload_flags (u8 * s, va_list * va) { u64 *ol_flags = va_arg (*va, u64 *); u32 indent = format_get_indent (s) + 2; + u64 rx_dynflag; + int rx_dynflag_offset; if (!*ol_flags) return s; @@ -812,6 +856,22 @@ format_dpdk_pkt_offload_flags (u8 * s, va_list * va) } foreach_dpdk_pkt_offload_flag +#undef _ +#define _(F, P, S) \ + { \ + rx_dynflag_offset = rte_mbuf_dynflag_lookup(RTE_MBUF_DYNFLAG_##F##_NAME, \ + P); \ + if (rx_dynflag_offset >= 0) \ + { \ + rx_dynflag = (u64) 1 << rx_dynflag_offset; \ + if (*ol_flags & rx_dynflag) \ + { \ + s = format (s, "\n%U%s %s", format_white_space, indent, \ + #F, S); \ + } \ + } \ + } + foreach_dpdk_pkt_dyn_rx_offload_flag #undef _ return s; } @@ -851,7 +911,7 @@ format_dpdk_rte_mbuf (u8 * s, va_list * va) mb->port, mb->nb_segs, mb->pkt_len, format_white_space, indent, mb->buf_len, mb->data_len, mb->ol_flags, mb->data_off, - mb->buf_physaddr, format_white_space, indent, mb->packet_type, + mb->buf_iova, format_white_space, indent, mb->packet_type, mb->l2_len, mb->l3_len, mb->outer_l2_len, mb->outer_l3_len, format_white_space, indent, mb->hash.rss, mb->hash.fdir.hi, mb->hash.fdir.lo); @@ -883,7 +943,7 @@ unformat_rss_fn (unformat_input_t * input, uword * rss_fn) if (0) ; #undef _ -#define _(f, s) \ +#define _(n, f, s) \ else if (unformat (input, s)) \ *rss_fn |= f; @@ -898,39 +958,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