X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2Fdevice%2Fformat.c;h=71f0d89454b3ac9949c600d125f050595378f7ec;hb=03f2a015999ed9ba34041afb408a22ea5fe601ff;hp=292c083fca5ffef8391cd8622abfa589ae70807e;hpb=c3731ac89ddefe0b212511aeeb6bc116a1220816;p=vpp.git diff --git a/src/plugins/dpdk/device/format.c b/src/plugins/dpdk/device/format.c index 292c083fca5..71f0d89454b 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,42 +44,23 @@ _ (tx_bytes_ok, q_obytes) \ _ (rx_errors, q_errors) -#define foreach_dpdk_rss_hf \ - _(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_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_EX, "ipv6-ex") \ - _(ETH_RSS_IPV6, "ipv6") \ - _(ETH_RSS_L2_PAYLOAD, "l2-payload") \ - _(ETH_RSS_PORT, "port") \ - _(ETH_RSS_VXLAN, "vxlan") \ - _(ETH_RSS_GENEVE, "geneve") \ - _(ETH_RSS_NVGRE, "nvgre") - -#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") \ - _ (PKT_RX_FDIR, "RX packet with FDIR infos") \ - _ (PKT_RX_L4_CKSUM_BAD, "L4 cksum of RX pkt. is not OK") \ - _ (PKT_RX_IP_CKSUM_BAD, "IP cksum of RX pkt. is not OK") \ - _ (PKT_RX_EIP_CKSUM_BAD, "External IP header checksum error") \ - _ (PKT_RX_VLAN_STRIPPED, "RX packet VLAN tag stripped") \ - _ (PKT_RX_IP_CKSUM_GOOD, "IP cksum of RX pkt. is valid") \ - _ (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") +#if RTE_VERSION < RTE_VERSION_NUM(21, 5, 0, 0) +#define PKT_RX_OUTER_IP_CKSUM_BAD PKT_RX_EIP_CKSUM_BAD +#endif + +#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") \ + _ (PKT_RX_FDIR, "RX packet with FDIR infos") \ + _ (PKT_RX_L4_CKSUM_BAD, "L4 cksum of RX pkt. is not OK") \ + _ (PKT_RX_IP_CKSUM_BAD, "IP cksum of RX pkt. is not OK") \ + _ (PKT_RX_OUTER_IP_CKSUM_BAD, "External IP header checksum error") \ + _ (PKT_RX_VLAN_STRIPPED, "RX packet VLAN tag stripped") \ + _ (PKT_RX_IP_CKSUM_GOOD, "IP cksum of RX pkt. is valid") \ + _ (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") #define foreach_dpdk_pkt_type \ _ (L2, ETHER, "Ethernet packet") \ @@ -122,17 +102,23 @@ _ (INNER_L4, ICMP, "Inner ICMP packet") \ _ (INNER_L4, NONFRAG, "Inner non-fragmented IP packet") -#define foreach_dpdk_pkt_tx_offload_flag \ - _ (PKT_TX_VLAN_PKT, "TX packet is a 802.1q VLAN packet") \ - _ (PKT_TX_IP_CKSUM, "IP cksum of TX pkt. computed by NIC") \ - _ (PKT_TX_TCP_CKSUM, "TCP cksum of TX pkt. computed by NIC") \ - _ (PKT_TX_SCTP_CKSUM, "SCTP cksum of TX pkt. computed by NIC") \ +#define foreach_dpdk_pkt_tx_offload_flag \ + _ (PKT_TX_VLAN_PKT, "TX packet is a 802.1q VLAN packet") \ + _ (PKT_TX_TUNNEL_VXLAN, "TX packet is a VXLAN packet") \ + _ (PKT_TX_IP_CKSUM, "IP cksum of TX pkt. computed by NIC") \ + _ (PKT_TX_TCP_CKSUM, "TCP cksum of TX pkt. computed by NIC") \ + _ (PKT_TX_SCTP_CKSUM, "SCTP cksum of TX pkt. computed by NIC") \ + _ (PKT_TX_OUTER_IP_CKSUM, "Outer IP cksum of Tx pkt. computed by NIC") \ + _ (PKT_TX_TCP_SEG, "TSO of TX pkt. done by NIC") \ _ (PKT_TX_IEEE1588_TMST, "TX IEEE1588 packet to timestamp") #define foreach_dpdk_pkt_offload_flag \ foreach_dpdk_pkt_rx_offload_flag \ foreach_dpdk_pkt_tx_offload_flag +#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) { @@ -282,6 +268,10 @@ format_dpdk_device_type (u8 * s, va_list * args) 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; @@ -399,7 +389,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); \ @@ -544,6 +534,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) { @@ -554,6 +558,7 @@ 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); @@ -564,6 +569,9 @@ format_dpdk_device (u8 * s, va_list * args) 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, @@ -606,6 +614,13 @@ format_dpdk_device (u8 * s, va_list * args) vec_free (s2); } + 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, @@ -642,12 +657,36 @@ 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 */ @@ -680,12 +719,10 @@ format_dpdk_device (u8 * s, va_list * args) 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", + xs = format(xs, "\n%U%-38s%16Lu", format_white_space, indent + 4, - format_c_identifier, name, xstat->value); - vec_free(name); + xstat_names[i].name, + xstat->value); } } /* *INDENT-ON* */ @@ -724,9 +761,8 @@ format_dpdk_tx_trace (u8 * s, va_list * va) s = format (s, "%U tx queue %d", format_vnet_sw_interface_name, vnm, sw, t->queue_index); - s = format (s, "\n%Ubuffer 0x%x: %U", - format_white_space, indent, - t->buffer_index, format_vnet_buffer, &t->buffer); + s = format (s, "\n%Ubuffer 0x%x: %U", format_white_space, indent, + t->buffer_index, format_vnet_buffer_no_chain, &t->buffer); s = format (s, "\n%U%U", format_white_space, indent, @@ -755,9 +791,8 @@ format_dpdk_rx_trace (u8 * s, va_list * va) s = format (s, "%U rx queue %d", format_vnet_sw_interface_name, vnm, sw, t->queue_index); - s = format (s, "\n%Ubuffer 0x%x: %U", - format_white_space, indent, - t->buffer_index, format_vnet_buffer, &t->buffer); + s = format (s, "\n%Ubuffer 0x%x: %U", format_white_space, indent, + t->buffer_index, format_vnet_buffer_no_chain, &t->buffer); s = format (s, "\n%U%U", format_white_space, indent, @@ -810,6 +845,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; @@ -824,10 +861,37 @@ 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; } +u8 * +format_dpdk_rte_mbuf_tso (u8 *s, va_list *va) +{ + struct rte_mbuf *mb = va_arg (*va, struct rte_mbuf *); + if (mb->ol_flags & PKT_TX_TCP_SEG) + { + s = format (s, "l4_len %u tso_segsz %u", mb->l4_len, mb->tso_segsz); + } + return s; +} + u8 * format_dpdk_rte_mbuf_vlan (u8 * s, va_list * va) { @@ -856,17 +920,19 @@ format_dpdk_rte_mbuf (u8 * s, va_list * va) ethernet_header_t *eth_hdr = va_arg (*va, ethernet_header_t *); u32 indent = format_get_indent (s) + 2; - s = format (s, "PKT MBUF: port %d, nb_segs %d, pkt_len %d" - "\n%Ubuf_len %d, data_len %d, ol_flags 0x%lx, data_off %d, phys_addr 0x%x" - "\n%Upacket_type 0x%x l2_len %u l3_len %u outer_l2_len %u outer_l3_len %u" - "\n%Urss 0x%x fdir.hi 0x%x fdir.lo 0x%x", - 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->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); + s = format ( + s, + "PKT MBUF: port %d, nb_segs %d, pkt_len %d" + "\n%Ubuf_len %d, data_len %d, ol_flags 0x%lx, data_off %d, phys_addr 0x%x" + "\n%Upacket_type 0x%x l2_len %u l3_len %u outer_l2_len %u outer_l3_len %u " + "%U" + "\n%Urss 0x%x fdir.hi 0x%x fdir.lo 0x%x", + 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_iova, + format_white_space, indent, mb->packet_type, mb->l2_len, mb->l3_len, + mb->outer_l2_len, mb->outer_l3_len, format_dpdk_rte_mbuf_tso, mb, + format_white_space, indent, mb->hash.rss, mb->hash.fdir.hi, + mb->hash.fdir.lo); if (mb->ol_flags) s = format (s, "\n%U%U", format_white_space, indent, @@ -895,7 +961,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; @@ -910,25 +976,6 @@ unformat_rss_fn (unformat_input_t * input, uword * rss_fn) return 0; } -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