From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-we0-f182.google.com (mail-we0-f182.google.com [74.125.82.182]) by dpdk.org (Postfix) with ESMTP id 2E1E9B0A4 for ; Mon, 19 May 2014 15:56:54 +0200 (CEST) Received: by mail-we0-f182.google.com with SMTP id t60so5471793wes.41 for ; Mon, 19 May 2014 06:57:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oio2h9FrltPpSbNp1YXvGg2kp+VPCmoEOy/WrvgF5gE=; b=FAfiS0dksdxJTufX1VUdTHJTvVLNUxJpzn1vycZDGNiHY02EdLPhgQH6taEUvP4d8f 5F1iJPKJ1FXXXV5ktTHNgTxuq5tgMN0VCLPyRCDu2vIJQRPwypNRkzvyc8TasTsSdGr0 YixMWuzFS4/zXyJ1ZtVNE2sqVImFY95hbLkfwhtu767q6PC8I94ldIYnI3G6T7wRlbot orSB4b4S9KRId8MdAXIGbYFzR6WsuI3NB2nDbowEG87gBgOrEqmWWgxcAA7vke8aXVwr mlOExzTfHBcAVsiyrjzhuWoslG6Vco2hU5opMrEPOkdDTvoC89Cj4i8jpKNvj84plQ9a Xpjg== X-Gm-Message-State: ALoCoQke4wz3C8n2d2vq8EKjK9jrO6pkVdDTOEMh6IzrNdRyXAfHwzWRXM9n+t0DDWB0bUArdzXr X-Received: by 10.180.77.225 with SMTP id v1mr13140687wiw.5.1400507823051; Mon, 19 May 2014 06:57:03 -0700 (PDT) Received: from glumotte.dev.6wind.com (6wind.net2.nerim.net. [213.41.180.237]) by mx.google.com with ESMTPSA id t18sm15201828wiv.16.2014.05.19.06.57.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 May 2014 06:57:01 -0700 (PDT) From: Olivier Matz To: dev@dpdk.org Date: Mon, 19 May 2014 15:56:20 +0200 Message-Id: <1400507789-18453-9-git-send-email-olivier.matz@6wind.com> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1400507789-18453-1-git-send-email-olivier.matz@6wind.com> References: <1400507789-18453-1-git-send-email-olivier.matz@6wind.com> Subject: [dpdk-dev] [PATCH v2 08/17] mbuf: add functions to get the name of an ol_flag X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 May 2014 13:56:54 -0000 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 --- app/test-pmd/rxonly.c | 33 ++++++++++-------------------- lib/librte_mbuf/rte_mbuf.h | 50 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 58 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 cb0a293..7556a86 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -99,9 +99,55 @@ 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. Usually only one bit must be set. + * Sevearl bits can be given if they bleong to the same mask. + * Ex: PKT_TX_L4_MASK. + * @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. Usually only one bit must be set. + * Sevearl bits can be given if they bleong to the same mask. + * Ex: PKT_TX_L4_MASK. + * @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