From 11c5b9b51a18396c73556031d55c32cc9c80045b Mon Sep 17 00:00:00 2001 From: Vladimir Medvedkin Date: Wed, 27 Oct 2021 16:49:40 +0100 Subject: [PATCH] fib: add RIB extension size parameter This patch adds a new parameter to the FIB configuration to specify the size of the extension for internal RIB structure. Signed-off-by: Vladimir Medvedkin Tested-by: Conor Walsh --- app/test-fib/main.c | 2 ++ app/test/test_fib.c | 5 +++++ app/test/test_fib6.c | 5 +++++ app/test/test_fib6_perf.c | 1 + app/test/test_fib_perf.c | 1 + doc/guides/rel_notes/release_21_11.rst | 3 +++ examples/l3fwd/l3fwd_fib.c | 2 ++ lib/fib/rte_fib.c | 2 +- lib/fib/rte_fib.h | 2 ++ lib/fib/rte_fib6.c | 2 +- lib/fib/rte_fib6.h | 2 ++ 11 files changed, 25 insertions(+), 2 deletions(-) diff --git a/app/test-fib/main.c b/app/test-fib/main.c index b0a97b0d7e..ecd420116a 100644 --- a/app/test-fib/main.c +++ b/app/test-fib/main.c @@ -857,6 +857,7 @@ run_v4(void) conf.type = get_fib_type(); conf.default_nh = def_nh; conf.max_routes = config.nb_routes * 2; + conf.rib_ext_sz = 0; if (conf.type == RTE_FIB_DIR24_8) { conf.dir24_8.nh_sz = __builtin_ctz(config.ent_sz); conf.dir24_8.num_tbl8 = RTE_MIN(config.tbl8, @@ -1057,6 +1058,7 @@ run_v6(void) conf.type = get_fib_type(); conf.default_nh = def_nh; conf.max_routes = config.nb_routes * 2; + conf.rib_ext_sz = 0; if (conf.type == RTE_FIB6_TRIE) { conf.trie.nh_sz = __builtin_ctz(config.ent_sz); conf.trie.num_tbl8 = RTE_MIN(config.tbl8, diff --git a/app/test/test_fib.c b/app/test/test_fib.c index e46b9934fe..eb69d6e2fd 100644 --- a/app/test/test_fib.c +++ b/app/test/test_fib.c @@ -36,6 +36,7 @@ test_create_invalid(void) struct rte_fib_conf config; config.max_routes = MAX_ROUTES; + config.rib_ext_sz = 0; config.default_nh = 0; config.type = RTE_FIB_DUMMY; @@ -94,6 +95,7 @@ test_multiple_create(void) struct rte_fib_conf config; int32_t i; + config.rib_ext_sz = 0; config.default_nh = 0; config.type = RTE_FIB_DUMMY; @@ -120,6 +122,7 @@ test_free_null(void) struct rte_fib_conf config; config.max_routes = MAX_ROUTES; + config.rib_ext_sz = 0; config.default_nh = 0; config.type = RTE_FIB_DUMMY; @@ -146,6 +149,7 @@ test_add_del_invalid(void) uint8_t depth = 24; config.max_routes = MAX_ROUTES; + config.rib_ext_sz = 0; config.default_nh = 0; config.type = RTE_FIB_DUMMY; @@ -320,6 +324,7 @@ test_lookup(void) int ret; config.max_routes = MAX_ROUTES; + config.rib_ext_sz = 0; config.default_nh = def_nh; config.type = RTE_FIB_DUMMY; diff --git a/app/test/test_fib6.c b/app/test/test_fib6.c index 74abfc7a5d..15ad09178a 100644 --- a/app/test/test_fib6.c +++ b/app/test/test_fib6.c @@ -38,6 +38,7 @@ test_create_invalid(void) struct rte_fib6_conf config; config.max_routes = MAX_ROUTES; + config.rib_ext_sz = 0; config.default_nh = 0; config.type = RTE_FIB6_DUMMY; @@ -96,6 +97,7 @@ test_multiple_create(void) struct rte_fib6_conf config; int32_t i; + config.rib_ext_sz = 0; config.default_nh = 0; config.type = RTE_FIB6_DUMMY; @@ -122,6 +124,7 @@ test_free_null(void) struct rte_fib6_conf config; config.max_routes = MAX_ROUTES; + config.rib_ext_sz = 0; config.default_nh = 0; config.type = RTE_FIB6_DUMMY; @@ -149,6 +152,7 @@ test_add_del_invalid(void) uint8_t depth = 24; config.max_routes = MAX_ROUTES; + config.rib_ext_sz = 0; config.default_nh = 0; config.type = RTE_FIB6_DUMMY; @@ -338,6 +342,7 @@ test_lookup(void) int ret; config.max_routes = MAX_ROUTES; + config.rib_ext_sz = 0; config.default_nh = def_nh; config.type = RTE_FIB6_DUMMY; diff --git a/app/test/test_fib6_perf.c b/app/test/test_fib6_perf.c index 56c799b2e9..e565799155 100644 --- a/app/test/test_fib6_perf.c +++ b/app/test/test_fib6_perf.c @@ -78,6 +78,7 @@ test_fib6_perf(void) conf.type = RTE_FIB6_TRIE; conf.default_nh = 0; conf.max_routes = 1000000; + conf.rib_ext_sz = 0; conf.trie.nh_sz = RTE_FIB6_TRIE_4B; conf.trie.num_tbl8 = RTE_MIN(get_max_nh(conf.trie.nh_sz), 1000000U); diff --git a/app/test/test_fib_perf.c b/app/test/test_fib_perf.c index dd2e54db8b..86b2f832b8 100644 --- a/app/test/test_fib_perf.c +++ b/app/test/test_fib_perf.c @@ -323,6 +323,7 @@ test_fib_perf(void) struct rte_fib_conf config; config.max_routes = 2000000; + config.rib_ext_sz = 0; config.type = RTE_FIB_DIR24_8; config.default_nh = 0; config.dir24_8.nh_sz = RTE_FIB_DIR24_8_4B; diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst index 004478326a..d95bab5582 100644 --- a/doc/guides/rel_notes/release_21_11.rst +++ b/doc/guides/rel_notes/release_21_11.rst @@ -462,6 +462,9 @@ API Changes * eventdev: Moved memory used by timer adapters to hugepage. This will prevent TLB misses if any and aligns to memory structure of other subsystems. +* fib: Added the ``rib_ext_sz`` field to ``rte_fib_conf`` and ``rte_fib6_conf`` + so that user can specify the size of the RIB extension inside the FIB. + ABI Changes ----------- diff --git a/examples/l3fwd/l3fwd_fib.c b/examples/l3fwd/l3fwd_fib.c index ca0f3509a0..f5c685a4f3 100644 --- a/examples/l3fwd/l3fwd_fib.c +++ b/examples/l3fwd/l3fwd_fib.c @@ -590,6 +590,7 @@ setup_fib(const int socketid) /* Create the fib IPv4 table. */ config_ipv4.type = RTE_FIB_DIR24_8; config_ipv4.max_routes = (1 << 16); + config_ipv4.rib_ext_sz = 0; config_ipv4.default_nh = FIB_DEFAULT_HOP; config_ipv4.dir24_8.nh_sz = RTE_FIB_DIR24_8_4B; config_ipv4.dir24_8.num_tbl8 = (1 << 15); @@ -639,6 +640,7 @@ setup_fib(const int socketid) config.type = RTE_FIB6_TRIE; config.max_routes = (1 << 16) - 1; + config.rib_ext_sz = 0; config.default_nh = FIB_DEFAULT_HOP; config.trie.nh_sz = RTE_FIB6_TRIE_4B; config.trie.num_tbl8 = (1 << 15); diff --git a/lib/fib/rte_fib.c b/lib/fib/rte_fib.c index b354d4bfd0..6ca180d7e7 100644 --- a/lib/fib/rte_fib.c +++ b/lib/fib/rte_fib.c @@ -164,7 +164,7 @@ rte_fib_create(const char *name, int socket_id, struct rte_fib_conf *conf) return NULL; } - rib_conf.ext_sz = 0; + rib_conf.ext_sz = conf->rib_ext_sz; rib_conf.max_nodes = conf->max_routes * 2; rib = rte_rib_create(name, socket_id, &rib_conf); diff --git a/lib/fib/rte_fib.h b/lib/fib/rte_fib.h index ac54f83cab..b3c59dfaaa 100644 --- a/lib/fib/rte_fib.h +++ b/lib/fib/rte_fib.h @@ -80,6 +80,8 @@ struct rte_fib_conf { /** Default value returned on lookup if there is no route */ uint64_t default_nh; int max_routes; + /** Size of the node extension in the internal RIB struct */ + unsigned int rib_ext_sz; union { struct { enum rte_fib_dir24_8_nh_sz nh_sz; diff --git a/lib/fib/rte_fib6.c b/lib/fib/rte_fib6.c index 44cc0c954d..be79efe004 100644 --- a/lib/fib/rte_fib6.c +++ b/lib/fib/rte_fib6.c @@ -165,7 +165,7 @@ rte_fib6_create(const char *name, int socket_id, struct rte_fib6_conf *conf) return NULL; } - rib_conf.ext_sz = 0; + rib_conf.ext_sz = conf->rib_ext_sz; rib_conf.max_nodes = conf->max_routes * 2; rib = rte_rib6_create(name, socket_id, &rib_conf); diff --git a/lib/fib/rte_fib6.h b/lib/fib/rte_fib6.h index f9d7812d6b..95879af96d 100644 --- a/lib/fib/rte_fib6.h +++ b/lib/fib/rte_fib6.h @@ -71,6 +71,8 @@ struct rte_fib6_conf { /** Default value returned on lookup if there is no route */ uint64_t default_nh; int max_routes; + /** Size of the node extension in the internal RIB struct */ + unsigned int rib_ext_sz; union { struct { enum rte_fib_trie_nh_sz nh_sz; -- 2.39.5