From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id D8CEA5F1D for ; Tue, 2 Oct 2018 15:36:28 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Oct 2018 06:36:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,332,1534834800"; d="scan'208";a="79224982" Received: from irsmsx152.ger.corp.intel.com ([163.33.192.66]) by orsmga006.jf.intel.com with ESMTP; 02 Oct 2018 06:35:38 -0700 Received: from irsmsx107.ger.corp.intel.com ([169.254.10.56]) by IRSMSX152.ger.corp.intel.com ([169.254.6.110]) with mapi id 14.03.0319.002; Tue, 2 Oct 2018 14:35:37 +0100 From: "Iremonger, Bernard" To: Raslan Darawsheh , "Wu, Jingjing" CC: Thomas Monjalon , "dev@dpdk.org" , Shahaf Shuler , "Xueming(Steven) Li" , Ori Katz , "jerin.jacob@caviumnetworks.com" , "david.marchand@6wind.com" Thread-Topic: [PATCH v2 1/3] app/testpmd: move dumping packets to a separate function Thread-Index: AQHUVAWG5GGoPHIRN0O6bEKw4RZTrKUL/uDQ Date: Tue, 2 Oct 2018 13:35:37 +0000 Message-ID: <8CEF83825BEC744B83065625E567D7C260D0B986@IRSMSX107.ger.corp.intel.com> References: <1536739583-29166-2-git-send-email-rasland@mellanox.com> <1537793304-27883-1-git-send-email-rasland@mellanox.com> In-Reply-To: <1537793304-27883-1-git-send-email-rasland@mellanox.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYTE1YWZlNDUtMjYwZC00NjExLWIxOWMtNjdmYmNlODY1MDhiIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiRUNcL0ZsT3gzRVlPYVVjbG42UnJrcUtKVGhQTWV3OW1wdlljN3ZvUllZVitXbWVOMXprYnpcL1pvVGdkR0pnSDVBIn0= x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [163.33.239.180] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v2 1/3] app/testpmd: move dumping packets to a separate function X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Oct 2018 13:36:29 -0000 Hi Raslan, > -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Raslan Darawsheh > Sent: Monday, September 24, 2018 1:49 PM > To: Wu, Jingjing > Cc: Thomas Monjalon ; dev@dpdk.org; Shahaf Shuler > ; Raslan Darawsheh ; > Xueming(Steven) Li ; Ori Katz ; > jerin.jacob@caviumnetworks.com; david.marchand@6wind.com > Subject: [dpdk-dev] [PATCH v2 1/3] app/testpmd: move dumping packets to a > separate function >=20 > verbosity for the received/sent packets is needed in all of the forwardin= g > engines so moving it to be in a separate function >=20 > Signed-off-by: Raslan Darawsheh > --- > 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 >=20 > diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c new file mode 1006= 44 > 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 > + > +#include > +#include > +#include > +#include > +#include > + > +#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 =3D 0; i < nb_pkts; i++) { > + mb =3D pkts[i]; > + eth_hdr =3D rte_pktmbuf_mtod(mb, struct ether_hdr *); > + eth_type =3D RTE_BE_TO_CPU_16(eth_hdr->ether_type); > + ol_flags =3D mb->ol_flags; > + packet_type =3D mb->packet_type; > + is_encapsulation =3D RTE_ETH_IS_TUNNEL_PKT(packet_type); > + > + print_ether_addr(" src=3D", ð_hdr->s_addr); > + print_ether_addr(" - dst=3D", ð_hdr->d_addr); > + printf(" - type=3D0x%04x - length=3D%u - nb_segs=3D%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=3D0x%x", (unsigned int) mb->hash.rss); > + printf(" - RSS queue=3D0x%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=3D0x%x", > + mb->hash.fdir.hi); > + else if (ol_flags & PKT_RX_FDIR_FLX) > + printf("flex bytes=3D0x%08x %08x", > + mb->hash.fdir.hi, mb->hash.fdir.lo); > + else > + printf("hash=3D0x%x ID=3D0x%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=3D0x%x", mb->vlan_tci); > + if (ol_flags & PKT_RX_QINQ_STRIPPED) > + printf(" - QinQ VLAN tci=3D0x%x, VLAN tci outer=3D0x%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 =3D 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=3D%d", hdr_lens.l2_len); > + if (sw_packet_type & RTE_PTYPE_L3_MASK) The following blank line can be removed: > + > + printf(" - l4_len=3D%d", hdr_lens.l4_len); > + if (sw_packet_type & RTE_PTYPE_TUNNEL_MASK) > + printf(" - tunnel_len=3D%d", hdr_lens.tunnel_len); > + if (sw_packet_type & RTE_PTYPE_INNER_L2_MASK) > + printf(" - inner_l2_len=3D%d", hdr_lens.inner_l2_len); > + if (sw_packet_type & RTE_PTYPE_INNER_L4_MASK) > + printf(" - inner_l4_len=3D%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 =3D sizeof(struct ether_hdr); > + > + /* Do not support ipv4 option field */ > + if (RTE_ETH_IS_IPV4_HDR(packet_type)) { > + l3_len =3D sizeof(struct ipv4_hdr); > + ipv4_hdr =3D rte_pktmbuf_mtod_offset(mb, > + struct ipv4_hdr *, > + l2_len); > + l4_proto =3D ipv4_hdr->next_proto_id; > + } else { > + l3_len =3D sizeof(struct ipv6_hdr); > + ipv6_hdr =3D rte_pktmbuf_mtod_offset(mb, > + struct ipv6_hdr *, > + l2_len); > + l4_proto =3D ipv6_hdr->proto; > + } > + if (l4_proto =3D=3D IPPROTO_UDP) { > + udp_hdr =3D rte_pktmbuf_mtod_offset(mb, > + struct udp_hdr *, > + l2_len + l3_len); > + l4_len =3D sizeof(struct udp_hdr); > + vxlan_hdr =3D rte_pktmbuf_mtod_offset(mb, > + struct vxlan_hdr *, > + l2_len + l3_len + l4_len); > + > + printf(" - VXLAN packet: packet type =3D%d, " > + "Destination UDP port =3D%d, VNI =3D %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=3D0x%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.