From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.tuxdriver.com (charlotte.tuxdriver.com [70.61.120.58]) by dpdk.org (Postfix) with ESMTP id 7404B592B for ; Fri, 22 May 2015 12:10:08 +0200 (CEST) Received: from hmsreliant.think-freely.org ([2001:470:8:a08:7aac:c0ff:fec2:933b] helo=localhost) by smtp.tuxdriver.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.63) (envelope-from ) id 1Yvjtu-0004UR-KD; Fri, 22 May 2015 06:10:06 -0400 Date: Fri, 22 May 2015 06:09:57 -0400 From: Neil Horman To: Helin Zhang Message-ID: <20150522100957.GA22506@hmsreliant.think-freely.org> References: <1425042696-23162-1-git-send-email-helin.zhang@intel.com> <1432284264-17376-1-git-send-email-helin.zhang@intel.com> <1432284264-17376-2-git-send-email-helin.zhang@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1432284264-17376-2-git-send-email-helin.zhang@intel.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Score: -2.9 (--) X-Spam-Status: No Cc: dev@dpdk.org Subject: Re: [dpdk-dev] [PATCH v5 01/18] mbuf: redefine packet_type in rte_mbuf 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: Fri, 22 May 2015 10:10:09 -0000 On Fri, May 22, 2015 at 04:44:07PM +0800, Helin Zhang wrote: > In order to unify the packet type, the field of 'packet_type' in > 'struct rte_mbuf' needs to be extended from 16 to 32 bits. > Accordingly, some fields in 'struct rte_mbuf' are re-organized to > support this change for Vector PMD. As 'struct rte_kni_mbuf' for > KNI should be right mapped to 'struct rte_mbuf', it should be > modified accordingly. In addition, Vector PMD of ixgbe is disabled > by default, as 'struct rte_mbuf' changed. > > Signed-off-by: Helin Zhang > Signed-off-by: Cunming Liang > --- > config/common_linuxapp | 2 +- > .../linuxapp/eal/include/exec-env/rte_kni_common.h | 4 ++-- > lib/librte_mbuf/rte_mbuf.h | 23 +++++++++++++++------- > 3 files changed, 19 insertions(+), 10 deletions(-) > > v2 changes: > * Enlarged the packet_type field from 16 bits to 32 bits. > * Redefined the packet type sub-fields. > * Updated the 'struct rte_kni_mbuf' for KNI according to the mbuf changes. > > v3 changes: > * Put the mbuf layout changes into a single patch. > * Disabled vector ixgbe PMD by default, as mbuf layout changed. > > v5 changes: > * Re-worded the commit logs. > > diff --git a/config/common_linuxapp b/config/common_linuxapp > index 0078dc9..6b067c7 100644 > --- a/config/common_linuxapp > +++ b/config/common_linuxapp > @@ -167,7 +167,7 @@ CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX_FREE=n > CONFIG_RTE_LIBRTE_IXGBE_DEBUG_DRIVER=n > CONFIG_RTE_LIBRTE_IXGBE_PF_DISABLE_STRIP_CRC=n > CONFIG_RTE_LIBRTE_IXGBE_RX_ALLOW_BULK_ALLOC=y > -CONFIG_RTE_IXGBE_INC_VECTOR=y > +CONFIG_RTE_IXGBE_INC_VECTOR=n > CONFIG_RTE_IXGBE_RX_OLFLAGS_ENABLE=y > > # > diff --git a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h > index 1e55c2d..bd1cc09 100644 > --- a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h > +++ b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h > @@ -117,9 +117,9 @@ struct rte_kni_mbuf { > uint16_t data_off; /**< Start address of data in segment buffer. */ > char pad1[4]; > uint64_t ol_flags; /**< Offload features. */ > - char pad2[2]; > - uint16_t data_len; /**< Amount of data in segment buffer. */ > + char pad2[4]; > uint32_t pkt_len; /**< Total pkt len: sum of all segment data_len. */ > + uint16_t data_len; /**< Amount of data in segment buffer. */ > > /* fields on second cache line */ > char pad3[8] __attribute__((__aligned__(RTE_CACHE_LINE_SIZE))); > diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h > index ab6de67..c2b1463 100644 > --- a/lib/librte_mbuf/rte_mbuf.h > +++ b/lib/librte_mbuf/rte_mbuf.h > @@ -269,17 +269,26 @@ struct rte_mbuf { > /* remaining bytes are set on RX when pulling packet from descriptor */ > MARKER rx_descriptor_fields1; > > - /** > - * The packet type, which is used to indicate ordinary packet and also > - * tunneled packet format, i.e. each number is represented a type of > - * packet. > + /* > + * The packet type, which is the combination of outer/inner L2, L3, L4 > + * and tunnel types. > */ > - uint16_t packet_type; > + union { > + uint32_t packet_type; /**< L2/L3/L4 and tunnel information. */ > + struct { > + uint32_t l2_type:4; /**< (Outer) L2 type. */ > + uint32_t l3_type:4; /**< (Outer) L3 type. */ > + uint32_t l4_type:4; /**< (Outer) L4 type. */ > + uint32_t tun_type:4; /**< Tunnel type. */ > + uint32_t inner_l2_type:4; /**< Inner L2 type. */ > + uint32_t inner_l3_type:4; /**< Inner L3 type. */ > + uint32_t inner_l4_type:4; /**< Inner L4 type. */ > + }; > + }; > > - uint16_t data_len; /**< Amount of data in segment buffer. */ > uint32_t pkt_len; /**< Total pkt len: sum of all segments. */ > + uint16_t data_len; /**< Amount of data in segment buffer. */ > uint16_t vlan_tci; /**< VLAN Tag Control Identifier (CPU order) */ > - uint16_t reserved; > union { > uint32_t rss; /**< RSS hash result if RSS enabled */ > struct { ABI Compatibility process? Neil