From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 7D559A04E6;
Fri, 30 Oct 2020 18:49:48 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id BAAED6A6F;
Fri, 30 Oct 2020 18:45:44 +0100 (CET)
Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com
[66.111.4.26]) by dpdk.org (Postfix) with ESMTP id D24455953
for <dev@dpdk.org>; Fri, 30 Oct 2020 18:45:18 +0100 (CET)
Received: from compute2.internal (compute2.nyi.internal [10.202.2.42])
by mailout.nyi.internal (Postfix) with ESMTP id 88CF85C01A3;
Fri, 30 Oct 2020 13:45:18 -0400 (EDT)
Received: from mailfrontend2 ([10.202.2.163])
by compute2.internal (MEProxy); Fri, 30 Oct 2020 13:45:18 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h=
from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding; s=fm2; bh=eLyw5qV9xwuy0
gAhRVSGsWhtnJcQtq52JbUjAnuadJk=; b=u6p9+K93x0jaR89bD5/qNZXLBrp3x
+Ncg1hFIdnBYvoszCRqeThTDSYH0Wh6fqsV8be7duWvsunDcKZUEUFrulo/6ucHt
G+V6D7LTvM8OXMaaekrzAxF7IhltGq6K/D15vxbe3oH895l6Lu+EvvSJkkmVwOhf
rggEQOPt2NIHZAMrvRaMM2oF+FSP3kkHyV7qt+xSHhVH3K7iLGnxLcDBlJkW78Jx
8pVwSN3aLfx5cyB29Tfxxtr0saeipBC89l1pFPPYqe8fmxACicN7YY6bb58CHuwE
RBm+rvWIbrfJoqBqfMCjnEFoUKND96UTpeMCsuFrPzwoXkKw2evEXzfnA==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
messagingengine.com; h=cc:content-transfer-encoding:date:from
:in-reply-to:message-id:mime-version:references:subject:to
:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=
fm1; bh=eLyw5qV9xwuy0gAhRVSGsWhtnJcQtq52JbUjAnuadJk=; b=rLlfip7I
RuD5Qol15pE/ps+2ClAqGP8Bt5bbnZHwlxmjNLLPuGN32d/SovHJGDa2HS/y6CRf
FsNio84taUGgcyr7YxO6Ud5P2eOL+gv9IRlGWRWn/0MRwzh0ZPkQgWyXboP/zWpv
qKKjIg7NjFiBH8HFrqJuiaFllnhSJ9o58jGKhXLOKZyAP82DDHovvdCpCExL2t4G
KwGvBVrDJ1SsrPh1Lh1Nb1w1TeCZN8m+xTZKsrPk5tnVYw1ThK5ON5+IL8qIWhdF
zVMgHr1mszUxtWL043X+FqtzHPS573D73beA3Qx5fDPZZ0kSsTomQUHp28VFXaVW
ygKG/R+xhZVO3A==
X-ME-Sender: <xms:LlGcX7lTe0_jyxatHvttRuhKoZO2PpOUsx0bHJOC5So5ZDmo5o_qeg>
<xme:LlGcX-33PIlkSvToFIHDYP1QIKyBWLCOkpsPON8bGB75jgy9ENbEJUKO2Ga_Uc4QG
CMTXesF8_wrdgxfPg>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrleehgdellecutefuodetggdotefrodftvf
curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc
fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepvfhhohhmrghs
ucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenucggtf
frrghtthgvrhhnpedvhefgiedvjeegtdevheefhfetleefgfeivefgffevfeejgedtgfeu
tdehtdegveenucfkphepjeejrddufeegrddvtdefrddukeegnecuvehluhhsthgvrhfuih
iivgepuddvnecurfgrrhgrmhepmhgrihhlfhhrohhmpehthhhomhgrshesmhhonhhjrghl
ohhnrdhnvght
X-ME-Proxy: <xmx:LlGcXxrWkEFEwIpy6gMLFPefA5HGbsK7u7VjoxTVj4PV7W-k7S9JDw>
<xmx:LlGcXznx4TtWs1TYsXaGBuoAhFWr5GvFvvEm51yIIHkUlWIBblKzqA>
<xmx:LlGcX52vvIiXQwBf7Z_JqURnsOeMkD2co4WvKVifPcHRsy2bIFquDw>
<xmx:LlGcX2lXOHw379WS4x3vng-zi_5wOz1dBpdrpJ7GBiP7l1fHz846wg>
Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184])
by mail.messagingengine.com (Postfix) with ESMTPA id 4868A306467D;
Fri, 30 Oct 2020 13:45:17 -0400 (EDT)
From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: ferruh.yigit@intel.com, david.marchand@redhat.com,
bruce.richardson@intel.com, olivier.matz@6wind.com,
andrew.rybchenko@oktetlabs.ru, akhil.goyal@nxp.com, jerinj@marvell.com,
Ray Kinsella <mdr@ashroe.eu>, Neil Horman <nhorman@tuxdriver.com>
Date: Fri, 30 Oct 2020 18:44:41 +0100
Message-Id: <20201030174441.1076264-16-thomas@monjalon.net>
X-Mailer: git-send-email 2.28.0
In-Reply-To: <20201030174441.1076264-1-thomas@monjalon.net>
References: <20201026052105.1561859-1-thomas@monjalon.net>
<20201030174441.1076264-1-thomas@monjalon.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v6 15/15] mbuf: remove userdata field
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
As announced in the deprecation note, the field userdata / udata64
is removed to give more space to the dynamic fields.
This is how the mbuf layout looks like (pahole-style):
word type name byte size
0 void * buf_addr; /* 0 + 8 */
1 rte_iova_t buf_iova /* 8 + 8 */
/* --- RTE_MARKER64 rearm_data; */
2 uint16_t data_off; /* 16 + 2 */
uint16_t refcnt; /* 18 + 2 */
uint16_t nb_segs; /* 20 + 2 */
uint16_t port; /* 22 + 2 */
3 uint64_t ol_flags; /* 24 + 8 */
/* --- RTE_MARKER rx_descriptor_fields1; */
4 uint32_t union packet_type; /* 32 + 4 */
uint32_t pkt_len; /* 36 + 4 */
5 uint16_t data_len; /* 40 + 2 */
uint16_t vlan_tci; /* 42 + 2 */
5.5 uint64_t union hash; /* 44 + 8 */
6.5 uint16_t vlan_tci_outer; /* 52 + 2 */
uint16_t buf_len; /* 54 + 2 */
7 uint64_t timestamp; /* 56 + 8 */
/* --- RTE_MARKER cacheline1; */
8 struct rte_mempool * pool; /* 64 + 8 */
9 struct rte_mbuf * next; /* 72 + 8 */
10 uint64_t union tx_offload; /* 80 + 8 */
11 uint16_t priv_size; /* 88 + 2 */
uint16_t timesync; /* 90 + 2 */
uint32_t seqn; /* 92 + 4 */
12 struct rte_mbuf_ext_shared_info * shinfo; /* 96 + 8 */
13 uint64_t dynfield1[3]; /* 104 + 24 */
16 /* --- END 128 */
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: Olivier Matz <olivier.matz@6wind.com>
---
doc/guides/rel_notes/deprecation.rst | 1 -
doc/guides/rel_notes/release_20_11.rst | 3 +++
lib/librte_kni/rte_kni_common.h | 2 +-
lib/librte_mbuf/rte_mbuf_core.h | 8 +-------
4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index 2e082499b8..0f6f1df12a 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -87,7 +87,6 @@ Deprecation Notices
The following static fields will be moved as dynamic:
- ``timestamp``
- - ``userdata`` / ``udata64``
- ``seqn``
As a consequence, the layout of the ``struct rte_mbuf`` will be re-arranged,
diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst
index bae39b2dd0..70cefb6d07 100644
--- a/doc/guides/rel_notes/release_20_11.rst
+++ b/doc/guides/rel_notes/release_20_11.rst
@@ -442,6 +442,9 @@ API Changes
the structures ``rte_mbuf`` and ``rte_mbuf_ext_shared_info``.
The field ``refcnt`` is remaining from the old unions.
+* mbuf: Removed the unioned fields ``userdata`` and ``udata64``
+ from the structure ``rte_mbuf``. It is replaced with dynamic fields.
+
* pci: Removed the ``rte_kernel_driver`` enum defined in rte_dev.h and
replaced with a private enum in the PCI subsystem.
diff --git a/lib/librte_kni/rte_kni_common.h b/lib/librte_kni/rte_kni_common.h
index 21b477f0aa..36d66e2ffa 100644
--- a/lib/librte_kni/rte_kni_common.h
+++ b/lib/librte_kni/rte_kni_common.h
@@ -86,7 +86,7 @@ struct rte_kni_mbuf {
uint16_t data_len; /**< Amount of data in segment buffer. */
/* fields on second cache line */
- char pad3[8] __attribute__((__aligned__(RTE_CACHE_LINE_MIN_SIZE)));
+ __attribute__((__aligned__(RTE_CACHE_LINE_MIN_SIZE)))
void *pool;
void *next; /**< Physical address of next mbuf in kernel. */
};
diff --git a/lib/librte_mbuf/rte_mbuf_core.h b/lib/librte_mbuf/rte_mbuf_core.h
index 065d87d28a..a65eaaf692 100644
--- a/lib/librte_mbuf/rte_mbuf_core.h
+++ b/lib/librte_mbuf/rte_mbuf_core.h
@@ -599,12 +599,6 @@ struct rte_mbuf {
/* second cache line - fields only used in slow path or on TX */
RTE_MARKER cacheline1 __rte_cache_min_aligned;
- RTE_STD_C11
- union {
- void *userdata; /**< Can be used for external metadata */
- uint64_t udata64; /**< Allow 8-byte userdata on 32-bit */
- };
-
struct rte_mempool *pool; /**< Pool from which mbuf was allocated. */
struct rte_mbuf *next; /**< Next segment of scattered packet. */
@@ -662,7 +656,7 @@ struct rte_mbuf {
*/
struct rte_mbuf_ext_shared_info *shinfo;
- uint64_t dynfield1[2]; /**< Reserved for dynamic fields. */
+ uint64_t dynfield1[3]; /**< Reserved for dynamic fields. */
} __rte_cache_aligned;
/**
--
2.28.0