Message ID | 1412090762-18852-1-git-send-email-bruce.richardson@intel.com (mailing list archive) |
---|---|
State | RFC, archived |
Headers |
Return-Path: <dev-bounces@dpdk.org> X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 156F46A92; Tue, 30 Sep 2014 17:20:46 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 102796A8B for <dev@dpdk.org>; Tue, 30 Sep 2014 17:20:43 +0200 (CEST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 30 Sep 2014 08:26:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.04,627,1406617200"; d="scan'208";a="607615407" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga002.fm.intel.com with ESMTP; 30 Sep 2014 08:26:03 -0700 Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id s8UFQ2kn001926; Tue, 30 Sep 2014 16:26:02 +0100 Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id s8UFQ2rA018887; Tue, 30 Sep 2014 16:26:02 +0100 Received: (from bricha3@localhost) by sivswdev02.ir.intel.com with id s8UFQ2GA018883; Tue, 30 Sep 2014 16:26:02 +0100 From: Bruce Richardson <bruce.richardson@intel.com> To: dev@dpdk.org Date: Tue, 30 Sep 2014 16:26:02 +0100 Message-Id: <1412090762-18852-1-git-send-email-bruce.richardson@intel.com> X-Mailer: git-send-email 1.7.4.1 Subject: [dpdk-dev] [PATCH RFC] mbuf: Adjust TX flags to start at bit 32 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK <dev.dpdk.org> List-Unsubscribe: <http://dpdk.org/ml/options/dev>, <mailto:dev-request@dpdk.org?subject=unsubscribe> List-Archive: <http://dpdk.org/ml/archives/dev/> List-Post: <mailto:dev@dpdk.org> List-Help: <mailto:dev-request@dpdk.org?subject=help> List-Subscribe: <http://dpdk.org/ml/listinfo/dev>, <mailto:dev-request@dpdk.org?subject=subscribe> Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org> |
Commit Message
Bruce Richardson
Sept. 30, 2014, 3:26 p.m. UTC
This patch takes the existing TX flags defined for the mbuf and shifts
each uniquely defined one left so that additional RX flags can be
defined without having RX and TX flags mixed together.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
lib/librte_mbuf/rte_mbuf.h | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
Comments
On Tue, Sep 30, 2014 at 04:26:02PM +0100, Bruce Richardson wrote: > This patch takes the existing TX flags defined for the mbuf and shifts > each uniquely defined one left so that additional RX flags can be > defined without having RX and TX flags mixed together. > > Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> > --- This is just an RFC patch for now, as I'm looking for input to make sure this is done right. Couple of opens, if people have input: * is a 32/32 split for RX/TX flags appropriate? Are we likely to have about equal numbers of each? * Doing a grep for the TX flag use, it seems the defines are commonly used, but if anyone is aware of anywhere where the code depends on the flags having a particular value, please let me know. If I have time, I also hope to look at doing rework on the testpmd flag handling based off Olivier's previous patches, but since that is not affecting the public ABI, I consider it a bit lower priority. Thanks, /Bruce > lib/librte_mbuf/rte_mbuf.h | 26 +++++++++++++------------- > 1 file changed, 13 insertions(+), 13 deletions(-) > > diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h > index 1c6e115..c9fc4ec 100644 > --- a/lib/librte_mbuf/rte_mbuf.h > +++ b/lib/librte_mbuf/rte_mbuf.h > @@ -86,26 +86,26 @@ extern "C" { > #define PKT_RX_IEEE1588_PTP 0x0200 /**< RX IEEE1588 L2 Ethernet PT Packet. */ > #define PKT_RX_IEEE1588_TMST 0x0400 /**< RX IEEE1588 L2/L4 timestamped packet.*/ > > -#define PKT_TX_VLAN_PKT 0x0800 /**< TX packet is a 802.1q VLAN packet. */ > -#define PKT_TX_IP_CKSUM 0x1000 /**< IP cksum of TX pkt. computed by NIC. */ > -#define PKT_TX_IPV4_CSUM 0x1000 /**< Alias of PKT_TX_IP_CKSUM. */ > -#define PKT_TX_IPV4 PKT_RX_IPV4_HDR /**< IPv4 with no IP checksum offload. */ > -#define PKT_TX_IPV6 PKT_RX_IPV6_HDR /**< IPv6 packet */ > +#define PKT_TX_VLAN_PKT (0x0001 << 32) /**< TX packet is a 802.1q VLAN packet. */ > +#define PKT_TX_IP_CKSUM (0x0002 << 32) /**< IP cksum of TX pkt. computed by NIC. */ > +#define PKT_TX_IPV4_CSUM PKT_TX_IP_CKSUM /**< Alias of PKT_TX_IP_CKSUM. */ > +#define PKT_TX_IPV4 PKT_RX_IPV4_HDR /**< IPv4 with no IP checksum offload. */ > +#define PKT_TX_IPV6 PKT_RX_IPV6_HDR /**< IPv6 packet */ > > /* > - * Bit 14~13 used for L4 packet type with checksum enabled. > + * Bit 35~34 used for L4 packet type with checksum enabled. > * 00: Reserved > * 01: TCP checksum > * 10: SCTP checksum > * 11: UDP checksum > */ > -#define PKT_TX_L4_MASK 0x6000 /**< Mask bits for L4 checksum offload request. */ > -#define PKT_TX_L4_NO_CKSUM 0x0000 /**< Disable L4 cksum of TX pkt. */ > -#define PKT_TX_TCP_CKSUM 0x2000 /**< TCP cksum of TX pkt. computed by NIC. */ > -#define PKT_TX_SCTP_CKSUM 0x4000 /**< SCTP cksum of TX pkt. computed by NIC. */ > -#define PKT_TX_UDP_CKSUM 0x6000 /**< UDP cksum of TX pkt. computed by NIC. */ > -/* Bit 15 */ > -#define PKT_TX_IEEE1588_TMST 0x8000 /**< TX IEEE1588 packet to timestamp. */ > +#define PKT_TX_L4_NO_CKSUM (0x0000 << 32) /**< Disable L4 cksum of TX pkt. */ > +#define PKT_TX_TCP_CKSUM (0x0004 << 32) /**< TCP cksum of TX pkt. computed by NIC. */ > +#define PKT_TX_SCTP_CKSUM (0x0008 << 32) /**< SCTP cksum of TX pkt. computed by NIC. */ > +#define PKT_TX_UDP_CKSUM (0x000C << 32) /**< UDP cksum of TX pkt. computed by NIC. */ > +#define PKT_TX_L4_MASK (0x000C << 32) /**< Mask for L4 cksum offload request. */ > +/* Bit 36 */ > +#define PKT_TX_IEEE1588_TMST (0x0010 << 32) /**< TX IEEE1588 packet to timestamp. */ > > /* Use final bit of flags to indicate a control mbuf */ > #define CTRL_MBUF_FLAG (1ULL << 63) > -- > 1.9.3 >
Hi Bruce, I like the idea of the split, which should make it easier to do the testing of those bits. One comment below. On Sep 30, 2014, at 10:33 AM, Bruce Richardson <bruce.richardson@intel.com> wrote: > On Tue, Sep 30, 2014 at 04:26:02PM +0100, Bruce Richardson wrote: >> This patch takes the existing TX flags defined for the mbuf and shifts >> each uniquely defined one left so that additional RX flags can be >> defined without having RX and TX flags mixed together. >> >> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> >> --- > > This is just an RFC patch for now, as I'm looking for input to make sure > this is done right. Couple of opens, if people have input: > * is a 32/32 split for RX/TX flags appropriate? Are we likely to have about > equal numbers of each? > * Doing a grep for the TX flag use, it seems the defines are commonly used, > but if anyone is aware of anywhere where the code depends on the flags > having a particular value, please let me know. > > If I have time, I also hope to look at doing rework on the testpmd flag > handling based off Olivier's previous patches, but since that is not > affecting the public ABI, I consider it a bit lower priority. > > Thanks, > /Bruce > >> lib/librte_mbuf/rte_mbuf.h | 26 +++++++++++++------------- >> 1 file changed, 13 insertions(+), 13 deletions(-) >> >> diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h >> index 1c6e115..c9fc4ec 100644 >> --- a/lib/librte_mbuf/rte_mbuf.h >> +++ b/lib/librte_mbuf/rte_mbuf.h >> @@ -86,26 +86,26 @@ extern "C" { >> #define PKT_RX_IEEE1588_PTP 0x0200 /**< RX IEEE1588 L2 Ethernet PT Packet. */ >> #define PKT_RX_IEEE1588_TMST 0x0400 /**< RX IEEE1588 L2/L4 timestamped packet.*/ >> >> -#define PKT_TX_VLAN_PKT 0x0800 /**< TX packet is a 802.1q VLAN packet. */ >> -#define PKT_TX_IP_CKSUM 0x1000 /**< IP cksum of TX pkt. computed by NIC. */ >> -#define PKT_TX_IPV4_CSUM 0x1000 /**< Alias of PKT_TX_IP_CKSUM. */ >> -#define PKT_TX_IPV4 PKT_RX_IPV4_HDR /**< IPv4 with no IP checksum offload. */ >> -#define PKT_TX_IPV6 PKT_RX_IPV6_HDR /**< IPv6 packet */ >> +#define PKT_TX_VLAN_PKT (0x0001 << 32) /**< TX packet is a 802.1q VLAN packet. */ >> +#define PKT_TX_IP_CKSUM (0x0002 << 32) /**< IP cksum of TX pkt. computed by NIC. */ One little nit in the patch is does (0x0001 << 32) need to be (0x0001ULL << 32)? I have not tested it and just a thought. Thanks ++Keith >> +#define PKT_TX_IPV4_CSUM PKT_TX_IP_CKSUM /**< Alias of PKT_TX_IP_CKSUM. */ >> +#define PKT_TX_IPV4 PKT_RX_IPV4_HDR /**< IPv4 with no IP checksum offload. */ >> +#define PKT_TX_IPV6 PKT_RX_IPV6_HDR /**< IPv6 packet */ >> >> /* >> - * Bit 14~13 used for L4 packet type with checksum enabled. >> + * Bit 35~34 used for L4 packet type with checksum enabled. >> * 00: Reserved >> * 01: TCP checksum >> * 10: SCTP checksum >> * 11: UDP checksum >> */ >> -#define PKT_TX_L4_MASK 0x6000 /**< Mask bits for L4 checksum offload request. */ >> -#define PKT_TX_L4_NO_CKSUM 0x0000 /**< Disable L4 cksum of TX pkt. */ >> -#define PKT_TX_TCP_CKSUM 0x2000 /**< TCP cksum of TX pkt. computed by NIC. */ >> -#define PKT_TX_SCTP_CKSUM 0x4000 /**< SCTP cksum of TX pkt. computed by NIC. */ >> -#define PKT_TX_UDP_CKSUM 0x6000 /**< UDP cksum of TX pkt. computed by NIC. */ >> -/* Bit 15 */ >> -#define PKT_TX_IEEE1588_TMST 0x8000 /**< TX IEEE1588 packet to timestamp. */ >> +#define PKT_TX_L4_NO_CKSUM (0x0000 << 32) /**< Disable L4 cksum of TX pkt. */ >> +#define PKT_TX_TCP_CKSUM (0x0004 << 32) /**< TCP cksum of TX pkt. computed by NIC. */ >> +#define PKT_TX_SCTP_CKSUM (0x0008 << 32) /**< SCTP cksum of TX pkt. computed by NIC. */ >> +#define PKT_TX_UDP_CKSUM (0x000C << 32) /**< UDP cksum of TX pkt. computed by NIC. */ >> +#define PKT_TX_L4_MASK (0x000C << 32) /**< Mask for L4 cksum offload request. */ >> +/* Bit 36 */ >> +#define PKT_TX_IEEE1588_TMST (0x0010 << 32) /**< TX IEEE1588 packet to timestamp. */ >> >> /* Use final bit of flags to indicate a control mbuf */ >> #define CTRL_MBUF_FLAG (1ULL << 63) >> -- >> 1.9.3 >> Keith Wiles, Principal Technologist with CTO office, Wind River mobile 972-213-5533
On Tue, Sep 30, 2014 at 05:00:04PM +0100, Wiles, Roger Keith wrote: > Hi Bruce, > > I like the idea of the split, which should make it easier to do the testing of those bits. > One comment below. > > On Sep 30, 2014, at 10:33 AM, Bruce Richardson <bruce.richardson@intel.com> wrote: > > > On Tue, Sep 30, 2014 at 04:26:02PM +0100, Bruce Richardson wrote: > >> This patch takes the existing TX flags defined for the mbuf and shifts > >> each uniquely defined one left so that additional RX flags can be > >> defined without having RX and TX flags mixed together. > >> > >> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> > >> --- > > > > This is just an RFC patch for now, as I'm looking for input to make sure > > this is done right. Couple of opens, if people have input: > > * is a 32/32 split for RX/TX flags appropriate? Are we likely to have about > > equal numbers of each? > > * Doing a grep for the TX flag use, it seems the defines are commonly used, > > but if anyone is aware of anywhere where the code depends on the flags > > having a particular value, please let me know. > > > > If I have time, I also hope to look at doing rework on the testpmd flag > > handling based off Olivier's previous patches, but since that is not > > affecting the public ABI, I consider it a bit lower priority. > > > > Thanks, > > /Bruce > > > >> lib/librte_mbuf/rte_mbuf.h | 26 +++++++++++++------------- > >> 1 file changed, 13 insertions(+), 13 deletions(-) > >> > >> diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h > >> index 1c6e115..c9fc4ec 100644 > >> --- a/lib/librte_mbuf/rte_mbuf.h > >> +++ b/lib/librte_mbuf/rte_mbuf.h > >> @@ -86,26 +86,26 @@ extern "C" { > >> #define PKT_RX_IEEE1588_PTP 0x0200 /**< RX IEEE1588 L2 Ethernet PT Packet. */ > >> #define PKT_RX_IEEE1588_TMST 0x0400 /**< RX IEEE1588 L2/L4 timestamped packet.*/ > >> > >> -#define PKT_TX_VLAN_PKT 0x0800 /**< TX packet is a 802.1q VLAN packet. */ > >> -#define PKT_TX_IP_CKSUM 0x1000 /**< IP cksum of TX pkt. computed by NIC. */ > >> -#define PKT_TX_IPV4_CSUM 0x1000 /**< Alias of PKT_TX_IP_CKSUM. */ > >> -#define PKT_TX_IPV4 PKT_RX_IPV4_HDR /**< IPv4 with no IP checksum offload. */ > >> -#define PKT_TX_IPV6 PKT_RX_IPV6_HDR /**< IPv6 packet */ > >> +#define PKT_TX_VLAN_PKT (0x0001 << 32) /**< TX packet is a 802.1q VLAN packet. */ > >> +#define PKT_TX_IP_CKSUM (0x0002 << 32) /**< IP cksum of TX pkt. computed by NIC. */ > > One little nit in the patch is does (0x0001 << 32) need to be (0x0001ULL << 32)? I have not tested it and just a thought. Yes, indeed it does, good catch! /Bruce > > Thanks > ++Keith > >> +#define PKT_TX_IPV4_CSUM PKT_TX_IP_CKSUM /**< Alias of PKT_TX_IP_CKSUM. */ > >> +#define PKT_TX_IPV4 PKT_RX_IPV4_HDR /**< IPv4 with no IP checksum offload. */ > >> +#define PKT_TX_IPV6 PKT_RX_IPV6_HDR /**< IPv6 packet */ > >> > >> /* > >> - * Bit 14~13 used for L4 packet type with checksum enabled. > >> + * Bit 35~34 used for L4 packet type with checksum enabled. > >> * 00: Reserved > >> * 01: TCP checksum > >> * 10: SCTP checksum > >> * 11: UDP checksum > >> */ > >> -#define PKT_TX_L4_MASK 0x6000 /**< Mask bits for L4 checksum offload request. */ > >> -#define PKT_TX_L4_NO_CKSUM 0x0000 /**< Disable L4 cksum of TX pkt. */ > >> -#define PKT_TX_TCP_CKSUM 0x2000 /**< TCP cksum of TX pkt. computed by NIC. */ > >> -#define PKT_TX_SCTP_CKSUM 0x4000 /**< SCTP cksum of TX pkt. computed by NIC. */ > >> -#define PKT_TX_UDP_CKSUM 0x6000 /**< UDP cksum of TX pkt. computed by NIC. */ > >> -/* Bit 15 */ > >> -#define PKT_TX_IEEE1588_TMST 0x8000 /**< TX IEEE1588 packet to timestamp. */ > >> +#define PKT_TX_L4_NO_CKSUM (0x0000 << 32) /**< Disable L4 cksum of TX pkt. */ > >> +#define PKT_TX_TCP_CKSUM (0x0004 << 32) /**< TCP cksum of TX pkt. computed by NIC. */ > >> +#define PKT_TX_SCTP_CKSUM (0x0008 << 32) /**< SCTP cksum of TX pkt. computed by NIC. */ > >> +#define PKT_TX_UDP_CKSUM (0x000C << 32) /**< UDP cksum of TX pkt. computed by NIC. */ > >> +#define PKT_TX_L4_MASK (0x000C << 32) /**< Mask for L4 cksum offload request. */ > >> +/* Bit 36 */ > >> +#define PKT_TX_IEEE1588_TMST (0x0010 << 32) /**< TX IEEE1588 packet to timestamp. */ > >> > >> /* Use final bit of flags to indicate a control mbuf */ > >> #define CTRL_MBUF_FLAG (1ULL << 63) > >> -- > >> 1.9.3 > >> > > Keith Wiles, Principal Technologist with CTO office, Wind River mobile 972-213-5533 >
On Tue, Sep 30, 2014 at 04:26:02PM +0100, Bruce Richardson wrote: > This patch takes the existing TX flags defined for the mbuf and shifts > each uniquely defined one left so that additional RX flags can be > defined without having RX and TX flags mixed together. > > Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> > --- > lib/librte_mbuf/rte_mbuf.h | 26 +++++++++++++------------- > 1 file changed, 13 insertions(+), 13 deletions(-) > > diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h > index 1c6e115..c9fc4ec 100644 > --- a/lib/librte_mbuf/rte_mbuf.h > +++ b/lib/librte_mbuf/rte_mbuf.h > @@ -86,26 +86,26 @@ extern "C" { > #define PKT_RX_IEEE1588_PTP 0x0200 /**< RX IEEE1588 L2 Ethernet PT Packet. */ > #define PKT_RX_IEEE1588_TMST 0x0400 /**< RX IEEE1588 L2/L4 timestamped packet.*/ > > -#define PKT_TX_VLAN_PKT 0x0800 /**< TX packet is a 802.1q VLAN packet. */ > -#define PKT_TX_IP_CKSUM 0x1000 /**< IP cksum of TX pkt. computed by NIC. */ > -#define PKT_TX_IPV4_CSUM 0x1000 /**< Alias of PKT_TX_IP_CKSUM. */ > -#define PKT_TX_IPV4 PKT_RX_IPV4_HDR /**< IPv4 with no IP checksum offload. */ > -#define PKT_TX_IPV6 PKT_RX_IPV6_HDR /**< IPv6 packet */ > +#define PKT_TX_VLAN_PKT (0x0001 << 32) /**< TX packet is a 802.1q VLAN packet. */ > +#define PKT_TX_IP_CKSUM (0x0002 << 32) /**< IP cksum of TX pkt. computed by NIC. */ > +#define PKT_TX_IPV4_CSUM PKT_TX_IP_CKSUM /**< Alias of PKT_TX_IP_CKSUM. */ > +#define PKT_TX_IPV4 PKT_RX_IPV4_HDR /**< IPv4 with no IP checksum offload. */ > +#define PKT_TX_IPV6 PKT_RX_IPV6_HDR /**< IPv6 packet */ > > /* > - * Bit 14~13 used for L4 packet type with checksum enabled. > + * Bit 35~34 used for L4 packet type with checksum enabled. > * 00: Reserved > * 01: TCP checksum > * 10: SCTP checksum > * 11: UDP checksum > */ > -#define PKT_TX_L4_MASK 0x6000 /**< Mask bits for L4 checksum offload request. */ > -#define PKT_TX_L4_NO_CKSUM 0x0000 /**< Disable L4 cksum of TX pkt. */ > -#define PKT_TX_TCP_CKSUM 0x2000 /**< TCP cksum of TX pkt. computed by NIC. */ > -#define PKT_TX_SCTP_CKSUM 0x4000 /**< SCTP cksum of TX pkt. computed by NIC. */ > -#define PKT_TX_UDP_CKSUM 0x6000 /**< UDP cksum of TX pkt. computed by NIC. */ > -/* Bit 15 */ > -#define PKT_TX_IEEE1588_TMST 0x8000 /**< TX IEEE1588 packet to timestamp. */ > +#define PKT_TX_L4_NO_CKSUM (0x0000 << 32) /**< Disable L4 cksum of TX pkt. */ > +#define PKT_TX_TCP_CKSUM (0x0004 << 32) /**< TCP cksum of TX pkt. computed by NIC. */ > +#define PKT_TX_SCTP_CKSUM (0x0008 << 32) /**< SCTP cksum of TX pkt. computed by NIC. */ > +#define PKT_TX_UDP_CKSUM (0x000C << 32) /**< UDP cksum of TX pkt. computed by NIC. */ > +#define PKT_TX_L4_MASK (0x000C << 32) /**< Mask for L4 cksum offload request. */ > +/* Bit 36 */ > +#define PKT_TX_IEEE1588_TMST (0x0010 << 32) /**< TX IEEE1588 packet to timestamp. */ > > /* Use final bit of flags to indicate a control mbuf */ > #define CTRL_MBUF_FLAG (1ULL << 63) > -- > 1.9.3 > > I'm not opposed to the patch at all, but I would like to point out that this is the sort of change that breaks ABI very easily (which is fine right now given the mbuf changes already staged for the release, but still something to be aware of). As such, are there advantages to this patch (other than the niceness of human readability)? If we're going to reshuffle these flags now, it might be nice to start tx flags at the most significant bit and count back, and start rx flags at the least significant bit and count up. That would ensure that we don't reserve flags for a direction without need. Best Neil
On Tue, Sep 30, 2014 at 01:06:32PM -0400, Neil Horman wrote: > On Tue, Sep 30, 2014 at 04:26:02PM +0100, Bruce Richardson wrote: > > This patch takes the existing TX flags defined for the mbuf and shifts > > each uniquely defined one left so that additional RX flags can be > > defined without having RX and TX flags mixed together. > > > > Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> > > --- > > lib/librte_mbuf/rte_mbuf.h | 26 +++++++++++++------------- > > 1 file changed, 13 insertions(+), 13 deletions(-) > > > > diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h > > index 1c6e115..c9fc4ec 100644 > > --- a/lib/librte_mbuf/rte_mbuf.h > > +++ b/lib/librte_mbuf/rte_mbuf.h > > @@ -86,26 +86,26 @@ extern "C" { > > #define PKT_RX_IEEE1588_PTP 0x0200 /**< RX IEEE1588 L2 Ethernet PT Packet. */ > > #define PKT_RX_IEEE1588_TMST 0x0400 /**< RX IEEE1588 L2/L4 timestamped packet.*/ > > > > -#define PKT_TX_VLAN_PKT 0x0800 /**< TX packet is a 802.1q VLAN packet. */ > > -#define PKT_TX_IP_CKSUM 0x1000 /**< IP cksum of TX pkt. computed by NIC. */ > > -#define PKT_TX_IPV4_CSUM 0x1000 /**< Alias of PKT_TX_IP_CKSUM. */ > > -#define PKT_TX_IPV4 PKT_RX_IPV4_HDR /**< IPv4 with no IP checksum offload. */ > > -#define PKT_TX_IPV6 PKT_RX_IPV6_HDR /**< IPv6 packet */ > > +#define PKT_TX_VLAN_PKT (0x0001 << 32) /**< TX packet is a 802.1q VLAN packet. */ > > +#define PKT_TX_IP_CKSUM (0x0002 << 32) /**< IP cksum of TX pkt. computed by NIC. */ > > +#define PKT_TX_IPV4_CSUM PKT_TX_IP_CKSUM /**< Alias of PKT_TX_IP_CKSUM. */ > > +#define PKT_TX_IPV4 PKT_RX_IPV4_HDR /**< IPv4 with no IP checksum offload. */ > > +#define PKT_TX_IPV6 PKT_RX_IPV6_HDR /**< IPv6 packet */ > > > > /* > > - * Bit 14~13 used for L4 packet type with checksum enabled. > > + * Bit 35~34 used for L4 packet type with checksum enabled. > > * 00: Reserved > > * 01: TCP checksum > > * 10: SCTP checksum > > * 11: UDP checksum > > */ > > -#define PKT_TX_L4_MASK 0x6000 /**< Mask bits for L4 checksum offload request. */ > > -#define PKT_TX_L4_NO_CKSUM 0x0000 /**< Disable L4 cksum of TX pkt. */ > > -#define PKT_TX_TCP_CKSUM 0x2000 /**< TCP cksum of TX pkt. computed by NIC. */ > > -#define PKT_TX_SCTP_CKSUM 0x4000 /**< SCTP cksum of TX pkt. computed by NIC. */ > > -#define PKT_TX_UDP_CKSUM 0x6000 /**< UDP cksum of TX pkt. computed by NIC. */ > > -/* Bit 15 */ > > -#define PKT_TX_IEEE1588_TMST 0x8000 /**< TX IEEE1588 packet to timestamp. */ > > +#define PKT_TX_L4_NO_CKSUM (0x0000 << 32) /**< Disable L4 cksum of TX pkt. */ > > +#define PKT_TX_TCP_CKSUM (0x0004 << 32) /**< TCP cksum of TX pkt. computed by NIC. */ > > +#define PKT_TX_SCTP_CKSUM (0x0008 << 32) /**< SCTP cksum of TX pkt. computed by NIC. */ > > +#define PKT_TX_UDP_CKSUM (0x000C << 32) /**< UDP cksum of TX pkt. computed by NIC. */ > > +#define PKT_TX_L4_MASK (0x000C << 32) /**< Mask for L4 cksum offload request. */ > > +/* Bit 36 */ > > +#define PKT_TX_IEEE1588_TMST (0x0010 << 32) /**< TX IEEE1588 packet to timestamp. */ > > > > /* Use final bit of flags to indicate a control mbuf */ > > #define CTRL_MBUF_FLAG (1ULL << 63) > > -- > > 1.9.3 > > > > > > I'm not opposed to the patch at all, but I would like to point out that this is > the sort of change that breaks ABI very easily (which is fine right now given > the mbuf changes already staged for the release, but still something to be aware > of). As such, are there advantages to this patch (other than the niceness of > human readability)? > > If we're going to reshuffle these flags now, it might be nice to start tx flags > at the most significant bit and count back, and start rx flags at the least > significant bit and count up. That would ensure that we don't reserve flags for > a direction without need. > > Best > Neil > Good idea, though currently the most significant bit is being used as a flag to indicate a control mbuf. My thinking is that we may potentially need other flags that are not just for RX or TX, and to have those at the end. However, given that that is likely to be the exception case, perhaps we could reserve the last byte for non-RX/TX flags and then implement the scheme you suggest. What do you think? /Bruce
On Wed, Oct 01, 2014 at 09:47:21AM +0100, Bruce Richardson wrote: > On Tue, Sep 30, 2014 at 01:06:32PM -0400, Neil Horman wrote: > > On Tue, Sep 30, 2014 at 04:26:02PM +0100, Bruce Richardson wrote: > > > This patch takes the existing TX flags defined for the mbuf and shifts > > > each uniquely defined one left so that additional RX flags can be > > > defined without having RX and TX flags mixed together. > > > > > > Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> > > > --- > > > lib/librte_mbuf/rte_mbuf.h | 26 +++++++++++++------------- > > > 1 file changed, 13 insertions(+), 13 deletions(-) > > > > > > diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h > > > index 1c6e115..c9fc4ec 100644 > > > --- a/lib/librte_mbuf/rte_mbuf.h > > > +++ b/lib/librte_mbuf/rte_mbuf.h > > > @@ -86,26 +86,26 @@ extern "C" { > > > #define PKT_RX_IEEE1588_PTP 0x0200 /**< RX IEEE1588 L2 Ethernet PT Packet. */ > > > #define PKT_RX_IEEE1588_TMST 0x0400 /**< RX IEEE1588 L2/L4 timestamped packet.*/ > > > > > > -#define PKT_TX_VLAN_PKT 0x0800 /**< TX packet is a 802.1q VLAN packet. */ > > > -#define PKT_TX_IP_CKSUM 0x1000 /**< IP cksum of TX pkt. computed by NIC. */ > > > -#define PKT_TX_IPV4_CSUM 0x1000 /**< Alias of PKT_TX_IP_CKSUM. */ > > > -#define PKT_TX_IPV4 PKT_RX_IPV4_HDR /**< IPv4 with no IP checksum offload. */ > > > -#define PKT_TX_IPV6 PKT_RX_IPV6_HDR /**< IPv6 packet */ > > > +#define PKT_TX_VLAN_PKT (0x0001 << 32) /**< TX packet is a 802.1q VLAN packet. */ > > > +#define PKT_TX_IP_CKSUM (0x0002 << 32) /**< IP cksum of TX pkt. computed by NIC. */ > > > +#define PKT_TX_IPV4_CSUM PKT_TX_IP_CKSUM /**< Alias of PKT_TX_IP_CKSUM. */ > > > +#define PKT_TX_IPV4 PKT_RX_IPV4_HDR /**< IPv4 with no IP checksum offload. */ > > > +#define PKT_TX_IPV6 PKT_RX_IPV6_HDR /**< IPv6 packet */ > > > > > > /* > > > - * Bit 14~13 used for L4 packet type with checksum enabled. > > > + * Bit 35~34 used for L4 packet type with checksum enabled. > > > * 00: Reserved > > > * 01: TCP checksum > > > * 10: SCTP checksum > > > * 11: UDP checksum > > > */ > > > -#define PKT_TX_L4_MASK 0x6000 /**< Mask bits for L4 checksum offload request. */ > > > -#define PKT_TX_L4_NO_CKSUM 0x0000 /**< Disable L4 cksum of TX pkt. */ > > > -#define PKT_TX_TCP_CKSUM 0x2000 /**< TCP cksum of TX pkt. computed by NIC. */ > > > -#define PKT_TX_SCTP_CKSUM 0x4000 /**< SCTP cksum of TX pkt. computed by NIC. */ > > > -#define PKT_TX_UDP_CKSUM 0x6000 /**< UDP cksum of TX pkt. computed by NIC. */ > > > -/* Bit 15 */ > > > -#define PKT_TX_IEEE1588_TMST 0x8000 /**< TX IEEE1588 packet to timestamp. */ > > > +#define PKT_TX_L4_NO_CKSUM (0x0000 << 32) /**< Disable L4 cksum of TX pkt. */ > > > +#define PKT_TX_TCP_CKSUM (0x0004 << 32) /**< TCP cksum of TX pkt. computed by NIC. */ > > > +#define PKT_TX_SCTP_CKSUM (0x0008 << 32) /**< SCTP cksum of TX pkt. computed by NIC. */ > > > +#define PKT_TX_UDP_CKSUM (0x000C << 32) /**< UDP cksum of TX pkt. computed by NIC. */ > > > +#define PKT_TX_L4_MASK (0x000C << 32) /**< Mask for L4 cksum offload request. */ > > > +/* Bit 36 */ > > > +#define PKT_TX_IEEE1588_TMST (0x0010 << 32) /**< TX IEEE1588 packet to timestamp. */ > > > > > > /* Use final bit of flags to indicate a control mbuf */ > > > #define CTRL_MBUF_FLAG (1ULL << 63) > > > -- > > > 1.9.3 > > > > > > > > > > I'm not opposed to the patch at all, but I would like to point out that this is > > the sort of change that breaks ABI very easily (which is fine right now given > > the mbuf changes already staged for the release, but still something to be aware > > of). As such, are there advantages to this patch (other than the niceness of > > human readability)? > > > > If we're going to reshuffle these flags now, it might be nice to start tx flags > > at the most significant bit and count back, and start rx flags at the least > > significant bit and count up. That would ensure that we don't reserve flags for > > a direction without need. > > > > Best > > Neil > > > Good idea, though currently the most significant bit is being used as a flag > to indicate a control mbuf. My thinking is that we may potentially need > other flags that are not just for RX or TX, and to have those at the end. > However, given that that is likely to be the exception case, perhaps we > could reserve the last byte for non-RX/TX flags and then implement the > scheme you suggest. What do you think? > Sure, seems reasonable Neil > /Bruce >
diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index 1c6e115..c9fc4ec 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -86,26 +86,26 @@ extern "C" { #define PKT_RX_IEEE1588_PTP 0x0200 /**< RX IEEE1588 L2 Ethernet PT Packet. */ #define PKT_RX_IEEE1588_TMST 0x0400 /**< RX IEEE1588 L2/L4 timestamped packet.*/ -#define PKT_TX_VLAN_PKT 0x0800 /**< TX packet is a 802.1q VLAN packet. */ -#define PKT_TX_IP_CKSUM 0x1000 /**< IP cksum of TX pkt. computed by NIC. */ -#define PKT_TX_IPV4_CSUM 0x1000 /**< Alias of PKT_TX_IP_CKSUM. */ -#define PKT_TX_IPV4 PKT_RX_IPV4_HDR /**< IPv4 with no IP checksum offload. */ -#define PKT_TX_IPV6 PKT_RX_IPV6_HDR /**< IPv6 packet */ +#define PKT_TX_VLAN_PKT (0x0001 << 32) /**< TX packet is a 802.1q VLAN packet. */ +#define PKT_TX_IP_CKSUM (0x0002 << 32) /**< IP cksum of TX pkt. computed by NIC. */ +#define PKT_TX_IPV4_CSUM PKT_TX_IP_CKSUM /**< Alias of PKT_TX_IP_CKSUM. */ +#define PKT_TX_IPV4 PKT_RX_IPV4_HDR /**< IPv4 with no IP checksum offload. */ +#define PKT_TX_IPV6 PKT_RX_IPV6_HDR /**< IPv6 packet */ /* - * Bit 14~13 used for L4 packet type with checksum enabled. + * Bit 35~34 used for L4 packet type with checksum enabled. * 00: Reserved * 01: TCP checksum * 10: SCTP checksum * 11: UDP checksum */ -#define PKT_TX_L4_MASK 0x6000 /**< Mask bits for L4 checksum offload request. */ -#define PKT_TX_L4_NO_CKSUM 0x0000 /**< Disable L4 cksum of TX pkt. */ -#define PKT_TX_TCP_CKSUM 0x2000 /**< TCP cksum of TX pkt. computed by NIC. */ -#define PKT_TX_SCTP_CKSUM 0x4000 /**< SCTP cksum of TX pkt. computed by NIC. */ -#define PKT_TX_UDP_CKSUM 0x6000 /**< UDP cksum of TX pkt. computed by NIC. */ -/* Bit 15 */ -#define PKT_TX_IEEE1588_TMST 0x8000 /**< TX IEEE1588 packet to timestamp. */ +#define PKT_TX_L4_NO_CKSUM (0x0000 << 32) /**< Disable L4 cksum of TX pkt. */ +#define PKT_TX_TCP_CKSUM (0x0004 << 32) /**< TCP cksum of TX pkt. computed by NIC. */ +#define PKT_TX_SCTP_CKSUM (0x0008 << 32) /**< SCTP cksum of TX pkt. computed by NIC. */ +#define PKT_TX_UDP_CKSUM (0x000C << 32) /**< UDP cksum of TX pkt. computed by NIC. */ +#define PKT_TX_L4_MASK (0x000C << 32) /**< Mask for L4 cksum offload request. */ +/* Bit 36 */ +#define PKT_TX_IEEE1588_TMST (0x0010 << 32) /**< TX IEEE1588 packet to timestamp. */ /* Use final bit of flags to indicate a control mbuf */ #define CTRL_MBUF_FLAG (1ULL << 63)