- Used global node mbuf in ip[4|6]_lookup/rewrite nodes
- Redefine node_mbuf_priv1() to rte_node_mbuf_overload_fields_get()
Signed-off-by: Nitin Saxena <nsax...@marvell.com>
---
lib/node/ip4_lookup.c | 14 ++++-------
lib/node/ip4_lookup_fib.c | 17 ++++++-------
lib/node/ip4_rewrite.c | 32 +++++++++++++------------
lib/node/ip6_lookup.c | 15 +++++-------
lib/node/ip6_lookup_fib.c | 17 ++++++-------
lib/node/ip6_rewrite.c | 14 ++++-------
lib/node/node_private.h | 40 +++----------------------------
lib/node/rte_node_mbuf_dynfield.h | 9 +++++++
8 files changed, 59 insertions(+), 99 deletions(-)
diff --git a/lib/node/ip4_lookup.c b/lib/node/ip4_lookup.c
index 604fcb267a..f6db3219f0 100644
--- a/lib/node/ip4_lookup.c
+++ b/lib/node/ip4_lookup.c
@@ -32,8 +32,6 @@ struct ip4_lookup_node_ctx {
int mbuf_priv1_off;
};
-int node_mbuf_priv1_dynfield_offset = -1;
-
static struct ip4_lookup_node_main ip4_lookup_nm;
#define IP4_LOOKUP_NODE_LPM(ctx) \
@@ -182,17 +180,15 @@ ip4_lookup_node_init(const struct rte_graph *graph,
struct rte_node *node)
{
uint16_t socket, lcore_id;
static uint8_t init_once;
- int rc;
+ int rc, dyn;
RTE_SET_USED(graph);
RTE_BUILD_BUG_ON(sizeof(struct ip4_lookup_node_ctx) > RTE_NODE_CTX_SZ);
+ dyn = rte_node_mbuf_dynfield_register();
+ if (dyn < 0)
+ return -rte_errno;
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)
{
@@ -210,7 +206,7 @@ ip4_lookup_node_init(const struct rte_graph *graph, struct
rte_node *node)
/* Update socket's LPM and mbuf dyn priv1 offset in node ctx */
IP4_LOOKUP_NODE_LPM(node->ctx) = ip4_lookup_nm.lpm_tbl[graph->socket];
- IP4_LOOKUP_NODE_PRIV1_OFF(node->ctx) = node_mbuf_priv1_dynfield_offset;
+ IP4_LOOKUP_NODE_PRIV1_OFF(node->ctx) = dyn;
#if defined(__ARM_NEON) || defined(RTE_ARCH_X86)
if (rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128)
diff --git a/lib/node/ip4_lookup_fib.c b/lib/node/ip4_lookup_fib.c
index f9a5c5aa5a..0857d889fc 100644
--- a/lib/node/ip4_lookup_fib.c
+++ b/lib/node/ip4_lookup_fib.c
@@ -277,18 +277,15 @@ setup_fib(int socket)
static int
ip4_lookup_fib_node_init(const struct rte_graph *graph, struct rte_node *node)
{
- static uint8_t init_once;
- int rc;
+ int rc, dyn;
RTE_BUILD_BUG_ON(sizeof(struct ip4_lookup_fib_node_ctx) >
RTE_NODE_CTX_SZ);
- 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 = 1;
+ dyn = rte_node_mbuf_dynfield_register();
+ if (dyn < 0) {
+ node_err("ip4_lookup_fib", "Failed to register mbuf dynfield,
rc=%d",
+ -rte_errno);
+ return -rte_errno;
}
rc = setup_fib(graph->socket);
@@ -300,7 +297,7 @@ ip4_lookup_fib_node_init(const struct rte_graph *graph,
struct rte_node *node)
/* Update socket's FIB and mbuf dyn priv1 offset in node ctx */
IP4_LOOKUP_NODE_FIB(node->ctx) = ip4_lookup_fib_nm.fib[graph->socket];
- IP4_LOOKUP_FIB_NODE_PRIV1_OFF(node->ctx) =
node_mbuf_priv1_dynfield_offset;
+ IP4_LOOKUP_FIB_NODE_PRIV1_OFF(node->ctx) = dyn;
node_dbg("ip4_lookup_fib", "Initialized ip4_lookup_fib node");
diff --git a/lib/node/ip4_rewrite.c b/lib/node/ip4_rewrite.c
index b1fa386d9f..37bc3a511f 100644
--- a/lib/node/ip4_rewrite.c
+++ b/lib/node/ip4_rewrite.c
@@ -486,16 +486,18 @@ ip4_rewrite_node_init(const struct rte_graph *graph,
struct rte_node *node)
{
rte_graph_feature_arc_t feature_arc = RTE_GRAPH_FEATURE_ARC_INITIALIZER;
static bool init_once;
+ int dyn;
RTE_SET_USED(graph);
RTE_BUILD_BUG_ON(sizeof(struct ip4_rewrite_node_ctx) > RTE_NODE_CTX_SZ);
- 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;
+ dyn = rte_node_mbuf_dynfield_register();
+ if (dyn < 0) {
+ node_err("ip4_rewrite", "Failed to register mbuf dynfield");
+ return -rte_errno;
+ }
+ if (!init_once) {
/* Create ipv4-output feature arc, if not created
*/
if
(rte_graph_feature_arc_lookup_by_name(RTE_IP4_OUTPUT_FEATURE_ARC_NAME,
@@ -507,19 +509,19 @@ ip4_rewrite_node_init(const struct rte_graph *graph,
struct rte_node *node)
RTE_IP4_OUTPUT_FEATURE_ARC_NAME);
}
- init_once = true;
- }
- IP4_REWRITE_NODE_PRIV1_OFF(node->ctx) = node_mbuf_priv1_dynfield_offset;
- IP4_REWRITE_NODE_OUTPUT_FEATURE_ARC(node->ctx) = feature_arc;
+ IP4_REWRITE_NODE_OUTPUT_FEATURE_ARC(node->ctx) = feature_arc;
- if (rte_graph_feature_arc_get(feature_arc))
- IP4_REWRITE_NODE_FEAT_OFF(node->ctx) =
- rte_graph_feature_arc_get(feature_arc)->mbuf_dyn_offset;
+ if (rte_graph_feature_arc_get(feature_arc))
+ IP4_REWRITE_NODE_FEAT_OFF(node->ctx) =
+
rte_graph_feature_arc_get(feature_arc)->mbuf_dyn_offset;
- /* By default, set cached next node to pkt_drop */
- IP4_REWRITE_NODE_LAST_NEXT(node->ctx) = 0;
- IP4_REWRITE_NODE_LAST_TX_IF(node->ctx) = 0;
+ /* By default, set cached next node to pkt_drop */
+ IP4_REWRITE_NODE_LAST_NEXT(node->ctx) = 0;
+ IP4_REWRITE_NODE_LAST_TX_IF(node->ctx) = 0;
+ init_once = true;
+ }
+ IP4_REWRITE_NODE_PRIV1_OFF(node->ctx) = dyn;
node_dbg("ip4_rewrite", "Initialized ip4_rewrite node initialized");
return 0;
diff --git a/lib/node/ip6_lookup.c b/lib/node/ip6_lookup.c
index 827fc2f379..83c0500c76 100644
--- a/lib/node/ip6_lookup.c
+++ b/lib/node/ip6_lookup.c
@@ -318,18 +318,16 @@ ip6_lookup_node_init(const struct rte_graph *graph,
struct rte_node *node)
{
uint16_t socket, lcore_id;
static uint8_t init_once;
- int rc;
+ int rc, dyn;
RTE_SET_USED(graph);
RTE_BUILD_BUG_ON(sizeof(struct ip6_lookup_node_ctx) > RTE_NODE_CTX_SZ);
- 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;
+ dyn = rte_node_mbuf_dynfield_register();
+ if (dyn < 0)
+ return -rte_errno;
+ if (!init_once) {
/* Setup LPM tables for all sockets */
RTE_LCORE_FOREACH(lcore_id)
{
@@ -347,8 +345,7 @@ ip6_lookup_node_init(const struct rte_graph *graph, struct
rte_node *node)
/* Update socket's LPM and mbuf dyn priv1 offset in node ctx */
IP6_LOOKUP_NODE_LPM(node->ctx) = ip6_lookup_nm.lpm_tbl[graph->socket];
- IP6_LOOKUP_NODE_PRIV1_OFF(node->ctx) =
- node_mbuf_priv1_dynfield_offset;
+ IP6_LOOKUP_NODE_PRIV1_OFF(node->ctx) = dyn;
node_dbg("ip6_lookup", "Initialized ip6_lookup node");
diff --git a/lib/node/ip6_lookup_fib.c b/lib/node/ip6_lookup_fib.c
index 3df61890e9..40c5c753df 100644
--- a/lib/node/ip6_lookup_fib.c
+++ b/lib/node/ip6_lookup_fib.c
@@ -268,18 +268,15 @@ setup_fib6(int socket)
static int
ip6_lookup_fib_node_init(const struct rte_graph *graph, struct rte_node *node)
{
- static uint8_t init_once;
- int rc;
+ int rc, dyn;
RTE_BUILD_BUG_ON(sizeof(struct ip6_lookup_fib_node_ctx) >
RTE_NODE_CTX_SZ);
- 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 = 1;
+ dyn = rte_node_mbuf_dynfield_register();
+ if (dyn < 0) {
+ node_err("ip6_lookup_fib", "Failed to register mbuf dynfield,
rc=%d",
+ -rte_errno);
+ return -rte_errno;
}
rc = setup_fib6(graph->socket);
@@ -291,7 +288,7 @@ ip6_lookup_fib_node_init(const struct rte_graph *graph,
struct rte_node *node)
/* Update socket's FIB and mbuf dyn priv1 offset in node ctx */
IP6_LOOKUP_FIB_NODE(node->ctx) = ip6_lookup_fib_nm.fib6[graph->socket];
- IP6_LOOKUP_FIB_NODE_PRIV1_OFF(node->ctx) =
node_mbuf_priv1_dynfield_offset;
+ IP6_LOOKUP_FIB_NODE_PRIV1_OFF(node->ctx) = dyn;
node_dbg("ip6_lookup_fib", "Initialized ip6_lookup_fib node");
diff --git a/lib/node/ip6_rewrite.c b/lib/node/ip6_rewrite.c
index e157964c6a..d5488e7fa3 100644
--- a/lib/node/ip6_rewrite.c
+++ b/lib/node/ip6_rewrite.c
@@ -243,19 +243,15 @@ ip6_rewrite_node_process(struct rte_graph *graph, struct
rte_node *node,
static int
ip6_rewrite_node_init(const struct rte_graph *graph, struct rte_node *node)
{
- static bool init_once;
+ int dyn;
RTE_SET_USED(graph);
RTE_BUILD_BUG_ON(sizeof(struct ip6_rewrite_node_ctx) > RTE_NODE_CTX_SZ);
- 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;
- }
- IP6_REWRITE_NODE_PRIV1_OFF(node->ctx) = node_mbuf_priv1_dynfield_offset;
+ dyn = rte_node_mbuf_dynfield_register();
+ if (dyn < 0)
+ return -rte_errno;
+ IP6_REWRITE_NODE_PRIV1_OFF(node->ctx) = dyn;
node_dbg("ip6_rewrite", "Initialized ip6_rewrite node");
diff --git a/lib/node/node_private.h b/lib/node/node_private.h
index 9488df225c..a2b5a93681 100644
--- a/lib/node/node_private.h
+++ b/lib/node/node_private.h
@@ -14,6 +14,7 @@
#include <rte_graph_worker_common.h>
#include <rte_graph_feature_arc_worker.h>
+#include <rte_node_mbuf_dynfield.h>
extern int rte_node_logtype;
#define RTE_LOGTYPE_NODE rte_node_logtype
@@ -27,28 +28,8 @@ extern int rte_node_logtype;
#define node_info(node_name, ...) NODE_LOG(INFO, node_name, __VA_ARGS__)
#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 {
- union {
- /* IP4/IP6 rewrite */
- struct {
- uint16_t nh;
- uint16_t ttl;
- uint32_t cksum;
- };
-
- uint64_t u;
- };
-};
-
-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;
+/* define internal function used by nodes */
+#define node_mbuf_priv1 rte_node_mbuf_overload_fields_get
/**
* Node mbuf private area 2.
@@ -61,21 +42,6 @@ struct __rte_cache_aligned node_mbuf_priv2 {
#define OBJS_PER_CLINE (RTE_CACHE_LINE_SIZE / sizeof(void *))
-/**
- * Get mbuf_priv1 pointer from rte_mbuf.
- *
- * @param
- * Pointer to the rte_mbuf.
- *
- * @return
- * Pointer to the mbuf_priv1.
- */
-static __rte_always_inline struct node_mbuf_priv1 *
-node_mbuf_priv1(struct rte_mbuf *m, const int offset)
-{
- return RTE_MBUF_DYNFIELD(m, offset, struct node_mbuf_priv1 *);
-}
-
/**
* Get mbuf_priv2 pointer from rte_mbuf.
*
diff --git a/lib/node/rte_node_mbuf_dynfield.h
b/lib/node/rte_node_mbuf_dynfield.h
index 1069c07d44..045c13e352 100644
--- a/lib/node/rte_node_mbuf_dynfield.h
+++ b/lib/node/rte_node_mbuf_dynfield.h
@@ -46,6 +46,15 @@ extern "C" {
*/
typedef struct rte_node_mbuf_overload_fields {
union {
+ /* Following fields used by ip[4|6]-lookup -> ip[4|6]-rewrite
nodes */
+ union {
+ struct {
+ uint16_t nh;
+ uint16_t ttl;
+ uint32_t cksum;
+ };
+ uint64_t u;
+ };
uint8_t data[RTE_NODE_MBUF_OVERLOADABLE_FIELDS_SIZE];
};
} rte_node_mbuf_overload_fields_t;
--
2.43.0
