Hi Raslan,
> -----Original Message-----
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Raslan Darawsheh
> Sent: Monday, September 24, 2018 1:49 PM
> To: Wu, Jingjing <jingjing...@intel.com>
> Cc: Thomas Monjalon <tho...@monjalon.net>; dev@dpdk.org; Shahaf Shuler
> <shah...@mellanox.com>; Raslan Darawsheh <rasl...@mellanox.com>;
> Xueming(Steven) Li <xuemi...@mellanox.com>; Ori Katz <o...@mellanox.com>;
> jerin.ja...@caviumnetworks.com; david.march...@6wind.com
> Subject: [dpdk-dev] [PATCH v2 1/3] app/testpmd: move dumping packets to a
> separate function
>
> verbosity for the received/sent packets is needed in all of the forwarding
> engines so moving it to be in a separate function
>
> Signed-off-by: Raslan Darawsheh <rasl...@mellanox.com>
> ---
> app/test-pmd/Makefile | 1 +
The app/test-pmd/meson.build should be updated for the util.c file.
> app/test-pmd/rxonly.c | 134 ++--------------------------------------------
> app/test-pmd/util.c | 144
> ++++++++++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 148 insertions(+), 131 deletions(-) create mode 100644
> app/test-pmd/util.c
>
<snip>
> diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c new file mode 100644
> index 0000000..97c8349
> --- /dev/null
> +++ b/app/test-pmd/util.c
> @@ -0,0 +1,144 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2010-2018 Mellanox technology.
> + */
> +
> +#include <stdio.h>
> +
> +#include <rte_net.h>
> +#include <rte_mbuf.h>
> +#include <rte_ether.h>
> +#include <rte_ethdev.h>
> +#include <rte_flow.h>
> +
> +#include "testpmd.h"
> +
> +static inline void
> +print_ether_addr(const char *what, struct ether_addr *eth_addr) {
> + char buf[ETHER_ADDR_FMT_SIZE];
> + ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
> + printf("%s%s", what, buf);
> +}
> +
> +static inline void
> +dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[],
> + uint16_t nb_pkts, int is_rx)
> +{
> + struct rte_mbuf *mb;
> + struct ether_hdr *eth_hdr;
> + uint16_t eth_type;
> + uint64_t ol_flags;
> + uint16_t i, packet_type;
> + uint16_t is_encapsulation;
> + char buf[256];
> + struct rte_net_hdr_lens hdr_lens;
> + uint32_t sw_packet_type;
> +
> + if (!nb_pkts)
> + return;
> + printf("port %u/queue %u: %s %u packets\n",
> + port_id, queue,
> + is_rx ? "received" : "sent",
> + (unsigned int) nb_pkts);
> + for (i = 0; i < nb_pkts; i++) {
> + mb = pkts[i];
> + eth_hdr = rte_pktmbuf_mtod(mb, struct ether_hdr *);
> + eth_type = RTE_BE_TO_CPU_16(eth_hdr->ether_type);
> + ol_flags = mb->ol_flags;
> + packet_type = mb->packet_type;
> + is_encapsulation = RTE_ETH_IS_TUNNEL_PKT(packet_type);
> +
> + print_ether_addr(" src=", ð_hdr->s_addr);
> + print_ether_addr(" - dst=", ð_hdr->d_addr);
> + printf(" - type=0x%04x - length=%u - nb_segs=%d",
> + eth_type, (unsigned int) mb->pkt_len,
> + (int)mb->nb_segs);
Should the following line be reinstated here:
if (ol_flags & PKT_RX_RSS_HASH) {
> + printf(" - RSS hash=0x%x", (unsigned int) mb->hash.rss);
> + printf(" - RSS queue=0x%x", (unsigned int) queue);
Should the following line be reinstated here:
}
> + if (ol_flags & PKT_RX_FDIR) {
> + printf(" - FDIR matched ");
> + if (ol_flags & PKT_RX_FDIR_ID)
> + printf("ID=0x%x",
> + mb->hash.fdir.hi);
> + else if (ol_flags & PKT_RX_FDIR_FLX)
> + printf("flex bytes=0x%08x %08x",
> + mb->hash.fdir.hi, mb->hash.fdir.lo);
> + else
> + printf("hash=0x%x ID=0x%x ",
> + mb->hash.fdir.hash, mb->hash.fdir.id);
> + }
> + if (ol_flags & PKT_RX_TIMESTAMP)
> + printf(" - timestamp %"PRIu64" ", mb->timestamp);
> + if (ol_flags & PKT_RX_VLAN_STRIPPED)
> + printf(" - VLAN tci=0x%x", mb->vlan_tci);
> + if (ol_flags & PKT_RX_QINQ_STRIPPED)
> + printf(" - QinQ VLAN tci=0x%x, VLAN tci outer=0x%x",
> + mb->vlan_tci, mb->vlan_tci_outer);
> + if (mb->packet_type) {
> + rte_get_ptype_name(mb->packet_type, buf,
> sizeof(buf));
> + printf(" - hw ptype: %s", buf);
> + }
> + sw_packet_type = rte_net_get_ptype(mb, &hdr_lens,
> + RTE_PTYPE_ALL_MASK);
> + rte_get_ptype_name(sw_packet_type, buf, sizeof(buf));
> + printf(" - sw ptype: %s", buf);
> + if (sw_packet_type & RTE_PTYPE_L2_MASK)
> + printf(" - l2_len=%d", hdr_lens.l2_len);
> + if (sw_packet_type & RTE_PTYPE_L3_MASK)
The following blank line can be removed:
> +
> + printf(" - l4_len=%d", hdr_lens.l4_len);
> + if (sw_packet_type & RTE_PTYPE_TUNNEL_MASK)
> + printf(" - tunnel_len=%d", hdr_lens.tunnel_len);
> + if (sw_packet_type & RTE_PTYPE_INNER_L2_MASK)
> + printf(" - inner_l2_len=%d", hdr_lens.inner_l2_len);
> + if (sw_packet_type & RTE_PTYPE_INNER_L4_MASK)
> + printf(" - inner_l4_len=%d", hdr_lens.inner_l4_len);
> + if (is_encapsulation) {
> + struct ipv4_hdr *ipv4_hdr;
> + struct ipv6_hdr *ipv6_hdr;
> + struct udp_hdr *udp_hdr;
> + uint8_t l2_len;
> + uint8_t l3_len;
> + uint8_t l4_len;
> + uint8_t l4_proto;
> + struct vxlan_hdr *vxlan_hdr;
> +
> + l2_len = sizeof(struct ether_hdr);
> +
> + /* Do not support ipv4 option field */
> + if (RTE_ETH_IS_IPV4_HDR(packet_type)) {
> + l3_len = sizeof(struct ipv4_hdr);
> + ipv4_hdr = rte_pktmbuf_mtod_offset(mb,
> + struct ipv4_hdr *,
> + l2_len);
> + l4_proto = ipv4_hdr->next_proto_id;
> + } else {
> + l3_len = sizeof(struct ipv6_hdr);
> + ipv6_hdr = rte_pktmbuf_mtod_offset(mb,
> + struct ipv6_hdr *,
> + l2_len);
> + l4_proto = ipv6_hdr->proto;
> + }
> + if (l4_proto == IPPROTO_UDP) {
> + udp_hdr = rte_pktmbuf_mtod_offset(mb,
> + struct udp_hdr *,
> + l2_len + l3_len);
> + l4_len = sizeof(struct udp_hdr);
> + vxlan_hdr = rte_pktmbuf_mtod_offset(mb,
> + struct vxlan_hdr *,
> + l2_len + l3_len + l4_len);
> +
> + printf(" - VXLAN packet: packet type =%d, "
> + "Destination UDP port =%d, VNI = %d",
> + packet_type,
Suggest using local variables for be_to_cpu conversions to solve long line
issue.
> + RTE_BE_TO_CPU_16(udp_hdr->dst_port),
> + rte_be_to_cpu_32(vxlan_hdr->vx_vni) >>
> 8);
> + }
> + }
> + printf(" - %s queue=0x%x", is_rx ? "Receive" : "Send",
> + (unsigned int) queue);
> + printf("\n");
> + rte_get_rx_ol_flag_list(mb->ol_flags, buf, sizeof(buf));
> + printf(" ol_flags: %s\n", buf);
> + }
> +}
> --
> 2.7.4
Regards,
Bernard.
