X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ffib%2Fip6_fib.c;h=708fddce66aaf5e7e6f207c74f03dc4a9721d878;hb=da3310597;hp=4a24c2124f2c395c84cbc01f25ba08a076c1c166;hpb=13eaf3e61decdb60bfff1741429cf05129e3cf38;p=vpp.git diff --git a/src/vnet/fib/ip6_fib.c b/src/vnet/fib/ip6_fib.c index 4a24c2124f2..708fddce66a 100644 --- a/src/vnet/fib/ip6_fib.c +++ b/src/vnet/fib/ip6_fib.c @@ -15,6 +15,16 @@ #include #include +#include + +#include +#include + +ip6_fib_table_instance_t ip6_fib_table[IP6_FIB_NUM_TABLES]; + +/* ip6 lookup table config parameters */ +u32 ip6_fib_table_nbuckets; +uword ip6_fib_table_size; static void vnet_ip6_fib_init (u32 fib_index) @@ -38,28 +48,32 @@ vnet_ip6_fib_init (u32 fib_index) FIB_ENTRY_FLAG_DROP); /* - * all link local for us + * all link local via the link local lookup DPO */ pfx.fp_addr.ip6.as_u64[0] = clib_host_to_net_u64 (0xFE80000000000000ULL); pfx.fp_addr.ip6.as_u64[1] = 0; pfx.fp_len = 10; - fib_table_entry_special_add(fib_index, - &pfx, - FIB_SOURCE_SPECIAL, - FIB_ENTRY_FLAG_LOCAL); + fib_table_entry_special_dpo_add(fib_index, + &pfx, + FIB_SOURCE_SPECIAL, + FIB_ENTRY_FLAG_NONE, + ip6_ll_dpo_get()); } static u32 -create_fib_with_table_id (u32 table_id) +create_fib_with_table_id (u32 table_id, + fib_source_t src, + fib_table_flags_t flags, + u8 *desc) { fib_table_t *fib_table; ip6_fib_t *v6_fib; - pool_get_aligned(ip6_main.fibs, fib_table, CLIB_CACHE_LINE_BYTES); + pool_get(ip6_main.fibs, fib_table); pool_get_aligned(ip6_main.v6_fibs, v6_fib, CLIB_CACHE_LINE_BYTES); - memset(fib_table, 0, sizeof(*fib_table)); - memset(v6_fib, 0, sizeof(*v6_fib)); + clib_memset(fib_table, 0, sizeof(*fib_table)); + clib_memset(v6_fib, 0, sizeof(*v6_fib)); ASSERT((fib_table - ip6_main.fibs) == (v6_fib - ip6_main.v6_fibs)); @@ -75,114 +89,83 @@ create_fib_with_table_id (u32 table_id) v6_fib->table_id = table_id; fib_table->ft_flow_hash_config = IP_FLOW_HASH_DEFAULT; + fib_table->ft_flags = flags; + fib_table->ft_desc = desc; vnet_ip6_fib_init(fib_table->ft_index); - fib_table_lock(fib_table->ft_index, FIB_PROTOCOL_IP6); + fib_table_lock(fib_table->ft_index, FIB_PROTOCOL_IP6, src); return (fib_table->ft_index); } u32 -ip6_fib_table_find_or_create_and_lock (u32 table_id) +ip6_fib_table_find_or_create_and_lock (u32 table_id, + fib_source_t src) { uword * p; p = hash_get (ip6_main.fib_index_by_table_id, table_id); if (NULL == p) - return create_fib_with_table_id(table_id); - - fib_table_lock(p[0], FIB_PROTOCOL_IP6); + return create_fib_with_table_id(table_id, src, + FIB_TABLE_FLAG_NONE, + NULL); + + fib_table_lock(p[0], FIB_PROTOCOL_IP6, src); return (p[0]); } u32 -ip6_fib_table_create_and_lock (void) +ip6_fib_table_create_and_lock (fib_source_t src, + fib_table_flags_t flags, + u8 *desc) { - return (create_fib_with_table_id(~0)); + return (create_fib_with_table_id(~0, src, flags, desc)); } void ip6_fib_table_destroy (u32 fib_index) { + /* + * all link local first ... + */ fib_prefix_t pfx = { .fp_proto = FIB_PROTOCOL_IP6, - .fp_len = 0, + .fp_len = 10, .fp_addr = { .ip6 = { - { 0, 0, }, + .as_u8 = { + [0] = 0xFE, + [1] = 0x80, + }, }, } }; + fib_table_entry_delete(fib_index, + &pfx, + FIB_SOURCE_SPECIAL); /* - * the default route. + * ... then the default route. */ + pfx.fp_addr.ip6.as_u64[0] = 0; + pfx.fp_len = 00; fib_table_entry_special_remove(fib_index, &pfx, FIB_SOURCE_DEFAULT_ROUTE); - - /* - * ff02::1:ff00:0/104 - */ - ip6_set_solicited_node_multicast_address(&pfx.fp_addr.ip6, 0); - pfx.fp_len = 104; - fib_table_entry_special_remove(fib_index, - &pfx, - FIB_SOURCE_SPECIAL); - - /* - * all-routers multicast address - */ - ip6_set_reserved_multicast_address (&pfx.fp_addr.ip6, - IP6_MULTICAST_SCOPE_link_local, - IP6_MULTICAST_GROUP_ID_all_routers); - pfx.fp_len = 128; - fib_table_entry_special_remove(fib_index, - &pfx, - FIB_SOURCE_SPECIAL); - - /* - * all-nodes multicast address - */ - ip6_set_reserved_multicast_address (&pfx.fp_addr.ip6, - IP6_MULTICAST_SCOPE_link_local, - IP6_MULTICAST_GROUP_ID_all_hosts); - pfx.fp_len = 128; - fib_table_entry_special_remove(fib_index, - &pfx, - FIB_SOURCE_SPECIAL); - - /* - * all-mldv2 multicast address - */ - ip6_set_reserved_multicast_address (&pfx.fp_addr.ip6, - IP6_MULTICAST_SCOPE_link_local, - IP6_MULTICAST_GROUP_ID_mldv2_routers); - pfx.fp_len = 128; - fib_table_entry_special_remove(fib_index, - &pfx, - FIB_SOURCE_SPECIAL); - - /* - * all link local - */ - pfx.fp_addr.ip6.as_u64[0] = clib_host_to_net_u64 (0xFE80000000000000ULL); - pfx.fp_addr.ip6.as_u64[1] = 0; - pfx.fp_len = 10; - fib_table_entry_special_remove(fib_index, - &pfx, - FIB_SOURCE_SPECIAL); - fib_table_t *fib_table = fib_table_get(fib_index, FIB_PROTOCOL_IP6); fib_source_t source; - - /* + + /* * validate no more routes. */ - ASSERT(0 == fib_table->ft_total_route_counts); - FOR_EACH_FIB_SOURCE(source) +#if CLIB_DEBUG > 0 + if (0 != fib_table->ft_total_route_counts) + fib_table_assert_empty(fib_table); +#endif + + vec_foreach_index(source, fib_table->ft_src_route_counts) { ASSERT(0 == fib_table->ft_src_route_counts[source]); } @@ -191,6 +174,7 @@ ip6_fib_table_destroy (u32 fib_index) { hash_unset (ip6_main.fib_index_by_table_id, fib_table->ft_table_id); } + vec_free(fib_table->ft_src_route_counts); pool_put_index(ip6_main.v6_fibs, fib_table->ft_index); pool_put(ip6_main.fibs, fib_table); } @@ -200,12 +184,12 @@ ip6_fib_table_lookup (u32 fib_index, const ip6_address_t *addr, u32 len) { - const ip6_fib_table_instance_t *table; - BVT(clib_bihash_kv) kv, value; + ip6_fib_table_instance_t *table; + clib_bihash_kv_24_8_t kv, value; int i, n_p, rv; u64 fib; - table = &ip6_main.ip6_table[IP6_FIB_TABLE_NON_FWDING]; + table = &ip6_fib_table[IP6_FIB_TABLE_NON_FWDING]; n_p = vec_len (table->prefix_lengths_in_search_order); kv.key[0] = addr->as_u64[0]; @@ -233,7 +217,7 @@ ip6_fib_table_lookup (u32 fib_index, kv.key[1] &= mask->as_u64[1]; kv.key[2] = fib | dst_address_length; - rv = BV(clib_bihash_search_inline_2)(&table->ip6_hash, &kv, &value); + rv = clib_bihash_search_inline_2_24_8(&table->ip6_hash, &kv, &value); if (rv == 0) return value.value; } @@ -246,13 +230,13 @@ ip6_fib_table_lookup_exact_match (u32 fib_index, const ip6_address_t *addr, u32 len) { - const ip6_fib_table_instance_t *table; - BVT(clib_bihash_kv) kv, value; + ip6_fib_table_instance_t *table; + clib_bihash_kv_24_8_t kv, value; ip6_address_t *mask; u64 fib; int rv; - table = &ip6_main.ip6_table[IP6_FIB_TABLE_NON_FWDING]; + table = &ip6_fib_table[IP6_FIB_TABLE_NON_FWDING]; mask = &ip6_main.fib_masks[len]; fib = ((u64)((fib_index))<<32); @@ -260,7 +244,7 @@ ip6_fib_table_lookup_exact_match (u32 fib_index, kv.key[1] = addr->as_u64[1] & mask->as_u64[1]; kv.key[2] = fib | len; - rv = BV(clib_bihash_search_inline_2)(&table->ip6_hash, &kv, &value); + rv = clib_bihash_search_inline_2_24_8(&table->ip6_hash, &kv, &value); if (rv == 0) return value.value; @@ -270,14 +254,29 @@ ip6_fib_table_lookup_exact_match (u32 fib_index, static void compute_prefix_lengths_in_search_order (ip6_fib_table_instance_t *table) { + u8 *old, *prefix_lengths_in_search_order = NULL; int i; - vec_reset_length (table->prefix_lengths_in_search_order); + + /* + * build the list in a scratch space then cutover so the workers + * can continue uninterrupted. + */ + old = table->prefix_lengths_in_search_order; + /* Note: bitmap reversed so this is in fact a longest prefix match */ - clib_bitmap_foreach (i, table->non_empty_dst_address_length_bitmap, - ({ + clib_bitmap_foreach (i, table->non_empty_dst_address_length_bitmap) + { int dst_address_length = 128 - i; - vec_add1(table->prefix_lengths_in_search_order, dst_address_length); - })); + vec_add1(prefix_lengths_in_search_order, dst_address_length); + } + + table->prefix_lengths_in_search_order = prefix_lengths_in_search_order; + + /* + * let the workers go once round the track before we free the old set + */ + vlib_worker_wait_one_loop(); + vec_free(old); } void @@ -286,11 +285,11 @@ ip6_fib_table_entry_remove (u32 fib_index, u32 len) { ip6_fib_table_instance_t *table; - BVT(clib_bihash_kv) kv; + clib_bihash_kv_24_8_t kv; ip6_address_t *mask; u64 fib; - table = &ip6_main.ip6_table[IP6_FIB_TABLE_NON_FWDING]; + table = &ip6_fib_table[IP6_FIB_TABLE_NON_FWDING]; mask = &ip6_main.fib_masks[len]; fib = ((u64)((fib_index))<<32); @@ -298,7 +297,7 @@ ip6_fib_table_entry_remove (u32 fib_index, kv.key[1] = addr->as_u64[1] & mask->as_u64[1]; kv.key[2] = fib | len; - BV(clib_bihash_add_del)(&table->ip6_hash, &kv, 0); + clib_bihash_add_del_24_8(&table->ip6_hash, &kv, 0); /* refcount accounting */ ASSERT (table->dst_address_length_refcounts[len] > 0); @@ -318,11 +317,11 @@ ip6_fib_table_entry_insert (u32 fib_index, fib_node_index_t fib_entry_index) { ip6_fib_table_instance_t *table; - BVT(clib_bihash_kv) kv; + clib_bihash_kv_24_8_t kv; ip6_address_t *mask; u64 fib; - table = &ip6_main.ip6_table[IP6_FIB_TABLE_NON_FWDING]; + table = &ip6_fib_table[IP6_FIB_TABLE_NON_FWDING]; mask = &ip6_main.fib_masks[len]; fib = ((u64)((fib_index))<<32); @@ -331,53 +330,15 @@ ip6_fib_table_entry_insert (u32 fib_index, kv.key[2] = fib | len; kv.value = fib_entry_index; - BV(clib_bihash_add_del)(&table->ip6_hash, &kv, 1); + clib_bihash_add_del_24_8(&table->ip6_hash, &kv, 1); - table->dst_address_length_refcounts[len]++; - - table->non_empty_dst_address_length_bitmap = - clib_bitmap_set (table->non_empty_dst_address_length_bitmap, - 128 - len, 1); - compute_prefix_lengths_in_search_order (table); -} - -u32 -ip6_fib_table_fwding_lookup (ip6_main_t * im, - u32 fib_index, - const ip6_address_t * dst) -{ - const ip6_fib_table_instance_t *table; - int i, len; - int rv; - BVT(clib_bihash_kv) kv, value; - u64 fib; - - table = &ip6_main.ip6_table[IP6_FIB_TABLE_FWDING]; - len = vec_len (table->prefix_lengths_in_search_order); - - kv.key[0] = dst->as_u64[0]; - kv.key[1] = dst->as_u64[1]; - fib = ((u64)((fib_index))<<32); - - for (i = 0; i < len; i++) + if (0 == table->dst_address_length_refcounts[len]++) { - int dst_address_length = table->prefix_lengths_in_search_order[i]; - ip6_address_t * mask = &ip6_main.fib_masks[dst_address_length]; - - ASSERT(dst_address_length >= 0 && dst_address_length <= 128); - //As lengths are decreasing, masks are increasingly specific. - kv.key[0] &= mask->as_u64[0]; - kv.key[1] &= mask->as_u64[1]; - kv.key[2] = fib | dst_address_length; - - rv = BV(clib_bihash_search_inline_2)(&table->ip6_hash, &kv, &value); - if (rv == 0) - return value.value; + table->non_empty_dst_address_length_bitmap = + clib_bitmap_set (table->non_empty_dst_address_length_bitmap, + 128 - len, 1); + compute_prefix_lengths_in_search_order (table); } - - /* default route is always present */ - ASSERT(0); - return 0; } u32 ip6_fib_table_fwding_lookup_with_if_index (ip6_main_t * im, @@ -385,7 +346,7 @@ u32 ip6_fib_table_fwding_lookup_with_if_index (ip6_main_t * im, const ip6_address_t * dst) { u32 fib_index = vec_elt (im->fib_index_by_sw_if_index, sw_if_index); - return ip6_fib_table_fwding_lookup(im, fib_index, dst); + return ip6_fib_table_fwding_lookup(fib_index, dst); } u32 @@ -409,11 +370,11 @@ ip6_fib_table_fwding_dpo_update (u32 fib_index, const dpo_id_t *dpo) { ip6_fib_table_instance_t *table; - BVT(clib_bihash_kv) kv; + clib_bihash_kv_24_8_t kv; ip6_address_t *mask; u64 fib; - table = &ip6_main.ip6_table[IP6_FIB_TABLE_FWDING]; + table = &ip6_fib_table[IP6_FIB_TABLE_FWDING]; mask = &ip6_main.fib_masks[len]; fib = ((u64)((fib_index))<<32); @@ -422,14 +383,15 @@ ip6_fib_table_fwding_dpo_update (u32 fib_index, kv.key[2] = fib | len; kv.value = dpo->dpoi_index; - BV(clib_bihash_add_del)(&table->ip6_hash, &kv, 1); - - table->dst_address_length_refcounts[len]++; + clib_bihash_add_del_24_8(&table->ip6_hash, &kv, 1); - table->non_empty_dst_address_length_bitmap = - clib_bitmap_set (table->non_empty_dst_address_length_bitmap, - 128 - len, 1); - compute_prefix_lengths_in_search_order (table); + if (0 == table->dst_address_length_refcounts[len]++) + { + table->non_empty_dst_address_length_bitmap = + clib_bitmap_set (table->non_empty_dst_address_length_bitmap, + 128 - len, 1); + compute_prefix_lengths_in_search_order (table); + } } void @@ -439,11 +401,11 @@ ip6_fib_table_fwding_dpo_remove (u32 fib_index, const dpo_id_t *dpo) { ip6_fib_table_instance_t *table; - BVT(clib_bihash_kv) kv; + clib_bihash_kv_24_8_t kv; ip6_address_t *mask; u64 fib; - table = &ip6_main.ip6_table[IP6_FIB_TABLE_FWDING]; + table = &ip6_fib_table[IP6_FIB_TABLE_FWDING]; mask = &ip6_main.fib_masks[len]; fib = ((u64)((fib_index))<<32); @@ -452,7 +414,7 @@ ip6_fib_table_fwding_dpo_remove (u32 fib_index, kv.key[2] = fib | len; kv.value = dpo->dpoi_index; - BV(clib_bihash_add_del)(&table->ip6_hash, &kv, 0); + clib_bihash_add_del_24_8(&table->ip6_hash, &kv, 0); /* refcount accounting */ ASSERT (table->dst_address_length_refcounts[len] > 0); @@ -474,6 +436,8 @@ typedef struct ip6_fib_walk_ctx_t_ u32 i6w_fib_index; fib_table_walk_fn_t i6w_fn; void *i6w_ctx; + fib_prefix_t i6w_root; + fib_prefix_t *i6w_sub_trees; } ip6_fib_walk_ctx_t; static int @@ -481,11 +445,58 @@ ip6_fib_walk_cb (clib_bihash_kv_24_8_t * kvp, void *arg) { ip6_fib_walk_ctx_t *ctx = arg; + ip6_address_t key; if ((kvp->key[2] >> 32) == ctx->i6w_fib_index) { - ctx->i6w_fn(kvp->value, ctx->i6w_ctx); + key.as_u64[0] = kvp->key[0]; + key.as_u64[1] = kvp->key[1]; + + if (ip6_destination_matches_route(&ip6_main, + &key, + &ctx->i6w_root.fp_addr.ip6, + ctx->i6w_root.fp_len)) + { + const fib_prefix_t *sub_tree; + int skip = 0; + + /* + * exclude sub-trees the walk does not want to explore + */ + vec_foreach(sub_tree, ctx->i6w_sub_trees) + { + if (ip6_destination_matches_route(&ip6_main, + &key, + &sub_tree->fp_addr.ip6, + sub_tree->fp_len)) + { + skip = 1; + break; + } + } + + if (!skip) + { + switch (ctx->i6w_fn(kvp->value, ctx->i6w_ctx)) + { + case FIB_TABLE_WALK_CONTINUE: + break; + case FIB_TABLE_WALK_SUB_TREE_STOP: { + fib_prefix_t pfx = { + .fp_proto = FIB_PROTOCOL_IP6, + .fp_len = kvp->key[2] & 0xffffffff, + .fp_addr.ip6 = key, + }; + vec_add1(ctx->i6w_sub_trees, pfx); + break; + } + case FIB_TABLE_WALK_STOP: + goto done; + } + } + } } +done: return (1); } @@ -499,20 +510,44 @@ ip6_fib_table_walk (u32 fib_index, .i6w_fib_index = fib_index, .i6w_fn = fn, .i6w_ctx = arg, + .i6w_root = { + .fp_proto = FIB_PROTOCOL_IP6, + }, + .i6w_sub_trees = NULL, }; - ip6_main_t *im = &ip6_main; - BV(clib_bihash_foreach_key_value_pair)(&im->ip6_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash, - ip6_fib_walk_cb, - &ctx); + clib_bihash_foreach_key_value_pair_24_8( + &ip6_fib_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash, + ip6_fib_walk_cb, + &ctx); + vec_free(ctx.i6w_sub_trees); +} + +void +ip6_fib_table_sub_tree_walk (u32 fib_index, + const fib_prefix_t *root, + fib_table_walk_fn_t fn, + void *arg) +{ + ip6_fib_walk_ctx_t ctx = { + .i6w_fib_index = fib_index, + .i6w_fn = fn, + .i6w_ctx = arg, + .i6w_root = *root, + }; + + clib_bihash_foreach_key_value_pair_24_8( + &ip6_fib_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash, + ip6_fib_walk_cb, + &ctx); } typedef struct ip6_fib_show_ctx_t_ { fib_node_index_t *entries; } ip6_fib_show_ctx_t; -static int +static fib_table_walk_rc_t ip6_fib_table_show_walk (fib_node_index_t fib_entry_index, void *arg) { @@ -520,7 +555,7 @@ ip6_fib_table_show_walk (fib_node_index_t fib_entry_index, vec_add1(ctx->entries, fib_entry_index); - return (1); + return (FIB_TABLE_WALK_CONTINUE); } static void @@ -561,24 +596,41 @@ ip6_fib_table_show_one (ip6_fib_t *fib, FIB_ENTRY_FORMAT_DETAIL)); } +u8 * +format_ip6_fib_table_memory (u8 * s, va_list * args) +{ + uword bytes_inuse; + + bytes_inuse = (alloc_arena_next(&(ip6_fib_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash)) + + alloc_arena_next(&(ip6_fib_table[IP6_FIB_TABLE_FWDING].ip6_hash))); + + s = format(s, "%=30s %=6d %=12ld\n", + "IPv6 unicast", + pool_elts(ip6_main.fibs), + bytes_inuse); + return (s); +} + typedef struct { u32 fib_index; u64 count_by_prefix_length[129]; } count_routes_in_fib_at_prefix_length_arg_t; -static void -count_routes_in_fib_at_prefix_length (BVT(clib_bihash_kv) * kvp, +static int +count_routes_in_fib_at_prefix_length (clib_bihash_kv_24_8_t * kvp, void *arg) { count_routes_in_fib_at_prefix_length_arg_t * ap = arg; int mask_width; if ((kvp->key[2]>>32) != ap->fib_index) - return; + return (BIHASH_WALK_CONTINUE); mask_width = kvp->key[2] & 0xFF; ap->count_by_prefix_length[mask_width]++; + + return (BIHASH_WALK_CONTINUE); } static clib_error_t * @@ -595,6 +647,7 @@ ip6_show_fib (vlib_main_t * vm, u32 mask_len = 128; int table_id = -1, fib_index = ~0; int detail = 0; + int hash = 0; verbose = 1; matching = 0; @@ -610,6 +663,11 @@ ip6_show_fib (vlib_main_t * vm, unformat (input, "det")) detail = 1; + else if (unformat (input, "hash") || + unformat (input, "mem") || + unformat (input, "memory")) + hash = 1; + else if (unformat (input, "%U/%d", unformat_ip6_address, &matching_address, &mask_len)) matching = 1; @@ -625,31 +683,66 @@ ip6_show_fib (vlib_main_t * vm, break; } - pool_foreach (fib_table, im6->fibs, - ({ + if (hash) + { + vlib_cli_output (vm, "IPv6 Non-Forwarding Hash Table:\n%U\n", + BV (format_bihash), + &ip6_fib_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash, + detail); + vlib_cli_output (vm, "IPv6 Forwarding Hash Table:\n%U\n", + BV (format_bihash), + &ip6_fib_table[IP6_FIB_TABLE_FWDING].ip6_hash, + detail); + return (NULL); + } + + pool_foreach (fib_table, im6->fibs) + { + fib_source_t source; + u8 *s = NULL; + fib = pool_elt_at_index(im6->v6_fibs, fib_table->ft_index); if (table_id >= 0 && table_id != (int)fib->table_id) continue; if (fib_index != ~0 && fib_index != (int)fib->index) continue; - - vlib_cli_output (vm, "%s, fib_index:%d, flow hash:[%U] locks:%d", - fib_table->ft_desc, fib->index, - format_ip_flow_hash_config, fib_table->ft_flow_hash_config, - fib_table->ft_locks); + if (fib_table->ft_flags & FIB_TABLE_FLAG_IP6_LL) + continue; + + s = format(s, "%U, fib_index:%d, flow hash:[%U] epoch:%d flags:%U locks:[", + format_fib_table_name, fib->index, + FIB_PROTOCOL_IP6, + fib->index, + format_ip_flow_hash_config, + fib_table->ft_flow_hash_config, + fib_table->ft_epoch, + format_fib_table_flags, fib_table->ft_flags); + + vec_foreach_index(source, fib_table->ft_locks) + { + if (0 != fib_table->ft_locks[source]) + { + s = format(s, "%U:%d, ", + format_fib_source, source, + fib_table->ft_locks[source]); + } + } + s = format (s, "]"); + vlib_cli_output (vm, "%v", s); + vec_free(s); /* Show summary? */ if (! verbose) { - BVT(clib_bihash) * h = &im6->ip6_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash; + clib_bihash_24_8_t * h = &ip6_fib_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash; int len; vlib_cli_output (vm, "%=20s%=16s", "Prefix length", "Count"); - memset (ca, 0, sizeof(*ca)); + clib_memset (ca, 0, sizeof(*ca)); ca->fib_index = fib->index; - BV(clib_bihash_foreach_key_value_pair) + clib_bihash_foreach_key_value_pair_24_8 (h, count_routes_in_fib_at_prefix_length, ca); for (len = 128; len >= 0; len--) @@ -669,7 +762,7 @@ ip6_show_fib (vlib_main_t * vm, { ip6_fib_table_show_one(fib, vm, &matching_address, mask_len, detail); } - })); + } return 0; } @@ -679,7 +772,7 @@ ip6_show_fib (vlib_main_t * vm, * entries for each table. * * @note This command will run for a long time when the FIB tables are - * comprised of millions of entries. For those senarios, consider displaying + * comprised of millions of entries. For those scenarios, consider displaying * in summary mode. * * @cliexpar @@ -775,3 +868,55 @@ VLIB_CLI_COMMAND (ip6_show_fib_command, static) = { .function = ip6_show_fib, }; /* *INDENT-ON* */ + +static clib_error_t * +ip6_config (vlib_main_t * vm, unformat_input_t * input) +{ + uword heapsize = 0; + u32 nbuckets = 0; + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "hash-buckets %d", &nbuckets)) + ; + else if (unformat (input, "heap-size %U", + unformat_memory_size, &heapsize)) + ; + else + return clib_error_return (0, "unknown input '%U'", + format_unformat_error, input); + } + + ip6_fib_table_nbuckets = nbuckets; + ip6_fib_table_size = heapsize; + + return 0; +} + +VLIB_EARLY_CONFIG_FUNCTION (ip6_config, "ip6"); + +static clib_error_t * +ip6_fib_init (vlib_main_t * vm) +{ + if (ip6_fib_table_nbuckets == 0) + ip6_fib_table_nbuckets = IP6_FIB_DEFAULT_HASH_NUM_BUCKETS; + + ip6_fib_table_nbuckets = 1 << max_log2 (ip6_fib_table_nbuckets); + + if (ip6_fib_table_size == 0) + ip6_fib_table_size = IP6_FIB_DEFAULT_HASH_MEMORY_SIZE; + + clib_bihash_init_24_8 (&(ip6_fib_table[IP6_FIB_TABLE_FWDING].ip6_hash), + "ip6 FIB fwding table", + ip6_fib_table_nbuckets, ip6_fib_table_size); + clib_bihash_init_24_8 (&ip6_fib_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash, + "ip6 FIB non-fwding table", + ip6_fib_table_nbuckets, ip6_fib_table_size); + + return (NULL); +} + +VLIB_INIT_FUNCTION (ip6_fib_init) = +{ + .runs_before = VLIB_INITS("ip6_lookup_init"), +};