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, Nithin Dabilpuram <ndabilpuram@marvell.com>, Pavan Nikhilesh <pbhagavatula@marvell.com> Subject: [dpdk-dev] [PATCH v3 04/15] node: switch IPv4 metadata to dynamic mbuf field Date: Tue, 27 Oct 2020 22:01:04 +0100 Message-ID: <20201027210115.2529025-5-thomas@monjalon.net> (raw) In-Reply-To: <20201027210115.2529025-1-thomas@monjalon.net> The node_mbuf_priv1 was stored in the deprecated mbuf field udata64. It is moved to a dynamic field in order to allow removal of udata64. WARNING: this change should be replaced with another solution proposed by Nithin. Waiting for the patch to be integrated. Signed-off-by: Thomas Monjalon <thomas@monjalon.net> --- lib/librte_node/ip4_lookup.c | 7 +++++++ lib/librte_node/ip4_rewrite.c | 10 ++++++++++ lib/librte_node/node_private.h | 12 ++++++++++-- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/lib/librte_node/ip4_lookup.c b/lib/librte_node/ip4_lookup.c index 8835aab9dd..3bd7c179ab 100644 --- a/lib/librte_node/ip4_lookup.c +++ b/lib/librte_node/ip4_lookup.c @@ -21,6 +21,8 @@ #include "node_private.h" +int node_mbuf_priv1_dynfield_offset = -1; + #define IPV4_L3FWD_LPM_MAX_RULES 1024 #define IPV4_L3FWD_LPM_NUMBER_TBL8S (1 << 8) @@ -178,6 +180,11 @@ ip4_lookup_node_init(const struct rte_graph *graph, struct rte_node *node) RTE_SET_USED(node); if (!init_once) { + node_mbuf_priv1_dynfield_offset = rte_mbuf_dynfield_register( + &node_mbuf_priv1_dynfield_desc); + if (node_mbuf_priv1_dynfield_offset < 0) + return -rte_errno; + /* Setup LPM tables for all sockets */ RTE_LCORE_FOREACH(lcore_id) { diff --git a/lib/librte_node/ip4_rewrite.c b/lib/librte_node/ip4_rewrite.c index bb7f671b5c..1c4e51968c 100644 --- a/lib/librte_node/ip4_rewrite.c +++ b/lib/librte_node/ip4_rewrite.c @@ -248,9 +248,19 @@ ip4_rewrite_node_process(struct rte_graph *graph, struct rte_node *node, static int ip4_rewrite_node_init(const struct rte_graph *graph, struct rte_node *node) { + static bool init_once; RTE_SET_USED(graph); RTE_SET_USED(node); + + if (!init_once) { + node_mbuf_priv1_dynfield_offset = rte_mbuf_dynfield_register( + &node_mbuf_priv1_dynfield_desc); + if (node_mbuf_priv1_dynfield_offset < 0) + return -rte_errno; + init_once = true; + } + node_dbg("ip4_rewrite", "Initialized ip4_rewrite node initialized"); return 0; diff --git a/lib/librte_node/node_private.h b/lib/librte_node/node_private.h index ab7941c12b..9258082df0 100644 --- a/lib/librte_node/node_private.h +++ b/lib/librte_node/node_private.h @@ -8,6 +8,7 @@ #include <rte_common.h> #include <rte_log.h> #include <rte_mbuf.h> +#include <rte_mbuf_dyn.h> extern int rte_node_logtype; #define NODE_LOG(level, node_name, ...) \ @@ -21,7 +22,6 @@ extern int rte_node_logtype; #define node_dbg(node_name, ...) NODE_LOG(DEBUG, node_name, __VA_ARGS__) /** - * * Node mbuf private data to store next hop, ttl and checksum. */ struct node_mbuf_priv1 { @@ -37,6 +37,13 @@ struct node_mbuf_priv1 { }; }; +static const struct rte_mbuf_dynfield node_mbuf_priv1_dynfield_desc = { + .name = "rte_node_dynfield_priv1", + .size = sizeof(struct node_mbuf_priv1), + .align = __alignof__(struct node_mbuf_priv1), +}; +extern int node_mbuf_priv1_dynfield_offset; + /** * Node mbuf private area 2. */ @@ -60,7 +67,8 @@ struct node_mbuf_priv2 { static __rte_always_inline struct node_mbuf_priv1 * node_mbuf_priv1(struct rte_mbuf *m) { - return (struct node_mbuf_priv1 *)&m->udata64; + return RTE_MBUF_DYNFIELD(m, + node_mbuf_priv1_dynfield_offset, struct node_mbuf_priv1 *); } /** -- 2.28.0
next prev parent reply other threads:[~2020-10-27 21:02 UTC|newest] Thread overview: 178+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-26 5:20 [dpdk-dev] [PATCH 00/15] remove mbuf userdata Thomas Monjalon 2020-10-26 5:20 ` [dpdk-dev] [PATCH 01/15] examples: enclose DPDK includes with angle brackets Thomas Monjalon 2020-10-26 14:23 ` Andrew Rybchenko 2020-10-27 11:32 ` Bruce Richardson 2020-10-26 5:20 ` [dpdk-dev] [PATCH 02/15] kni: move header file from EAL Thomas Monjalon 2020-10-26 14:25 ` Andrew Rybchenko 2020-10-27 11:33 ` Bruce Richardson 2020-10-26 5:20 ` [dpdk-dev] [PATCH 03/15] mbuf: fix typo in dynamic field convention note Thomas Monjalon 2020-10-26 14:26 ` Andrew Rybchenko 2020-10-26 5:20 ` [dpdk-dev] [PATCH 04/15] node: switch IPv4 metadata to dynamic mbuf field Thomas Monjalon 2020-10-26 10:40 ` David Marchand 2020-10-26 14:29 ` Thomas Monjalon 2020-10-26 14:34 ` Andrew Rybchenko 2020-10-26 14:39 ` Thomas Monjalon 2020-10-26 5:20 ` [dpdk-dev] [PATCH 05/15] security: switch " Thomas Monjalon 2020-10-26 10:41 ` David Marchand 2020-10-26 14:30 ` Thomas Monjalon 2020-10-26 17:58 ` Akhil Goyal 2020-10-26 15:06 ` Andrew Rybchenko 2020-10-26 16:49 ` Thomas Monjalon 2020-10-26 19:03 ` Thomas Monjalon 2020-10-26 5:20 ` [dpdk-dev] [PATCH 06/15] event/sw: switch test counter " Thomas Monjalon 2020-10-26 15:09 ` Andrew Rybchenko 2020-10-26 5:20 ` [dpdk-dev] [PATCH 07/15] net/ark: ignore user data Thomas Monjalon 2020-10-26 5:20 ` [dpdk-dev] [PATCH 08/15] net/bnxt: switch CFA code to dynamic mbuf field Thomas Monjalon 2020-10-26 10:42 ` David Marchand 2020-10-26 14:32 ` Thomas Monjalon 2020-10-26 5:20 ` [dpdk-dev] [PATCH 09/15] net/vmxnet3: switch MSS hint " Thomas Monjalon 2020-10-26 15:14 ` Andrew Rybchenko 2020-10-26 15:21 ` Andrew Rybchenko 2020-10-26 16:50 ` Thomas Monjalon 2020-10-26 18:13 ` Thomas Monjalon 2020-10-26 5:21 ` [dpdk-dev] [PATCH 10/15] test/distributor: switch sequence " Thomas Monjalon 2020-10-26 9:39 ` Lukasz Wojciechowski 2020-10-26 5:21 ` [dpdk-dev] [PATCH 11/15] test/graph: switch user data " Thomas Monjalon 2020-10-26 5:21 ` [dpdk-dev] [PATCH 12/15] app/eventdev: switch flow ID " Thomas Monjalon 2020-10-26 5:21 ` [dpdk-dev] [PATCH 13/15] examples/bbdev: switch " Thomas Monjalon 2020-10-26 5:21 ` [dpdk-dev] [PATCH 14/15] examples/rxtx_callbacks: " Thomas Monjalon 2020-10-26 10:43 ` David Marchand 2020-10-26 14:33 ` Thomas Monjalon 2020-10-26 14:53 ` Stephen Hemminger 2020-10-26 16:32 ` Thomas Monjalon 2020-10-26 5:21 ` [dpdk-dev] [PATCH 15/15] mbuf: remove userdata field Thomas Monjalon 2020-10-26 22:19 ` [dpdk-dev] [PATCH v2 00/15] remove mbuf userdata Thomas Monjalon 2020-10-26 22:19 ` [dpdk-dev] [PATCH v2 01/15] examples: enclose DPDK includes with angle brackets Thomas Monjalon 2020-10-26 22:20 ` [dpdk-dev] [PATCH v2 02/15] kni: move header file from EAL Thomas Monjalon 2020-10-26 22:20 ` [dpdk-dev] [PATCH v2 03/15] mbuf: fix typo in dynamic field convention note Thomas Monjalon 2020-10-26 22:20 ` [dpdk-dev] [PATCH v2 04/15] node: switch IPv4 metadata to dynamic mbuf field Thomas Monjalon 2020-10-27 9:32 ` Olivier Matz 2020-10-27 9:34 ` Thomas Monjalon 2020-10-27 14:23 ` Nithin Dabilpuram 2020-10-27 14:33 ` Thomas Monjalon 2020-10-27 15:33 ` Nithin Dabilpuram 2020-10-27 15:57 ` Thomas Monjalon 2020-10-27 16:16 ` Nithin Dabilpuram 2020-10-27 16:26 ` Thomas Monjalon 2020-10-28 9:30 ` [dpdk-dev] [PATCH v4] " Nithin Dabilpuram 2020-10-28 10:08 ` Thomas Monjalon 2020-10-28 10:24 ` Van Haaren, Harry 2020-10-28 10:42 ` Nithin Dabilpuram 2020-10-28 10:43 ` Thomas Monjalon 2020-10-28 18:07 ` Thomas Monjalon 2020-10-29 10:17 ` Van Haaren, Harry 2020-10-28 10:33 ` Nithin Dabilpuram 2020-10-26 22:20 ` [dpdk-dev] [PATCH v2 05/15] security: switch " Thomas Monjalon 2020-10-27 2:01 ` Wang, Haiyue 2020-10-27 8:52 ` Thomas Monjalon 2020-10-27 13:12 ` Wang, Haiyue 2020-10-27 10:05 ` Olivier Matz 2020-10-27 16:10 ` Thomas Monjalon 2020-10-26 22:20 ` [dpdk-dev] [PATCH v2 06/15] event/sw: switch test counter " Thomas Monjalon 2020-10-27 10:15 ` Olivier Matz 2020-10-27 16:14 ` Thomas Monjalon 2020-10-26 22:20 ` [dpdk-dev] [PATCH v2 07/15] net/ark: ignore user data Thomas Monjalon 2020-10-27 15:32 ` Ed Czeck 2020-10-27 15:55 ` Thomas Monjalon 2020-10-27 16:05 ` Thomas Monjalon 2020-10-26 22:20 ` [dpdk-dev] [PATCH v2 08/15] net/bnxt: switch CFA code to dynamic mbuf field Thomas Monjalon 2020-10-27 4:44 ` Ajit Khaparde 2020-10-27 10:31 ` Olivier Matz 2020-10-27 16:22 ` Thomas Monjalon 2020-10-26 22:20 ` [dpdk-dev] [PATCH v2 09/15] net/vmxnet3: switch MSS hint " Thomas Monjalon 2020-10-27 10:45 ` Olivier Matz 2020-10-27 16:25 ` Thomas Monjalon 2020-10-26 22:20 ` [dpdk-dev] [PATCH v2 10/15] test/distributor: switch sequence " Thomas Monjalon 2020-10-26 22:20 ` [dpdk-dev] [PATCH v2 11/15] test/graph: switch user data " Thomas Monjalon 2020-10-26 22:20 ` [dpdk-dev] [PATCH v2 12/15] app/eventdev: switch flow ID " Thomas Monjalon 2020-10-26 22:20 ` [dpdk-dev] [PATCH v2 13/15] examples/bbdev: switch " Thomas Monjalon 2020-10-26 22:20 ` [dpdk-dev] [PATCH v2 14/15] examples/rxtx_callbacks: " Thomas Monjalon 2020-10-26 22:20 ` [dpdk-dev] [PATCH v2 15/15] mbuf: remove userdata field Thomas Monjalon 2020-10-27 10:53 ` Olivier Matz 2020-10-27 21:01 ` [dpdk-dev] [PATCH v3 00/15] remove mbuf userdata Thomas Monjalon 2020-10-27 21:01 ` [dpdk-dev] [PATCH v3 01/15] examples: enclose DPDK includes with angle brackets Thomas Monjalon 2020-10-27 21:01 ` [dpdk-dev] [PATCH v3 02/15] kni: move header file from EAL Thomas Monjalon 2020-10-27 21:01 ` [dpdk-dev] [PATCH v3 03/15] mbuf: fix typo in dynamic field convention note Thomas Monjalon 2020-10-27 21:01 ` Thomas Monjalon [this message] 2020-10-27 21:01 ` [dpdk-dev] [PATCH v3 05/15] security: switch metadata to dynamic mbuf field Thomas Monjalon 2020-10-27 21:01 ` [dpdk-dev] [PATCH v3 06/15] event/sw: switch test counter " Thomas Monjalon 2020-10-27 21:01 ` [dpdk-dev] [PATCH v3 07/15] net/ark: switch user data " Thomas Monjalon 2020-10-27 22:30 ` Thomas Monjalon 2020-10-27 21:01 ` [dpdk-dev] [PATCH v3 08/15] net/bnxt: switch CFA code " Thomas Monjalon 2020-10-27 21:01 ` [dpdk-dev] [PATCH v3 09/15] net/vmxnet3: switch MSS hint " Thomas Monjalon 2020-10-27 21:01 ` [dpdk-dev] [PATCH v3 10/15] test/distributor: switch sequence " Thomas Monjalon 2020-10-27 21:01 ` [dpdk-dev] [PATCH v3 11/15] test/graph: switch user data " Thomas Monjalon 2020-10-27 21:01 ` [dpdk-dev] [PATCH v3 12/15] app/eventdev: switch flow ID " Thomas Monjalon 2020-10-28 4:54 ` Jerin Jacob 2020-10-28 7:43 ` Thomas Monjalon 2020-10-28 8:06 ` Jerin Jacob 2020-10-27 21:01 ` [dpdk-dev] [PATCH v3 13/15] examples/bbdev: switch " Thomas Monjalon 2020-10-27 21:01 ` [dpdk-dev] [PATCH v3 14/15] examples/rxtx_callbacks: " Thomas Monjalon 2020-10-27 21:01 ` [dpdk-dev] [PATCH v3 15/15] mbuf: remove userdata field Thomas Monjalon 2020-10-28 10:26 ` [dpdk-dev] [PATCH v4 00/15] remove mbuf userdata Thomas Monjalon 2020-10-28 10:26 ` [dpdk-dev] [PATCH v4 01/15] examples: enclose DPDK includes with angle brackets Thomas Monjalon 2020-10-28 10:26 ` [dpdk-dev] [PATCH v4 02/15] kni: move header file from EAL Thomas Monjalon 2020-10-28 10:26 ` [dpdk-dev] [PATCH v4 03/15] mbuf: fix typo in dynamic field convention note Thomas Monjalon 2020-10-28 10:26 ` [dpdk-dev] [PATCH v4 04/15] node: switch IPv4 metadata to dynamic mbuf field Thomas Monjalon 2020-10-28 10:26 ` [dpdk-dev] [PATCH v4 05/15] security: switch " Thomas Monjalon 2020-10-28 10:26 ` [dpdk-dev] [PATCH v4 06/15] event/sw: switch test counter " Thomas Monjalon 2020-10-28 10:26 ` [dpdk-dev] [PATCH v4 07/15] net/ark: switch user data to dynamic mbuf fields Thomas Monjalon 2020-10-28 10:26 ` [dpdk-dev] [PATCH v4 08/15] net/bnxt: switch CFA code to dynamic mbuf field Thomas Monjalon 2020-10-28 10:26 ` [dpdk-dev] [PATCH v4 09/15] net/vmxnet3: switch MSS hint " Thomas Monjalon 2020-10-28 10:26 ` [dpdk-dev] [PATCH v4 10/15] test/distributor: switch sequence " Thomas Monjalon 2020-10-28 10:26 ` [dpdk-dev] [PATCH v4 11/15] test/graph: switch user data " Thomas Monjalon 2020-10-28 10:26 ` [dpdk-dev] [PATCH v4 12/15] app/eventdev: switch flow ID " Thomas Monjalon 2020-10-28 10:26 ` [dpdk-dev] [PATCH v4 13/15] examples/bbdev: switch " Thomas Monjalon 2020-10-28 11:51 ` Andrew Rybchenko 2020-10-28 12:21 ` Thomas Monjalon 2020-10-28 12:55 ` Andrew Rybchenko 2020-10-28 10:26 ` [dpdk-dev] [PATCH v4 14/15] examples/rxtx_callbacks: " Thomas Monjalon 2020-10-28 10:26 ` [dpdk-dev] [PATCH v4 15/15] mbuf: remove userdata field Thomas Monjalon 2020-10-30 17:29 ` [dpdk-dev] [PATCH v5 00/15] remove mbuf userdata Thomas Monjalon 2020-10-30 17:29 ` [dpdk-dev] [PATCH v5 01/15] eventdev: remove software Rx timestamp Thomas Monjalon 2020-10-30 17:29 ` [dpdk-dev] [PATCH v5 02/15] mbuf: add Rx timestamp dynamic flag Thomas Monjalon 2020-11-01 20:03 ` Andrew Rybchenko 2020-10-30 17:29 ` [dpdk-dev] [PATCH v5 03/15] ethdev: register mbuf field and flags for timestamp Thomas Monjalon 2020-11-01 20:10 ` Andrew Rybchenko 2020-11-01 22:54 ` Thomas Monjalon 2020-10-30 17:29 ` [dpdk-dev] [PATCH v5 04/15] latency: switch timestamp to dynamic mbuf field Thomas Monjalon 2020-10-30 17:29 ` [dpdk-dev] [PATCH v5 05/15] net/ark: " Thomas Monjalon 2020-10-30 17:29 ` [dpdk-dev] [PATCH v5 06/15] net/dpaa2: " Thomas Monjalon 2020-10-30 17:29 ` [dpdk-dev] [PATCH v5 07/15] net/mlx5: fix dynamic mbuf offset lookup check Thomas Monjalon 2020-10-30 17:29 ` [dpdk-dev] [PATCH v5 08/15] net/mlx5: switch timestamp to dynamic mbuf field Thomas Monjalon 2020-10-30 17:29 ` [dpdk-dev] [PATCH v5 09/15] net/nfb: " Thomas Monjalon 2020-10-30 17:29 ` [dpdk-dev] [PATCH v5 10/15] net/octeontx2: " Thomas Monjalon 2020-10-30 17:29 ` [dpdk-dev] [PATCH v5 11/15] net/pcap: " Thomas Monjalon 2020-10-30 17:29 ` [dpdk-dev] [PATCH v5 12/15] app/testpmd: " Thomas Monjalon 2020-10-30 17:29 ` [dpdk-dev] [PATCH v5 13/15] examples/rxtx_callbacks: switch timestamp to dynamic field Thomas Monjalon 2020-10-30 17:29 ` [dpdk-dev] [PATCH v5 14/15] mbuf: remove deprecated timestamp field Thomas Monjalon 2020-11-01 20:13 ` Andrew Rybchenko 2020-10-30 17:29 ` [dpdk-dev] [PATCH v5 15/15] mbuf: move pool pointer in hotter first half Thomas Monjalon 2020-11-01 20:23 ` Andrew Rybchenko 2020-10-30 17:44 ` [dpdk-dev] [PATCH v6 00/15] remove mbuf userdata Thomas Monjalon 2020-10-30 17:44 ` [dpdk-dev] [PATCH v6 01/15] examples: enclose DPDK includes with angle brackets Thomas Monjalon 2020-10-30 17:44 ` [dpdk-dev] [PATCH v6 02/15] kni: move header file from EAL Thomas Monjalon 2020-10-30 17:44 ` [dpdk-dev] [PATCH v6 03/15] mbuf: fix typo in dynamic field convention note Thomas Monjalon 2020-10-30 17:44 ` [dpdk-dev] [PATCH v6 04/15] node: switch IPv4 metadata to dynamic mbuf field Thomas Monjalon 2020-10-30 17:44 ` [dpdk-dev] [PATCH v6 05/15] security: switch " Thomas Monjalon 2020-10-31 8:56 ` David Marchand 2020-10-31 9:26 ` David Marchand 2020-10-31 14:38 ` Thomas Monjalon 2020-10-30 17:44 ` [dpdk-dev] [PATCH v6 06/15] event/sw: switch test counter " Thomas Monjalon 2020-10-30 18:53 ` Van Haaren, Harry 2020-10-30 17:44 ` [dpdk-dev] [PATCH v6 07/15] net/ark: switch user data to dynamic mbuf fields Thomas Monjalon 2020-10-30 17:44 ` [dpdk-dev] [PATCH v6 08/15] net/bnxt: switch CFA code to dynamic mbuf field Thomas Monjalon 2020-10-30 17:44 ` [dpdk-dev] [PATCH v6 09/15] net/vmxnet3: switch MSS hint " Thomas Monjalon 2020-10-30 17:44 ` [dpdk-dev] [PATCH v6 10/15] test/distributor: switch sequence " Thomas Monjalon 2020-10-30 17:44 ` [dpdk-dev] [PATCH v6 11/15] test/graph: switch user data " Thomas Monjalon 2020-10-30 17:44 ` [dpdk-dev] [PATCH v6 12/15] app/eventdev: switch flow ID " Thomas Monjalon 2020-10-30 17:44 ` [dpdk-dev] [PATCH v6 13/15] examples/bbdev: switch " Thomas Monjalon 2020-10-30 17:44 ` [dpdk-dev] [PATCH v6 14/15] examples/rxtx_callbacks: switch TSC to dynamic field Thomas Monjalon 2020-10-30 17:44 ` [dpdk-dev] [PATCH v6 15/15] mbuf: remove userdata field Thomas Monjalon 2020-10-31 15:07 ` [dpdk-dev] [PATCH v6 00/15] remove mbuf userdata Thomas Monjalon 2020-10-31 23:36 ` Ferruh Yigit 2020-11-01 9:15 ` Thomas Monjalon 2020-11-01 10:26 ` David Marchand 2020-11-02 9:11 ` Jiawen Wu 2020-11-02 11:08 ` Ferruh Yigit 2020-11-02 11:58 ` Ferruh Yigit
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201027210115.2529025-5-thomas@monjalon.net \ --to=thomas@monjalon.net \ --cc=akhil.goyal@nxp.com \ --cc=andrew.rybchenko@oktetlabs.ru \ --cc=bruce.richardson@intel.com \ --cc=david.marchand@redhat.com \ --cc=dev@dpdk.org \ --cc=ferruh.yigit@intel.com \ --cc=ndabilpuram@marvell.com \ --cc=olivier.matz@6wind.com \ --cc=pbhagavatula@marvell.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
DPDK patches and discussions This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \ dev@dpdk.org public-inbox-index dev Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.dev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git