X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fadj%2Fadj_nbr.c;h=811d0b8faa2f17c6093b6ef255651876c221deab;hb=8f5fef2c7;hp=2e0888b8c7cc5e4aba4e35f7f3e82e28757ac88d;hpb=77cfc0171da0fa2b305378731a5fefd659d8947d;p=vpp.git diff --git a/src/vnet/adj/adj_nbr.c b/src/vnet/adj/adj_nbr.c index 2e0888b8c7c..811d0b8faa2 100644 --- a/src/vnet/adj/adj_nbr.c +++ b/src/vnet/adj/adj_nbr.c @@ -18,30 +18,41 @@ #include #include -#include - /* * Vector Hash tables of neighbour (traditional) adjacencies * Key: interface(for the vector index), address (and its proto), * link-type/ether-type. */ -static BVT(clib_bihash) **adj_nbr_tables[FIB_PROTOCOL_MAX]; - -// FIXME SIZE APPROPRIATELY. ASK DAVEB. -#define ADJ_NBR_DEFAULT_HASH_NUM_BUCKETS (64 * 64) -#define ADJ_NBR_DEFAULT_HASH_MEMORY_SIZE (32<<20) +static uword **adj_nbr_tables[FIB_PROTOCOL_IP_MAX]; +typedef struct adj_nbr_key_t_ +{ + ip46_address_t ank_ip; + u64 ank_linkt; +} adj_nbr_key_t; #define ADJ_NBR_SET_KEY(_key, _lt, _nh) \ { \ - _key.key[0] = (_nh)->as_u64[0]; \ - _key.key[1] = (_nh)->as_u64[1]; \ - _key.key[2] = (_lt); \ + ip46_address_copy(&(_key).ank_ip, (_nh)); \ + _key.ank_linkt = (_lt); \ } #define ADJ_NBR_ITF_OK(_proto, _itf) \ (((_itf) < vec_len(adj_nbr_tables[_proto])) && \ - (NULL != adj_nbr_tables[_proto][sw_if_index])) + (NULL != adj_nbr_tables[_proto][(_itf)])) + +#define ADJ_NBR_ASSERT_NH_PROTO(nh_proto, err) \ + do { \ + ASSERT (nh_proto < FIB_PROTOCOL_IP_MAX); \ + const fib_protocol_t nh_proto__ = (nh_proto); \ + if (nh_proto__ >= FIB_PROTOCOL_IP_MAX) \ + { \ + clib_warning ("BUG: protocol %d > %d\n", \ + (int)nh_proto__, \ + FIB_PROTOCOL_IP_MAX); \ + return err; \ + } \ + } while (0) static void adj_nbr_insert (fib_protocol_t nh_proto, @@ -50,7 +61,9 @@ adj_nbr_insert (fib_protocol_t nh_proto, u32 sw_if_index, adj_index_t adj_index) { - BVT(clib_bihash_kv) kv; + adj_nbr_key_t kv; + + ADJ_NBR_ASSERT_NH_PROTO (nh_proto,); if (sw_if_index >= vec_len(adj_nbr_tables[nh_proto])) { @@ -59,22 +72,13 @@ adj_nbr_insert (fib_protocol_t nh_proto, if (NULL == adj_nbr_tables[nh_proto][sw_if_index]) { adj_nbr_tables[nh_proto][sw_if_index] = - clib_mem_alloc_aligned(sizeof(BVT(clib_bihash)), - CLIB_CACHE_LINE_BYTES); - clib_memset(adj_nbr_tables[nh_proto][sw_if_index], - 0, - sizeof(BVT(clib_bihash))); - - BV(clib_bihash_init) (adj_nbr_tables[nh_proto][sw_if_index], - "Adjacency Neighbour table", - ADJ_NBR_DEFAULT_HASH_NUM_BUCKETS, - ADJ_NBR_DEFAULT_HASH_MEMORY_SIZE); + hash_create_mem(0, sizeof(adj_nbr_key_t), sizeof(adj_index_t)); } ADJ_NBR_SET_KEY(kv, link_type, nh_addr); - kv.value = adj_index; - BV(clib_bihash_add_del) (adj_nbr_tables[nh_proto][sw_if_index], &kv, 1); + hash_set_mem_alloc (&adj_nbr_tables[nh_proto][sw_if_index], + &kv, adj_index); } void @@ -84,15 +88,21 @@ adj_nbr_remove (adj_index_t ai, const ip46_address_t *nh_addr, u32 sw_if_index) { - BVT(clib_bihash_kv) kv; + adj_nbr_key_t kv; + + ADJ_NBR_ASSERT_NH_PROTO (nh_proto,); if (!ADJ_NBR_ITF_OK(nh_proto, sw_if_index)) return; ADJ_NBR_SET_KEY(kv, link_type, nh_addr); - kv.value = ai; - BV(clib_bihash_add_del) (adj_nbr_tables[nh_proto][sw_if_index], &kv, 0); + hash_unset_mem_free(&adj_nbr_tables[nh_proto][sw_if_index], &kv); + + if (0 == hash_elts(adj_nbr_tables[nh_proto][sw_if_index])) + { + hash_free(adj_nbr_tables[nh_proto][sw_if_index]); + } } adj_index_t @@ -101,22 +111,23 @@ adj_nbr_find (fib_protocol_t nh_proto, const ip46_address_t *nh_addr, u32 sw_if_index) { - BVT(clib_bihash_kv) kv; + adj_nbr_key_t kv; + uword *p; + + ADJ_NBR_ASSERT_NH_PROTO (nh_proto, ADJ_INDEX_INVALID); ADJ_NBR_SET_KEY(kv, link_type, nh_addr); if (!ADJ_NBR_ITF_OK(nh_proto, sw_if_index)) return (ADJ_INDEX_INVALID); - if (BV(clib_bihash_search)(adj_nbr_tables[nh_proto][sw_if_index], - &kv, &kv) < 0) - { - return (ADJ_INDEX_INVALID); - } - else + p = hash_get_mem(adj_nbr_tables[nh_proto][sw_if_index], &kv); + + if (p) { - return (kv.value); + return (p[0]); } + return (ADJ_INDEX_INVALID); } static inline u32 @@ -168,9 +179,16 @@ adj_nbr_evaluate_feature (adj_index_t ai) { feature_count = fm->feature_count_by_sw_if_index[arc_index][sw_if_index]; if (feature_count > 0) + { + vnet_feature_config_main_t *cm; + adj->rewrite_header.flags |= VNET_REWRITE_HAS_FEATURES; - } + cm = &fm->feature_config_mains[arc_index]; + adj->ia_cfg_index = vec_elt (cm->config_index_by_sw_if_index, + sw_if_index); + } + } return; } @@ -204,6 +222,27 @@ adj_nbr_alloc (fib_protocol_t nh_proto, return (adj); } +void +adj_nbr_set_mtu (adj_index_t adj_index, u16 mtu) +{ + ip_adjacency_t *adj; + + ASSERT(ADJ_INDEX_INVALID != adj_index); + + adj = adj_get(adj_index); + + if (0 == mtu) + vnet_rewrite_update_mtu(vnet_get_main(), adj->ia_link, + &adj->rewrite_header); + else + { + vnet_rewrite_update_mtu(vnet_get_main(), adj->ia_link, + &adj->rewrite_header); + adj->rewrite_header.max_l3_packet_bytes = + clib_min (adj->rewrite_header.max_l3_packet_bytes, mtu); + } +} + /* * adj_nbr_add_or_lock * @@ -250,13 +289,13 @@ adj_nbr_add_or_lock (fib_protocol_t nh_proto, * So ask the interface to do it. */ vnet_update_adjacency_for_sw_interface(vnm, sw_if_index, adj_index); + adj_delegate_adj_created(adj_get(adj_index)); } else { adj_lock(adj_index); } - adj_delegate_adj_created(adj_get(adj_index)); return (adj_index); } @@ -347,7 +386,7 @@ adj_nbr_update_rewrite_internal (ip_adjacency_t *adj, u8 *rewrite) { ip_adjacency_t *walk_adj; - adj_index_t walk_ai; + adj_index_t walk_ai, ai; vlib_main_t * vm; u32 old_next; int do_walk; @@ -355,7 +394,7 @@ adj_nbr_update_rewrite_internal (ip_adjacency_t *adj, vm = vlib_get_main(); old_next = adj->lookup_next_index; - walk_ai = adj_get_index(adj); + ai = walk_ai = adj_get_index(adj); if (VNET_LINK_MPLS == adj->ia_link) { /* @@ -399,7 +438,7 @@ adj_nbr_update_rewrite_internal (ip_adjacency_t *adj, * DPO, this adj will no longer be in use and its lock count will drop to 0. * We don't want it to be deleted as part of this endeavour. */ - adj_lock(adj_get_index(adj)); + adj_lock(ai); adj_lock(walk_ai); /* @@ -452,6 +491,12 @@ adj_nbr_update_rewrite_internal (ip_adjacency_t *adj, }; fib_walk_sync(FIB_NODE_TYPE_ADJ, walk_ai, &bw_ctx); + /* + * fib_walk_sync may allocate a new adjacency and potentially cuase a + * realloc for adj_pool. When that happens, adj pointer is no longer + * valid here. We refresh the adj pointer accordingly. + */ + adj = adj_get (ai); } /* @@ -464,6 +509,7 @@ adj_nbr_update_rewrite_internal (ip_adjacency_t *adj, vlib_worker_thread_barrier_sync(vm); adj->lookup_next_index = adj_next_index; + adj->ia_node_index = this_node; if (NULL != rewrite) { @@ -510,33 +556,21 @@ adj_nbr_update_rewrite_internal (ip_adjacency_t *adj, */ if (do_walk) { + walk_adj = adj_get(walk_ai); walk_adj->ia_flags &= ~ADJ_FLAG_SYNC_WALK_ACTIVE; } - adj_unlock(adj_get_index(adj)); + adj_delegate_adj_modified(adj); + adj_unlock(ai); adj_unlock(walk_ai); } -typedef struct adj_db_count_ctx_t_ { - u64 count; -} adj_db_count_ctx_t; - -static void -adj_db_count (BVT(clib_bihash_kv) * kvp, - void *arg) -{ - adj_db_count_ctx_t * ctx = arg; - ctx->count++; -} - u32 adj_nbr_db_size (void) { - adj_db_count_ctx_t ctx = { - .count = 0, - }; fib_protocol_t proto; u32 sw_if_index = 0; + u64 count = 0; for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++) { @@ -544,53 +578,46 @@ adj_nbr_db_size (void) { if (NULL != adj_nbr_tables[proto][sw_if_index]) { - BV(clib_bihash_foreach_key_value_pair) ( - adj_nbr_tables[proto][sw_if_index], - adj_db_count, - &ctx); + count += hash_elts(adj_nbr_tables[proto][sw_if_index]); } } } - return (ctx.count); + return (count); } /** - * @brief Context for a walk of the adjacency neighbour DB + * @brief Walk all adjacencies on a link for a given next-hop protocol */ -typedef struct adj_walk_ctx_t_ -{ - adj_walk_cb_t awc_cb; - void *awc_ctx; -} adj_walk_ctx_t; - -static void -adj_nbr_walk_cb (BVT(clib_bihash_kv) * kvp, - void *arg) -{ - adj_walk_ctx_t *ctx = arg; - - // FIXME: can't stop early... - ctx->awc_cb(kvp->value, ctx->awc_ctx); -} - void adj_nbr_walk (u32 sw_if_index, fib_protocol_t adj_nh_proto, adj_walk_cb_t cb, void *ctx) { + adj_index_t ai, *ais, *aip; + adj_nbr_key_t *key; + + ADJ_NBR_ASSERT_NH_PROTO (adj_nh_proto,); + if (!ADJ_NBR_ITF_OK(adj_nh_proto, sw_if_index)) return; - adj_walk_ctx_t awc = { - .awc_ctx = ctx, - .awc_cb = cb, - }; + ais = NULL; + + /* elements may be removed from the table during the walk, so + * collect the set first then process them */ + hash_foreach_mem (key, ai, adj_nbr_tables[adj_nh_proto][sw_if_index], + ({ + vec_add1(ais, ai); + })); - BV(clib_bihash_foreach_key_value_pair) ( - adj_nbr_tables[adj_nh_proto][sw_if_index], - adj_nbr_walk_cb, - &awc); + vec_foreach(aip, ais) + { + /* An adj may be deleted during the walk so check first */ + if (!pool_is_free_index(adj_pool, *aip)) + cb(*aip, ctx); + } + vec_free(ais); } /** @@ -660,18 +687,22 @@ adj_nbr_walk_nh (u32 sw_if_index, adj_walk_cb_t cb, void *ctx) { + ADJ_NBR_ASSERT_NH_PROTO (adj_nh_proto,); + if (!ADJ_NBR_ITF_OK(adj_nh_proto, sw_if_index)) return; - vnet_link_t linkt; - adj_index_t ai; - - FOR_EACH_VNET_LINK(linkt) + switch (adj_nh_proto) { - ai = adj_nbr_find (FIB_PROTOCOL_IP4, linkt, nh, sw_if_index); - - if (INDEX_INVALID != ai) - cb(ai, ctx); + case FIB_PROTOCOL_IP4: + adj_nbr_walk_nh4(sw_if_index, &nh->ip4, cb, ctx); + break; + case FIB_PROTOCOL_IP6: + adj_nbr_walk_nh6(sw_if_index, &nh->ip6, cb, ctx); + break; + case FIB_PROTOCOL_MPLS: + ASSERT(0); + break; } } @@ -900,15 +931,19 @@ adj_nbr_show (vlib_main_t * vm, vlib_cli_command_t * cmd) { adj_index_t ai = ADJ_INDEX_INVALID; + ip46_address_t nh = ip46_address_initializer; u32 sw_if_index = ~0; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "%d", &ai)) + if (unformat (input, "%U", + unformat_vnet_sw_interface, vnet_get_main(), + &sw_if_index)) ; else if (unformat (input, "%U", - unformat_vnet_sw_interface, vnet_get_main(), - &sw_if_index)) + unformat_ip46_address, &nh, IP46_TYPE_ANY)) + ; + else if (unformat (input, "%d", &ai)) ; else break; @@ -925,12 +960,24 @@ adj_nbr_show (vlib_main_t * vm, { fib_protocol_t proto; - for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++) - { - adj_nbr_walk(sw_if_index, proto, - adj_nbr_show_one, - vm); - } + if (ip46_address_is_zero(&nh)) + { + for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++) + { + adj_nbr_walk(sw_if_index, proto, + adj_nbr_show_one, + vm); + } + } + else + { + proto = (ip46_address_is_ip4(&nh) ? + FIB_PROTOCOL_IP4 : + FIB_PROTOCOL_IP6); + adj_nbr_walk_nh(sw_if_index, proto, &nh, + adj_nbr_show_one, + vm); + } } else { @@ -1029,12 +1076,14 @@ const static dpo_vft_t adj_nbr_dpo_vft = { .dv_format = format_adj_nbr, .dv_mem_show = adj_mem_show, .dv_get_urpf = adj_dpo_get_urpf, + .dv_get_mtu = adj_dpo_get_mtu, }; const static dpo_vft_t adj_nbr_incompl_dpo_vft = { .dv_lock = adj_dpo_lock, .dv_unlock = adj_dpo_unlock, .dv_format = format_adj_nbr_incomplete, .dv_get_urpf = adj_dpo_get_urpf, + .dv_get_mtu = adj_dpo_get_mtu, }; /**