dev.dpdk.org archive mirror
 help / color / mirror / Atom feed
From: Olivier Matz <olivier.matz-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
To: dev-VfR2kkLFssw@public.gmane.org
Subject: [PATCH RFC 07/11] mbuf: add functions to get the name of an ol_flag
Date: Fri,  9 May 2014 16:50:34 +0200	[thread overview]
Message-ID: <1399647038-15095-8-git-send-email-olivier.matz@6wind.com> (raw)
In-Reply-To: <1399647038-15095-1-git-send-email-olivier.matz-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>

In test-pmd (rxonly.c), the code is able to dump the list of ol_flags.
The issue is that the list of flags in the application has to be
synchronized with the flags defined in rte_mbuf.h.

This patch introduces 2 new functions rte_get_rx_ol_flag_name()
and rte_get_tx_ol_flag_name() that returns the name of a flag from
its mask. It also fixes rxonly.c to use this new functions and to
display the proper flags.

Signed-off-by: Olivier Matz <olivier.matz-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
---
 app/test-pmd/rxonly.c      | 33 ++++++++++-----------------------
 lib/librte_mbuf/rte_mbuf.h | 46 ++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/app/test-pmd/rxonly.c b/app/test-pmd/rxonly.c
index 5751b0b..94f71c7 100644
--- a/app/test-pmd/rxonly.c
+++ b/app/test-pmd/rxonly.c
@@ -69,23 +69,6 @@
 
 #include "testpmd.h"
 
