Adds a lookup FIB node for IP6. Adds a public function to do fib configuration from application.
Signed-off-by: Ankur Dwivedi <adwiv...@marvell.com> --- lib/node/ip6_lookup_fib.c | 139 ++++++++++++++++++++++++++++++++++++ lib/node/meson.build | 1 + lib/node/rte_node_ip6_api.h | 15 ++++ 3 files changed, 155 insertions(+) create mode 100644 lib/node/ip6_lookup_fib.c diff --git a/lib/node/ip6_lookup_fib.c b/lib/node/ip6_lookup_fib.c new file mode 100644 index 0000000000..a4f9f53644 --- /dev/null +++ b/lib/node/ip6_lookup_fib.c @@ -0,0 +1,139 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(C) 2025 Marvell. + */ + +#include <eal_export.h> +#include <rte_errno.h> +#include <rte_ether.h> +#include <rte_fib6.h> +#include <rte_graph.h> +#include <rte_graph_worker.h> +#include <rte_ip.h> + +#include "rte_node_ip6_api.h" + +#include "node_private.h" + +/* IP6 Lookup FIB global data struct */ +struct ip6_lookup_fib_node_main { + struct rte_fib6 *fib6[RTE_MAX_NUMA_NODES]; +}; + +struct ip6_lookup_fib_node_ctx { + /* Socket's FIB6 */ + struct rte_fib6 *fib6; + /* Dynamic offset to mbuf priv1 */ + int mbuf_priv1_off; +}; + +static struct ip6_lookup_fib_node_main ip6_lookup_fib_nm; + +#define FIB6_DEFAULT_MAX_ROUTES (UINT16_MAX) +#define FIB6_DEFAULT_NUM_TBL8 (UINT16_MAX / 2) +#define FIB6_DEFAULT_NH (RTE_NODE_IP6_LOOKUP_NEXT_PKT_DROP << 16) + +#define IP6_LOOKUP_FIB_NODE(ctx) \ + (((struct ip6_lookup_fib_node_ctx *)ctx)->fib6) + +#define IP6_LOOKUP_FIB_NODE_PRIV1_OFF(ctx) \ + (((struct ip6_lookup_fib_node_ctx *)ctx)->mbuf_priv1_off) + +RTE_EXPORT_EXPERIMENTAL_SYMBOL(rte_node_ip6_fib_create, 25.07) +int +rte_node_ip6_fib_create(int socket, struct rte_fib6_conf *conf) +{ + struct ip6_lookup_fib_node_main *nm = &ip6_lookup_fib_nm; + char s[RTE_FIB6_NAMESIZE]; + + /* One fib6 per socket */ + if (nm->fib6[socket]) + return 0; + + conf->default_nh = FIB6_DEFAULT_NH; + snprintf(s, sizeof(s), "IPV6_LOOKUP_FIB_%u", socket); + nm->fib6[socket] = rte_fib6_create(s, socket, conf); + if (nm->fib6[socket] == NULL) + return -rte_errno; + + return 0; +} + +static int +setup_fib6(int socket) +{ + struct ip6_lookup_fib_node_main *nm = &ip6_lookup_fib_nm; + struct rte_fib6_conf conf; + char s[RTE_FIB6_NAMESIZE]; + + /* One fib6 per socket */ + if (nm->fib6[socket]) + return 0; + + conf.type = RTE_FIB6_TRIE; + conf.default_nh = FIB6_DEFAULT_NH; + conf.max_routes = FIB6_DEFAULT_MAX_ROUTES; + conf.rib_ext_sz = 0; + conf.trie.nh_sz = RTE_FIB6_TRIE_4B; + conf.trie.num_tbl8 = FIB6_DEFAULT_NUM_TBL8; + snprintf(s, sizeof(s), "IPV6_LOOKUP_FIB_%u", socket); + nm->fib6[socket] = rte_fib6_create(s, socket, &conf); + if (nm->fib6[socket] == NULL) + return -rte_errno; + + return 0; +} + +static int +ip6_lookup_fib_node_init(const struct rte_graph *graph, struct rte_node *node) +{ + static uint8_t init_once; + int rc; + + 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; + } + + rc = setup_fib6(graph->socket); + if (rc) { + node_err("ip6_lookup_fib", "Failed to setup fib6 for sock %u, rc=%d", + graph->socket, rc); + return rc; + } + + /* 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; + + node_dbg("ip6_lookup_fib", "Initialized ip6_lookup_fib node"); + + return 0; +} + +static struct rte_node_xstats ip6_lookup_fib_xstats = { + .nb_xstats = 1, + .xstat_desc = { + [0] = "ip6_lookup_fib_error", + }, +}; + +static struct rte_node_register ip6_lookup_fib_node = { + .name = "ip6_lookup_fib", + + .init = ip6_lookup_fib_node_init, + .xstats = &ip6_lookup_fib_xstats, + + .nb_edges = RTE_NODE_IP6_LOOKUP_NEXT_PKT_DROP + 1, + .next_nodes = { + [RTE_NODE_IP6_LOOKUP_NEXT_REWRITE] = "ip6_rewrite", + [RTE_NODE_IP6_LOOKUP_NEXT_PKT_DROP] = "pkt_drop", + }, +}; + +RTE_NODE_REGISTER(ip6_lookup_fib_node); diff --git a/lib/node/meson.build b/lib/node/meson.build index 8112cf7f5b..5ff52a2c44 100644 --- a/lib/node/meson.build +++ b/lib/node/meson.build @@ -17,6 +17,7 @@ sources = files( 'ip4_reassembly.c', 'ip4_rewrite.c', 'ip6_lookup.c', + 'ip6_lookup_fib.c', 'ip6_rewrite.c', 'kernel_rx.c', 'kernel_tx.c', diff --git a/lib/node/rte_node_ip6_api.h b/lib/node/rte_node_ip6_api.h index 2875bc981a..1d2b190724 100644 --- a/lib/node/rte_node_ip6_api.h +++ b/lib/node/rte_node_ip6_api.h @@ -17,6 +17,7 @@ */ #include <rte_common.h> #include <rte_compat.h> +#include <rte_fib6.h> #include <rte_ip6.h> #ifdef __cplusplus @@ -71,6 +72,20 @@ __rte_experimental int rte_node_ip6_rewrite_add(uint16_t next_hop, uint8_t *rewrite_data, uint8_t rewrite_len, uint16_t dst_port); +/** + * Create ipv6 FIB. + * + * @param socket + * NUMA socket for FIB memory allocation. + * @param conf + * Structure containing FIB configuration. + * + * @return + * 0 on success, negative otherwise. + */ +__rte_experimental +int rte_node_ip6_fib_create(int socket, struct rte_fib6_conf *conf); + #ifdef __cplusplus } #endif -- 2.25.1