From mboxrd@z Thu Jan 1 00:00:00 1970 From: Raslan Darawsheh Subject: [PATCH v4 1/3] app/testpmd: move dumping packets to a separate function Date: Sun, 7 Oct 2018 07:38:06 +0000 Message-ID: <1538897848-1693-1-git-send-email-rasland@mellanox.com> References: <1537793304-27883-1-git-send-email-rasland@mellanox.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Cc: Thomas Monjalon , "dev@dpdk.org" , Shahaf Shuler , Raslan Darawsheh , "Xueming(Steven) Li" , Ori Kam , "jerin.jacob@caviumnetworks.com" , "david.marchand@6wind.com" , "bernard.iremonger@intel.com" To: "jingjing.wu@intel.com" Return-path: Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00052.outbound.protection.outlook.com [40.107.0.52]) by dpdk.org (Postfix) with ESMTP id 1B7133798 for ; Sun, 7 Oct 2018 09:38:09 +0200 (CEST) In-Reply-To: <1537793304-27883-1-git-send-email-rasland@mellanox.com> Content-Language: en-US List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" verbosity for the received/sent packets is needed in all of the forwarding engines so moving it to be in a separate function --- changes in v3: - add util.c in the mason.build file - restore missing check for ol_flags & PKT_RX_RSS_HASH. - add local variables for rte_be_to_cpu to avoid long lines. changes in v4: - add missing l3 and l4 checks --- Signed-off-by: Raslan Darawsheh --- app/test-pmd/Makefile | 1 + app/test-pmd/meson.build | 3 +- app/test-pmd/rxonly.c | 134 +----------------------------------------- app/test-pmd/util.c | 150 +++++++++++++++++++++++++++++++++++++++++++= ++++ 4 files changed, 156 insertions(+), 132 deletions(-) create mode 100644 app/test-pmd/util.c diff --git a/app/test-pmd/Makefile b/app/test-pmd/Makefile index 2b4d604..e2c7845 100644 --- a/app/test-pmd/Makefile +++ b/app/test-pmd/Makefile @@ -35,6 +35,7 @@ SRCS-y +=3D csumonly.c SRCS-y +=3D icmpecho.c SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588) +=3D ieee1588fwd.c SRCS-$(CONFIG_RTE_LIBRTE_BPF) +=3D bpf_cmd.c +SRCS-y +=3D util.c =20 ifeq ($(CONFIG_RTE_LIBRTE_PMD_SOFTNIC), y) SRCS-y +=3D softnicfwd.c diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build index a0b3be0..b96ab97 100644 --- a/app/test-pmd/meson.build +++ b/app/test-pmd/meson.build @@ -20,7 +20,8 @@ sources =3D files('cmdline.c', 'parameters.c', 'rxonly.c', 'testpmd.c', - 'txonly.c') + 'txonly.c', + 'util.c') =20 deps =3D ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'meter', 'bus_pci'= ] if dpdk_conf.has('RTE_LIBRTE_PDUMP') diff --git a/app/test-pmd/rxonly.c b/app/test-pmd/rxonly.c index a93d806..3eca89c 100644 --- a/app/test-pmd/rxonly.c +++ b/app/test-pmd/rxonly.c @@ -40,14 +40,6 @@ =20 #include "testpmd.h" =20 -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); -} - /* * Received a burst of packets. */ @@ -55,16 +47,8 @@ static void pkt_burst_receive(struct fwd_stream *fs) { struct rte_mbuf *pkts_burst[MAX_PKT_BURST]; - struct rte_mbuf *mb; - struct ether_hdr *eth_hdr; - uint16_t eth_type; - uint64_t ol_flags; uint16_t nb_rx; - uint16_t i, packet_type; - uint16_t is_encapsulation; - char buf[256]; - struct rte_net_hdr_lens hdr_lens; - uint32_t sw_packet_type; + uint16_t i; =20 #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES uint64_t start_tsc; @@ -90,120 +74,8 @@ pkt_burst_receive(struct fwd_stream *fs) /* * Dump each received packet if verbose_level > 0. */ - if (verbose_level > 0) - printf("port %u/queue %u: received %u packets\n", - fs->rx_port, - (unsigned) fs->rx_queue, - (unsigned) nb_rx); - for (i =3D 0; i < nb_rx; i++) { - mb =3D pkts_burst[i]; - if (verbose_level =3D=3D 0) { - rte_pktmbuf_free(mb); - continue; - } - 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) mb->pkt_len, - (int)mb->nb_segs); - if (ol_flags & PKT_RX_RSS_HASH) { - printf(" - RSS hash=3D0x%x", (unsigned) mb->hash.rss); - printf(" - RSS queue=3D0x%x",(unsigned) fs->rx_queue); - } - 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) - printf(" - l3_len=3D%d", hdr_lens.l3_len); - if (sw_packet_type & RTE_PTYPE_L4_MASK) - 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_L3_MASK) - printf(" - inner_l3_len=3D%d", hdr_lens.inner_l3_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, RTE_BE_TO_CPU_16(udp_hdr->dst_port), - rte_be_to_cpu_32(vxlan_hdr->vx_vni) >> 8); - } - } - printf(" - Receive queue=3D0x%x", (unsigned) fs->rx_queue); - printf("\n"); - rte_get_rx_ol_flag_list(mb->ol_flags, buf, sizeof(buf)); - printf(" ol_flags: %s\n", buf); - rte_pktmbuf_free(mb); - } + for (i =3D 0; i < nb_rx; i++) + rte_pktmbuf_free(pkts_burst[i]); =20 #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES end_tsc =3D rte_rdtsc(); diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c new file mode 100644 index 0000000..e56b712 --- /dev/null +++ b/app/test-pmd/util.c @@ -0,0 +1,150 @@ +/* SPDX-License-Identifie.r: BSD-3-Clause + * Copyri.ght(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; + uint16_t udp_port; + uint32_t vx_vni; + + 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); + 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); + } + 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) + printf(" - l3_len=3D%d", hdr_lens.l3_len); + if (sw_packet_type & RTE_PTYPE_L4_MASK) + 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_L3_MASK) + printf(" - inner_l3_len=3D%d", hdr_lens.inner_l3_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); + udp_port =3D RTE_BE_TO_CPU_16(udp_hdr->dst_port); + vx_vni =3D rte_be_to_cpu_32(vxlan_hdr->vx_vni); + printf(" - VXLAN packet: packet type =3D%d, " + "Destination UDP port =3D%d, VNI =3D %d", + packet_type, udp_port, 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); + } +} --=20 2.7.4