-#define MAX_PKT_RX_FLAGS 11
-static const char *pkt_rx_flag_names[MAX_PKT_RX_FLAGS] = {
-	"VLAN_PKT",
-	"RSS_HASH",
-	"PKT_RX_FDIR",
-	"IP_CKSUM",
-	"IP_CKSUM_BAD",
-
-	"IPV4_HDR",
-	"IPV4_HDR_EXT",
-	"IPV6_HDR",
-	"IPV6_HDR_EXT",
-
-	"IEEE1588_PTP",
-	"IEEE1588_TMST",
-};
-
 static inline void
 print_ether_addr(const char *what, struct ether_addr *eth_addr)
 {
@@ -169,12 +152,16 @@ pkt_burst_receive(struct fwd_stream *fs)
 				mb->vlan_macip.f.vlan_tci);
 		printf("\n");
 		if (ol_flags != 0) {
-			int rxf;
-
-			for (rxf = 0; rxf < MAX_PKT_RX_FLAGS; rxf++) {
-				if (ol_flags & (1 << rxf))
-					printf("  PKT_RX_%s\n",
-					       pkt_rx_flag_names[rxf]);
+			uint16_t rxf;
+			const char *name;
+
+			for (rxf = 0; rxf < sizeof(mb->ol_flags) * 8; rxf++) {
+				if ((ol_flags & (1 << rxf)) == 0)
+					continue;
+				name = rte_get_rx_ol_flag_name(1 << rxf);
+				if (name == NULL)
+					continue;
+				printf("  %s\n", name);
 			}
 		}
 		rte_pktmbuf_free(mb);
diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
index 8fa781b..55a993a 100644
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
@@ -99,9 +99,51 @@ extern "C" {
 #define PKT_TX_IEEE1588_TMST 0x8000 /**< TX IEEE1588 packet to timestamp. */
 
 /**
- * Bit Mask to indicate what bits required for building TX context
+ * Get the name of a RX offload flag
+ *
+ * @param mask
+ *   The mask describing the flag (only one bit must be set)
+ * @return
+ *   The name of this flag, or NULL if it's not a valid RX flag.
  */
-#define PKT_TX_OFFLOAD_MASK (PKT_TX_VLAN_PKT | PKT_TX_IP_CKSUM | PKT_TX_L4_MASK)
+static inline const char *rte_get_rx_ol_flag_name(uint16_t mask)
+{
+	switch (mask) {
+	case PKT_RX_VLAN_PKT: return "PKT_RX_VLAN_PKT";
+	case PKT_RX_RSS_HASH: return "PKT_RX_RSS_HASH";
+	case PKT_RX_FDIR: return "PKT_RX_FDIR";
+	case PKT_RX_L4_CKSUM_BAD: return "PKT_RX_L4_CKSUM_BAD";
+	case PKT_RX_IP_CKSUM_BAD: return "PKT_RX_IP_CKSUM_BAD";
+	case PKT_RX_IPV4_HDR: return "PKT_RX_IPV4_HDR";
+	case PKT_RX_IPV4_HDR_EXT: return "PKT_RX_IPV4_HDR_EXT";
+	case PKT_RX_IPV6_HDR: return "PKT_RX_IPV6_HDR";
+	case PKT_RX_IPV6_HDR_EXT: return "PKT_RX_IPV6_HDR_EXT";
+	case PKT_RX_IEEE1588_PTP: return "PKT_RX_IEEE1588_PTP";
+	case PKT_RX_IEEE1588_TMST: return "PKT_RX_IEEE1588_TMST";
+	default: return NULL;
+	}
+}
+
+/**
+ * Get the name of a TX offload flag
+ *
+ * @param mask
+ *   The mask describing the flag (only one bit must be set)
+ * @return
+ *   The name of this flag, or NULL if it's not a valid TX flag.
+ */
+static inline const char *rte_get_tx_ol_flag_name(uint16_t mask)
+{
+	switch (mask) {
+	case PKT_TX_VLAN_PKT: return "PKT_TX_VLAN_PKT";
+	case PKT_TX_IP_CKSUM: return "PKT_TX_IP_CKSUM";
+	case PKT_TX_TCP_CKSUM: return "PKT_TX_TCP_CKSUM";
+	case PKT_TX_SCTP_CKSUM: return "PKT_TX_SCTP_CKSUM";
+	case PKT_TX_UDP_CKSUM: return "PKT_TX_UDP_CKSUM";
+	case PKT_TX_IEEE1588_TMST: return "PKT_TX_IEEE1588_TMST";
+	default: return NULL;
+	}
+}
 
 /** Offload features */
 union rte_vlan_macip {
-- 
1.9.2

  parent reply	other threads:[~2014-05-09 14:50 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-09 14:50 [PATCH RFC 00/11] ixgbe/mbuf: add TSO support Olivier Matz
     [not found] ` <1399647038-15095-1-git-send-email-olivier.matz-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2014-05-09 14:50   ` [PATCH RFC 01/11] igb/ixgbe: fix IP checksum calculation Olivier Matz
     [not found]     ` <1399647038-15095-2-git-send-email-olivier.matz-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2014-05-15 10:40       ` Ananyev, Konstantin
2014-05-09 14:50   ` [PATCH RFC 02/11] mbuf: rename RTE_MBUF_SCATTER_GATHER into RTE_MBUF_REFCNT Olivier Matz
2014-05-09 14:50   ` [PATCH RFC 03/11] mbuf: remove rte_ctrlmbuf Olivier Matz
     [not found]     ` <1399647038-15095-4-git-send-email-olivier.matz-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2014-05-25 21:39       ` Gilmore, Walter E
     [not found]         ` <DC16335EE7FE114791FFF955B21EDB44940EF02A-P5GAC/sN6hlqS6EAlXoojrfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2014-05-26 12:23           ` Olivier MATZ
2014-05-26 16:40           ` Dumitrescu, Cristian
2014-05-26 22:43           ` Neil Horman
2014-05-27  0:17       ` Stephen Hemminger
     [not found]         ` <20140526171701.7bd0fadd-We1ePj4FEcvRI77zikRAJc56i+j3xesD0e7PPNI6Mm0@public.gmane.org>
2014-05-28  9:45           ` Ananyev, Konstantin
2014-05-09 14:50   ` [PATCH RFC 04/11] mbuf: remove the rte_pktmbuf structure Olivier Matz
2014-05-09 14:50   ` [PATCH RFC 05/11] mbuf: merge physaddr and buf_len in a bitfield Olivier Matz
     [not found]     ` <1399647038-15095-6-git-send-email-olivier.matz-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2014-05-09 15:39       ` Shaw, Jeffrey B
     [not found]         ` <4032A54B6BB5F04B8C08B6CFF08C59285542081E-AtyAts71sc9Qxe9IK+vIArfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2014-05-09 16:06           ` Olivier MATZ
     [not found]             ` <536CFCEF.4080704-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2014-05-09 16:11               ` Shaw, Jeffrey B
     [not found]                 ` <4032A54B6BB5F04B8C08B6CFF08C59285542085B-AtyAts71sc9Qxe9IK+vIArfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2014-05-14 14:07                   ` Ananyev, Konstantin
     [not found]                     ` <2601191342CEEE43887BDE71AB9772580EFA666D-kPTMFJFq+rEu0RiL9chJVbfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2014-05-15  9:53                       ` Olivier MATZ
2014-05-19  7:27                   ` Olivier MATZ
     [not found]                     ` <5379B25B.6050003-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2014-05-19  8:25                       ` Richardson, Bruce
     [not found]                         ` <59AF69C657FD0841A61C55336867B5B01AA1B1B2-kPTMFJFq+rELt2AQoY/u9bfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2014-05-19  9:30                           ` Olivier MATZ
     [not found]                             ` <5379CF3A.90609-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2014-05-19  9:57                               ` Richardson, Bruce
2014-05-09 14:50   ` [PATCH RFC 06/11] mbuf: replace data pointer by an offset Olivier Matz
     [not found]     ` <1399647038-15095-7-git-send-email-olivier.matz-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2014-05-12 14:12       ` Thomas Monjalon
2014-05-12 14:36         ` Venkatesan, Venky
     [not found]           ` <1FD9B82B8BF2CF418D9A1000154491D9740A92B8-P5GAC/sN6hlcIJlls4ac1rfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2014-05-12 14:41             ` Neil Horman
     [not found]               ` <20140512144108.GB21298-B26myB8xz7F8NnZeBjwnZQMhkBWG/bsMQH7oEaQurus@public.gmane.org>
2014-05-12 15:07                 ` Olivier MATZ
     [not found]                   ` <5370E397.7000706-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2014-05-12 15:59                     ` Stephen Hemminger
     [not found]                       ` <20140512085924.20a29cad-We1ePj4FEcvRI77zikRAJc56i+j3xesD0e7PPNI6Mm0@public.gmane.org>
2014-05-12 16:13                         ` Olivier MATZ
     [not found]                           ` <5370F326.8070206-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2014-05-12 17:13                             ` Stephen Hemminger
     [not found]                               ` <20140512101316.0c0d2824-We1ePj4FEcvRI77zikRAJc56i+j3xesD0e7PPNI6Mm0@public.gmane.org>
2014-05-13 13:29                                 ` Olivier MATZ
2014-05-12 16:06                     ` Venkatesan, Venky
     [not found]                       ` <1FD9B82B8BF2CF418D9A1000154491D9740A9631-P5GAC/sN6hlcIJlls4ac1rfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2014-05-12 18:39                         ` Neil Horman
     [not found]                           ` <20140512183943.GC21298-B26myB8xz7F8NnZeBjwnZQMhkBWG/bsMQH7oEaQurus@public.gmane.org>
2014-05-13 13:54                             ` Venkatesan, Venky
     [not found]                               ` <1FD9B82B8BF2CF418D9A1000154491D9740AA95E-P5GAC/sN6hlcIJlls4ac1rfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2014-05-13 14:09                                 ` Thomas Monjalon
2014-05-09 14:50   ` Olivier Matz [this message]
2014-05-09 14:50   ` [PATCH RFC 08/11] mbuf: change ol_flags to 32 bits Olivier Matz
2014-05-09 14:50   ` [PATCH RFC 09/11] mbuf: rename vlan_macip_len in hw_offload and increase its size Olivier Matz
2014-05-09 14:50   ` [PATCH RFC 10/11] testpmd: modify source address to validate checksum calculation Olivier Matz
2014-05-09 14:50   ` [PATCH RFC 11/11] ixgbe/mbuf: add TSO support Olivier Matz
     [not found]     ` <1399647038-15095-12-git-send-email-olivier.matz-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2014-05-12 14:30       ` Thomas Monjalon
2014-05-15 15:09       ` Ananyev, Konstantin
     [not found]         ` <2601191342CEEE43887BDE71AB9772580EFA6ADD-kPTMFJFq+rEu0RiL9chJVbfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2014-05-15 15:39           ` Olivier MATZ
     [not found]             ` <5374DFC4.50808-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2014-05-15 16:30               ` Ananyev, Konstantin
     [not found]                 ` <2601191342CEEE43887BDE71AB9772580EFA6B2A-kPTMFJFq+rEu0RiL9chJVbfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2014-05-16 12:11                   ` Olivier MATZ
     [not found]                     ` <53760079.7090106-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2014-05-16 17:01                       ` Ananyev, Konstantin
     [not found]                         ` <2601191342CEEE43887BDE71AB9772580EFA6ED5-kPTMFJFq+rEu0RiL9chJVbfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2014-05-19 12:32                           ` Thomas Monjalon
2014-05-09 17:04   ` [PATCH RFC 00/11] " Stephen Hemminger
     [not found]     ` <20140509100431.7af69959-We1ePj4FEcvRI77zikRAJc56i+j3xesD0e7PPNI6Mm0@public.gmane.org>
2014-05-09 21:49       ` Olivier MATZ
     [not found]         ` <536D4D79.4080609-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2014-05-10  0:39           ` Stephen Hemminger
2014-05-19 12:47   ` Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1399647038-15095-8-git-send-email-olivier.matz@6wind.com \
    --to=olivier.matz-pdr9zngts4eavxtiumwx3w@public.gmane.org \
    --cc=dev-VfR2kkLFssw@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).