X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ffib%2Fip6_fib.c;h=784f52c0460d5d1e2aeedf4d5bd8117f49f72192;hb=cbe25aab3be72154f2c706c39eeba6a77f34450f;hp=22b47579d3ea3093b0b11ee337c21badc63994f2;hpb=9466c45ceed735b0fc2820f0444ba0dfea03a8f1;p=vpp.git diff --git a/src/vnet/fib/ip6_fib.c b/src/vnet/fib/ip6_fib.c index 22b47579d3e..784f52c0460 100644 --- a/src/vnet/fib/ip6_fib.c +++ b/src/vnet/fib/ip6_fib.c @@ -17,6 +17,9 @@ #include #include +#include +#include + static void vnet_ip6_fib_init (u32 fib_index) { @@ -63,8 +66,8 @@ create_fib_with_table_id (u32 table_id, 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)); @@ -148,11 +151,15 @@ ip6_fib_table_destroy (u32 fib_index) 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) +#ifdef CLIB_DEBUG + 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]); } @@ -161,6 +168,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); } @@ -171,7 +179,7 @@ ip6_fib_table_lookup (u32 fib_index, u32 len) { ip6_fib_table_instance_t *table; - BVT(clib_bihash_kv) kv, value; + clib_bihash_kv_24_8_t kv, value; int i, n_p, rv; u64 fib; @@ -203,7 +211,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; } @@ -217,7 +225,7 @@ ip6_fib_table_lookup_exact_match (u32 fib_index, u32 len) { ip6_fib_table_instance_t *table; - BVT(clib_bihash_kv) kv, value; + clib_bihash_kv_24_8_t kv, value; ip6_address_t *mask; u64 fib; int rv; @@ -230,7 +238,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; @@ -256,7 +264,7 @@ 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; @@ -268,7 +276,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); @@ -288,7 +296,7 @@ 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; @@ -301,7 +309,7 @@ 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]++; @@ -316,7 +324,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 @@ -340,7 +348,7 @@ 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; @@ -353,7 +361,7 @@ 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); + clib_bihash_add_del_24_8(&table->ip6_hash, &kv, 1); table->dst_address_length_refcounts[len]++; @@ -370,7 +378,7 @@ 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; @@ -383,7 +391,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); @@ -485,7 +493,7 @@ ip6_fib_table_walk (u32 fib_index, .i6w_sub_trees = NULL, }; - BV(clib_bihash_foreach_key_value_pair)( + clib_bihash_foreach_key_value_pair_24_8( &ip6_main.ip6_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash, ip6_fib_walk_cb, &ctx); @@ -506,7 +514,7 @@ ip6_fib_table_sub_tree_walk (u32 fib_index, .i6w_root = *root, }; - BV(clib_bihash_foreach_key_value_pair)( + clib_bihash_foreach_key_value_pair_24_8( &ip6_main.ip6_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash, ip6_fib_walk_cb, &ctx); @@ -570,16 +578,10 @@ format_ip6_fib_table_memory (u8 * s, va_list * args) { uword bytes_inuse; - bytes_inuse = - alloc_arena_next - (&(ip6_main.ip6_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash)) - - alloc_arena (&(ip6_main.ip6_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash)); + bytes_inuse = (alloc_arena_next(&(ip6_main.ip6_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash)) + + alloc_arena_next(&(ip6_main.ip6_table[IP6_FIB_TABLE_FWDING].ip6_hash))); - bytes_inuse += - alloc_arena_next(&(ip6_main.ip6_table[IP6_FIB_TABLE_FWDING].ip6_hash)) - - alloc_arena(&(ip6_main.ip6_table[IP6_FIB_TABLE_FWDING].ip6_hash)); - - s = format(s, "%=30s %=6d %=8ld\n", + s = format(s, "%=30s %=6d %=12ld\n", "IPv6 unicast", pool_elts(ip6_main.fibs), bytes_inuse); @@ -591,19 +593,21 @@ typedef struct { 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 * @@ -620,6 +624,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; @@ -635,6 +640,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; @@ -650,6 +660,19 @@ ip6_show_fib (vlib_main_t * vm, break; } + if (hash) + { + vlib_cli_output (vm, "IPv6 Non-Forwarding Hash Table:\n%U\n", + BV (format_bihash), + &im6->ip6_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash, + detail); + vlib_cli_output (vm, "IPv6 Forwarding Hash Table:\n%U\n", + BV (format_bihash), + &im6->ip6_table[IP6_FIB_TABLE_FWDING].ip6_hash, + detail); + return (NULL); + } + pool_foreach (fib_table, im6->fibs, ({ fib_source_t source; @@ -663,13 +686,16 @@ ip6_show_fib (vlib_main_t * vm, if (fib_table->ft_flags & FIB_TABLE_FLAG_IP6_LL) continue; - s = format(s, "%U, fib_index:%d, flow hash:[%U] locks:[", + 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); - FOR_EACH_FIB_SOURCE(source) + 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]) { @@ -685,15 +711,15 @@ ip6_show_fib (vlib_main_t * vm, /* Show summary? */ if (! verbose) { - BVT(clib_bihash) * h = &im6->ip6_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash; + clib_bihash_24_8_t * h = &im6->ip6_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--)