From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 8A8277FDA for ; Mon, 17 Nov 2014 11:25:20 +0100 (CET) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 17 Nov 2014 02:35:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,402,1413270000"; d="scan'208";a="623502177" Received: from bricha3-mobl3.ger.corp.intel.com ([10.243.20.33]) by fmsmga001.fm.intel.com with SMTP; 17 Nov 2014 02:35:32 -0800 Received: by (sSMTP sendmail emulation); Mon, 17 Nov 2014 10:35:30 +0025 Date: Mon, 17 Nov 2014 10:35:30 +0000 From: Bruce Richardson To: Olivier Matz Message-ID: <20141117103530.GA2472@bricha3-MOBL3> References: <1415635166-1364-1-git-send-email-olivier.matz@6wind.com> <1415984609-2484-1-git-send-email-olivier.matz@6wind.com> <1415984609-2484-6-git-send-email-olivier.matz@6wind.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1415984609-2484-6-git-send-email-olivier.matz@6wind.com> Organization: Intel Shannon Ltd. User-Agent: Mutt/1.5.23 (2014-03-12) Cc: dev@dpdk.org, jigsaw@gmail.com Subject: Re: [dpdk-dev] [PATCH v2 05/13] mbuf: remove too specific PKT_TX_OFFLOAD_MASK definition 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, 17 Nov 2014 10:25:21 -0000 On Fri, Nov 14, 2014 at 06:03:21PM +0100, Olivier Matz wrote: > This definition is specific to Intel PMD drivers and its definition > "indicate what bits required for building TX context" shows that it > should not be in the generic rte_mbuf.h but in the PMD driver. > > Signed-off-by: Olivier Matz Acked-by: Bruce Richardson > --- > lib/librte_mbuf/rte_mbuf.h | 5 ----- > lib/librte_pmd_e1000/igb_rxtx.c | 8 +++++++- > lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 8 +++++++- > 3 files changed, 14 insertions(+), 7 deletions(-) > > diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h > index d7070e9..68fb988 100644 > --- a/lib/librte_mbuf/rte_mbuf.h > +++ b/lib/librte_mbuf/rte_mbuf.h > @@ -129,11 +129,6 @@ extern "C" { > /* Use final bit of flags to indicate a control mbuf */ > #define CTRL_MBUF_FLAG (1ULL << 63) /**< Mbuf contains control data */ > > -/** > - * Bit Mask to indicate what bits required for building TX context > - */ > -#define PKT_TX_OFFLOAD_MASK (PKT_TX_VLAN_PKT | PKT_TX_IP_CKSUM | PKT_TX_L4_MASK) > - > /* define a set of marker types that can be used to refer to set points in the > * mbuf */ > typedef void *MARKER[0]; /**< generic marker for a point in a structure */ > diff --git a/lib/librte_pmd_e1000/igb_rxtx.c b/lib/librte_pmd_e1000/igb_rxtx.c > index b406397..433c616 100644 > --- a/lib/librte_pmd_e1000/igb_rxtx.c > +++ b/lib/librte_pmd_e1000/igb_rxtx.c > @@ -84,6 +84,12 @@ > ETH_RSS_IPV6_UDP | \ > ETH_RSS_IPV6_UDP_EX) > > +/* Bit Mask to indicate what bits required for building TX context */ > +#define IGB_TX_OFFLOAD_MASK ( \ > + PKT_TX_VLAN_PKT | \ > + PKT_TX_IP_CKSUM | \ > + PKT_TX_L4_MASK) > + > static inline struct rte_mbuf * > rte_rxmbuf_alloc(struct rte_mempool *mp) > { > @@ -400,7 +406,7 @@ eth_igb_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, > ol_flags = tx_pkt->ol_flags; > vlan_macip_lens.f.vlan_tci = tx_pkt->vlan_tci; > vlan_macip_lens.f.l2_l3_len = tx_pkt->l2_l3_len; > - tx_ol_req = ol_flags & PKT_TX_OFFLOAD_MASK; > + tx_ol_req = ol_flags & IGB_TX_OFFLOAD_MASK; > > /* If a Context Descriptor need be built . */ > if (tx_ol_req) { > diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c > index 7e470ce..ca35db2 100644 > --- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c > +++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c > @@ -90,6 +90,12 @@ > ETH_RSS_IPV6_UDP | \ > ETH_RSS_IPV6_UDP_EX) > > +/* Bit Mask to indicate what bits required for building TX context */ > +#define IXGBE_TX_OFFLOAD_MASK ( \ > + PKT_TX_VLAN_PKT | \ > + PKT_TX_IP_CKSUM | \ > + PKT_TX_L4_MASK) > + > static inline struct rte_mbuf * > rte_rxmbuf_alloc(struct rte_mempool *mp) > { > @@ -580,7 +586,7 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, > ol_flags = tx_pkt->ol_flags; > > /* If hardware offload required */ > - tx_ol_req = ol_flags & PKT_TX_OFFLOAD_MASK; > + tx_ol_req = ol_flags & IXGBE_TX_OFFLOAD_MASK; > if (tx_ol_req) { > vlan_macip_lens.f.vlan_tci = tx_pkt->vlan_tci; > vlan_macip_lens.f.l2_l3_len = tx_pkt->l2_l3_len; > -- > 2.1.0 >