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

Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
Signed-off-by: Raslan Darawsheh <rasland@mellanox.com>

diff --git a/app/test-pmd/Makefile b/app/test-pmd/Makefile
index e2581ca..8e4ff5b 100644 (file)
--- a/app/test-pmd/Makefile
+++ b/app/test-pmd/Makefile
@@ -36,6 +36,7 @@ SRCS-y += icmpecho.c
 SRCS-y += noisy_vnf.c
 SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588) += ieee1588fwd.c
 SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_cmd.c
+SRCS-y += util.c
 
 ifeq ($(CONFIG_RTE_LIBRTE_PMD_SOFTNIC), y)
 SRCS-y += softnicfwd.c

diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build
index 9ef6ed9..cd66618 100644 (file)
--- a/app/test-pmd/meson.build
+++ b/app/test-pmd/meson.build
@@ -21,7 +21,8 @@ sources = files('cmdline.c',
        'parameters.c',
        'rxonly.c',
        'testpmd.c',
-       'txonly.c')
+       'txonly.c',
+       'util.c')
 
 deps = ['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 41db0ff..3eca89c 100644 (file)
--- a/app/test-pmd/rxonly.c
+++ b/app/test-pmd/rxonly.c
@@ -40,14 +40,6 @@
 
 #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);
-}
-
 /*
  * 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;
 
 #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 = 0; i < nb_rx; i++) {
-               mb = pkts_burst[i];
-               if (verbose_level == 0) {
-                       rte_pktmbuf_free(mb);
-                       continue;
-               }
-               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=", &eth_hdr->s_addr);
-               print_ether_addr(" - dst=", &eth_hdr->d_addr);
-               printf(" - type=0x%04x - length=%u - nb_segs=%d",
-                      eth_type, (unsigned) mb->pkt_len,
-                      (int)mb->nb_segs);
-               if (ol_flags & PKT_RX_RSS_HASH) {
-                       printf(" - RSS hash=0x%x", (unsigned) mb->hash.rss);
-                       printf(" - RSS queue=0x%x",(unsigned) fs->rx_queue);
-               }
-               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_QINQ)
-                       printf(" - QinQ VLAN tci=0x%x, VLAN tci outer=0x%x",
-                                       mb->vlan_tci, mb->vlan_tci_outer);
-               else if (ol_flags & PKT_RX_VLAN)
-                       printf(" - VLAN tci=0x%x", mb->vlan_tci);
-               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)
-                       printf(" - l3_len=%d", hdr_lens.l3_len);
-               if (sw_packet_type & RTE_PTYPE_L4_MASK)
-                       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_L3_MASK)
-                       printf(" - inner_l3_len=%d", hdr_lens.inner_l3_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, RTE_BE_TO_CPU_16(udp_hdr->dst_port),
-                                       rte_be_to_cpu_32(vxlan_hdr->vx_vni) >> 8);
-                       }
-               }
-               printf(" - Receive queue=0x%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 = 0; i < nb_rx; i++)
+               rte_pktmbuf_free(pkts_burst[i]);
 
 #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
        end_tsc = rte_rdtsc();

diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 121b756..cba9640 100644 (file)
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -764,6 +764,9 @@ int check_nb_rxq(queueid_t rxq);
 queueid_t get_allowed_max_nb_txq(portid_t *pid);
 int check_nb_txq(queueid_t txq);
 
+void dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[],
+        uint16_t nb_pkts, int is_rx);
+
 /*
  * Work-around of a compilation error with ICC on invocations of the
  * rte_be_to_cpu_16() function.

diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c
new file mode 100644 (file)
index 0000000..3ba3b58
--- /dev/null
+++ b/app/test-pmd/util.c
@@ -0,0 +1,151 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
+ * Copyright(c) 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);
+}
+
+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 = 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=", &eth_hdr->s_addr);
+               print_ether_addr(" - dst=", &eth_hdr->d_addr);
+               printf(" - type=0x%04x - length=%u - nb_segs=%d",
+                      eth_type, (unsigned int) mb->pkt_len,
+                      (int)mb->nb_segs);
+               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);
+               }
+               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_QINQ)
+                       printf(" - QinQ VLAN tci=0x%x, VLAN tci outer=0x%x",
+                              mb->vlan_tci, mb->vlan_tci_outer);
+               else if (ol_flags & PKT_RX_VLAN)
+                       printf(" - VLAN tci=0x%x", mb->vlan_tci);
+               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)
+                       printf(" - l3_len=%d", hdr_lens.l3_len);
+               if (sw_packet_type & RTE_PTYPE_L4_MASK)
+                       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_L3_MASK)
+                       printf(" - inner_l3_len=%d", hdr_lens.inner_l3_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);
+                               udp_port = RTE_BE_TO_CPU_16(udp_hdr->dst_port);
+                               vx_vni = rte_be_to_cpu_32(vxlan_hdr->vx_vni);
+                               printf(" - VXLAN packet: packet type =%d, "
+                                      "Destination UDP port =%d, VNI = %d",
+                                      packet_type, udp_port, 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);
+       }
+}