ethdev: add return value to stats get dev op

[dpdk.git] / app / test-pmd / rxonly.c

diff --git a/app/test-pmd/rxonly.c b/app/test-pmd/rxonly.c
index 9a6e394..fd9a437 100644 (file)
--- a/app/test-pmd/rxonly.c
+++ b/app/test-pmd/rxonly.c
@@ -56,7 +56,6 @@
 #include <rte_lcore.h>
 #include <rte_atomic.h>
 #include <rte_branch_prediction.h>
-#include <rte_memory.h>
 #include <rte_mempool.h>
 #include <rte_mbuf.h>
 #include <rte_interrupts.h>
@@ -66,6 +65,8 @@
 #include <rte_string_fns.h>
 #include <rte_ip.h>
 #include <rte_udp.h>
+#include <rte_net.h>
+#include <rte_flow.h>
 
 #include "testpmd.h"
 
@@ -92,14 +93,14 @@ pkt_burst_receive(struct fwd_stream *fs)
        uint16_t i, packet_type;
        uint16_t is_encapsulation;
        char buf[256];
+       struct rte_net_hdr_lens hdr_lens;
+       uint32_t sw_packet_type;
 
 #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
        uint64_t start_tsc;
        uint64_t end_tsc;
        uint64_t core_cycles;
-#endif
 
-#ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
        start_tsc = rte_rdtsc();
 #endif
 
@@ -121,7 +122,7 @@ pkt_burst_receive(struct fwd_stream *fs)
         */
        if (verbose_level > 0)
                printf("port %u/queue %u: received %u packets\n",
-                      (unsigned) fs->rx_port,
+                      fs->rx_port,
                       (unsigned) fs->rx_queue,
                       (unsigned) nb_rx);
        for (i = 0; i < nb_rx; i++) {
@@ -144,7 +145,8 @@ pkt_burst_receive(struct fwd_stream *fs)
                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);
-               } else if (ol_flags & PKT_RX_FDIR) {
+               }
+               if (ol_flags & PKT_RX_FDIR) {
                        printf(" - FDIR matched ");
                        if (ol_flags & PKT_RX_FDIR_ID)
                                printf("ID=0x%x",
@@ -156,6 +158,8 @@ pkt_burst_receive(struct fwd_stream *fs)
                                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)
@@ -163,8 +167,26 @@ pkt_burst_receive(struct fwd_stream *fs)
                                        mb->vlan_tci, mb->vlan_tci_outer);
                if (mb->packet_type) {
                        rte_get_ptype_name(mb->packet_type, buf, sizeof(buf));
-                       printf(" - %s", 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;
@@ -208,19 +230,8 @@ pkt_burst_receive(struct fwd_stream *fs)
                }
                printf(" - Receive queue=0x%x", (unsigned) fs->rx_queue);
                printf("\n");
-               if (ol_flags != 0) {
-                       unsigned rxf;
-                       const char *name;
-
-                       for (rxf = 0; rxf < sizeof(mb->ol_flags) * 8; rxf++) {
-                               if ((ol_flags & (1ULL << rxf)) == 0)
-                                       continue;
-                               name = rte_get_rx_ol_flag_name(1ULL << rxf);
-                               if (name == NULL)
-                                       continue;
-                               printf("  %s\n", name);
-                       }
-               }
+               rte_get_rx_ol_flag_list(mb->ol_flags, buf, sizeof(buf));
+               printf("  ol_flags: %s\n", buf);
                rte_pktmbuf_free(mb);
        }