X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fadj%2Fadj_nbr.c;h=ff535295b4b8e7461c7ae7fde240219dcb984d42;hb=b7b929931a07fbb27b43d5cd105f366c3e29807e;hp=1344bb67fcc790bea22279d4535c1bc9aaf080d2;hpb=7cd468a3d7dee7d6c92f69a0bb7061ae208ec727;p=vpp.git diff --git a/src/vnet/adj/adj_nbr.c b/src/vnet/adj/adj_nbr.c index 1344bb67fcc..ff535295b4b 100644 --- a/src/vnet/adj/adj_nbr.c +++ b/src/vnet/adj/adj_nbr.c @@ -59,7 +59,7 @@ adj_nbr_insert (fib_protocol_t nh_proto, adj_nbr_tables[nh_proto][sw_if_index] = clib_mem_alloc_aligned(sizeof(BVT(clib_bihash)), CLIB_CACHE_LINE_BYTES); - memset(adj_nbr_tables[nh_proto][sw_if_index], + clib_memset(adj_nbr_tables[nh_proto][sw_if_index], 0, sizeof(BVT(clib_bihash))); @@ -93,7 +93,7 @@ adj_nbr_remove (adj_index_t ai, BV(clib_bihash_add_del) (adj_nbr_tables[nh_proto][sw_if_index], &kv, 0); } -static adj_index_t +adj_index_t adj_nbr_find (fib_protocol_t nh_proto, vnet_link_t link_type, const ip46_address_t *nh_addr, @@ -132,6 +132,46 @@ adj_get_nd_node (fib_protocol_t proto) return (ip4_arp_node.index); } +/** + * @brief Check and set feature flags if o/p interface has any o/p features. + */ +static void +adj_nbr_evaluate_feature (adj_index_t ai) +{ + ip_adjacency_t *adj; + vnet_feature_main_t *fm = &feature_main; + i16 feature_count; + u8 arc_index; + u32 sw_if_index; + + adj = adj_get(ai); + + switch (adj->ia_link) + { + case VNET_LINK_IP4: + arc_index = ip4_main.lookup_main.output_feature_arc_index; + break; + case VNET_LINK_IP6: + arc_index = ip6_main.lookup_main.output_feature_arc_index; + break; + case VNET_LINK_MPLS: + arc_index = mpls_main.output_feature_arc_index; + break; + default: + return; + } + + sw_if_index = adj->rewrite_header.sw_if_index; + if (vec_len(fm->feature_count_by_sw_if_index[arc_index]) > sw_if_index) + { + feature_count = fm->feature_count_by_sw_if_index[arc_index][sw_if_index]; + if (feature_count > 0) + adj->rewrite_header.flags |= VNET_REWRITE_HAS_FEATURES; + } + + return; +} + static ip_adjacency_t* adj_nbr_alloc (fib_protocol_t nh_proto, vnet_link_t link_type, @@ -155,14 +195,13 @@ adj_nbr_alloc (fib_protocol_t nh_proto, adj->ia_link = link_type; adj->ia_nh_proto = nh_proto; adj->rewrite_header.sw_if_index = sw_if_index; - memset(&adj->sub_type.midchain.next_dpo, 0, - sizeof(adj->sub_type.midchain.next_dpo)); + adj_nbr_evaluate_feature (adj_get_index(adj)); return (adj); } /* - * adj_add_for_nbr + * adj_nbr_add_or_lock * * Add an adjacency for the neighbour requested. * @@ -191,7 +230,12 @@ adj_nbr_add_or_lock (fib_protocol_t nh_proto, adj_index = adj_get_index(adj); adj_lock(adj_index); - vnet_rewrite_init(vnm, sw_if_index, + if (ip46_address_is_equal(&ADJ_BCAST_ADDR, nh_addr)) + { + adj->lookup_next_index = IP_LOOKUP_NEXT_BCAST; + } + + vnet_rewrite_init(vnm, sw_if_index, link_type, adj_get_nd_node(nh_proto), vnet_tx_node_index_for_sw_interface(vnm, sw_if_index), &adj->rewrite_header); @@ -292,7 +336,7 @@ adj_nbr_update_rewrite (adj_index_t adj_index, */ void adj_nbr_update_rewrite_internal (ip_adjacency_t *adj, - u32 adj_next_index, + ip_lookup_next_t adj_next_index, u32 this_node, u32 next_node, u8 *rewrite) @@ -326,7 +370,7 @@ adj_nbr_update_rewrite_internal (ip_adjacency_t *adj, if (ADJ_INDEX_INVALID != walk_ai) { walk_adj = adj_get(walk_ai); - if (IP_ADJ_SYNC_WALK_ACTIVE & walk_adj->ia_flags) + if (ADJ_FLAG_SYNC_WALK_ACTIVE & walk_adj->ia_flags) { do_walk = 0; } @@ -335,7 +379,7 @@ adj_nbr_update_rewrite_internal (ip_adjacency_t *adj, /* * Prevent re-entrant walk of the same adj */ - walk_adj->ia_flags |= IP_ADJ_SYNC_WALK_ACTIVE; + walk_adj->ia_flags |= ADJ_FLAG_SYNC_WALK_ACTIVE; do_walk = 1; } } @@ -433,7 +477,6 @@ adj_nbr_update_rewrite_internal (ip_adjacency_t *adj, vnet_rewrite_clear_data_internal(&adj->rewrite_header, sizeof(adj->rewrite_data)); } - adj->rewrite_header.node_index = this_node; adj->rewrite_header.next_index = vlib_node_add_next(vlib_get_main(), this_node, next_node); @@ -462,7 +505,7 @@ adj_nbr_update_rewrite_internal (ip_adjacency_t *adj, */ if (do_walk) { - walk_adj->ia_flags &= ~IP_ADJ_SYNC_WALK_ACTIVE; + walk_adj->ia_flags &= ~ADJ_FLAG_SYNC_WALK_ACTIVE; } adj_unlock(adj_get_index(adj)); @@ -545,29 +588,6 @@ adj_nbr_walk (u32 sw_if_index, &awc); } -/** - * @brief Context for a walk of the adjacency neighbour DB - */ -typedef struct adj_walk_nh_ctx_t_ -{ - adj_walk_cb_t awc_cb; - void *awc_ctx; - const ip46_address_t *awc_nh; -} adj_walk_nh_ctx_t; - -static void -adj_nbr_walk_nh_cb (BVT(clib_bihash_kv) * kvp, - void *arg) -{ - ip_adjacency_t *adj; - adj_walk_nh_ctx_t *ctx = arg; - - adj = adj_get(kvp->value); - - if (!ip46_address_cmp(&adj->sub_type.nbr.next_hop, ctx->awc_nh)) - ctx->awc_cb(kvp->value, ctx->awc_ctx); -} - /** * @brief Walk adjacencies on a link with a given v4 next-hop. * that is visit the adjacencies with different link types. @@ -584,17 +604,16 @@ adj_nbr_walk_nh4 (u32 sw_if_index, ip46_address_t nh = { .ip4 = *addr, }; + vnet_link_t linkt; + adj_index_t ai; - adj_walk_nh_ctx_t awc = { - .awc_ctx = ctx, - .awc_cb = cb, - .awc_nh = &nh, - }; + FOR_EACH_VNET_LINK(linkt) + { + ai = adj_nbr_find (FIB_PROTOCOL_IP4, linkt, &nh, sw_if_index); - BV(clib_bihash_foreach_key_value_pair) ( - adj_nbr_tables[FIB_PROTOCOL_IP4][sw_if_index], - adj_nbr_walk_nh_cb, - &awc); + if (INDEX_INVALID != ai) + cb(ai, ctx); + } } /** @@ -613,17 +632,16 @@ adj_nbr_walk_nh6 (u32 sw_if_index, ip46_address_t nh = { .ip6 = *addr, }; + vnet_link_t linkt; + adj_index_t ai; - adj_walk_nh_ctx_t awc = { - .awc_ctx = ctx, - .awc_cb = cb, - .awc_nh = &nh, - }; + FOR_EACH_VNET_LINK(linkt) + { + ai = adj_nbr_find (FIB_PROTOCOL_IP6, linkt, &nh, sw_if_index); - BV(clib_bihash_foreach_key_value_pair) ( - adj_nbr_tables[FIB_PROTOCOL_IP6][sw_if_index], - adj_nbr_walk_nh_cb, - &awc); + if (INDEX_INVALID != ai) + cb(ai, ctx); + } } /** @@ -640,16 +658,16 @@ adj_nbr_walk_nh (u32 sw_if_index, if (!ADJ_NBR_ITF_OK(adj_nh_proto, sw_if_index)) return; - adj_walk_nh_ctx_t awc = { - .awc_ctx = ctx, - .awc_cb = cb, - .awc_nh = nh, - }; + vnet_link_t linkt; + adj_index_t ai; - BV(clib_bihash_foreach_key_value_pair) ( - adj_nbr_tables[adj_nh_proto][sw_if_index], - adj_nbr_walk_nh_cb, - &awc); + FOR_EACH_VNET_LINK(linkt) + { + ai = adj_nbr_find (FIB_PROTOCOL_IP4, linkt, nh, sw_if_index); + + if (INDEX_INVALID != ai) + cb(ai, ctx); + } } /** @@ -681,7 +699,6 @@ adj_nbr_interface_state_change_one (adj_index_t ai, * since this is the walk that provides convergence */ adj_nbr_interface_state_change_ctx_t *ctx = arg; - fib_node_back_walk_ctx_t bw_ctx = { .fnbw_reason = ((ctx->flags & ADJ_NBR_INTERFACE_UP) ? FIB_NODE_BW_REASON_FLAG_INTERFACE_UP : @@ -693,10 +710,15 @@ adj_nbr_interface_state_change_one (adj_index_t ai, */ .fnbw_flags = (!(ctx->flags & ADJ_NBR_INTERFACE_UP) ? FIB_NODE_BW_FLAG_FORCE_SYNC : - 0), + FIB_NODE_BW_FLAG_NONE), }; + ip_adjacency_t *adj; + adj = adj_get(ai); + + adj->ia_flags |= ADJ_FLAG_SYNC_WALK_ACTIVE; fib_walk_sync(FIB_NODE_TYPE_ADJ, ai, &bw_ctx); + adj->ia_flags &= ~ADJ_FLAG_SYNC_WALK_ACTIVE; return (ADJ_WALK_RC_CONTINUE); } @@ -738,7 +760,7 @@ VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION_PRIO( * @brief Invoked on each SW interface of a HW interface when the * HW interface state changes */ -static void +static walk_rc_t adj_nbr_hw_sw_interface_state_change (vnet_main_t * vnm, u32 sw_if_index, void *arg) @@ -755,6 +777,7 @@ adj_nbr_hw_sw_interface_state_change (vnet_main_t * vnm, adj_nbr_interface_state_change_one, ctx); } + return (WALK_CONTINUE); } /** @@ -796,8 +819,13 @@ adj_nbr_interface_delete_one (adj_index_t ai, fib_node_back_walk_ctx_t bw_ctx = { .fnbw_reason = FIB_NODE_BW_REASON_FLAG_INTERFACE_DELETE, }; + ip_adjacency_t *adj; + + adj = adj_get(ai); + adj->ia_flags |= ADJ_FLAG_SYNC_WALK_ACTIVE; fib_walk_sync(FIB_NODE_TYPE_ADJ, ai, &bw_ctx); + adj->ia_flags &= ~ADJ_FLAG_SYNC_WALK_ACTIVE; return (ADJ_WALK_RC_CONTINUE); } @@ -930,21 +958,6 @@ VLIB_CLI_COMMAND (ip4_show_fib_command, static) = { .function = adj_nbr_show, }; -static ip46_type_t -adj_proto_to_46 (fib_protocol_t proto) -{ - switch (proto) - { - case FIB_PROTOCOL_IP4: - return (IP46_TYPE_IP4); - case FIB_PROTOCOL_IP6: - return (IP46_TYPE_IP6); - default: - return (IP46_TYPE_IP4); - } - return (IP46_TYPE_IP4); -} - u8* format_adj_nbr_incomplete (u8* s, va_list *ap) { @@ -958,10 +971,8 @@ format_adj_nbr_incomplete (u8* s, va_list *ap) format_ip46_address, &adj->sub_type.nbr.next_hop, adj_proto_to_46(adj->ia_nh_proto)); s = format (s, " %U", - format_vnet_sw_interface_name, - vnm, - vnet_get_sw_interface(vnm, - adj->rewrite_header.sw_if_index)); + format_vnet_sw_if_index_name, + vnm, adj->rewrite_header.sw_if_index); return (s); } @@ -971,7 +982,6 @@ format_adj_nbr (u8* s, va_list *ap) { index_t index = va_arg(*ap, index_t); CLIB_UNUSED(u32 indent) = va_arg(*ap, u32); - vnet_main_t * vnm = vnet_get_main(); ip_adjacency_t * adj = adj_get(index); s = format (s, "%U", format_vnet_link, adj->ia_link); @@ -980,7 +990,7 @@ format_adj_nbr (u8* s, va_list *ap) adj_proto_to_46(adj->ia_nh_proto)); s = format (s, "%U", format_vnet_rewrite, - vnm->vlib_main, &adj->rewrite_header, sizeof (adj->rewrite_data), 0); + &adj->rewrite_header, sizeof (adj->rewrite_data), 0); return (s); } @@ -1010,11 +1020,13 @@ const static dpo_vft_t adj_nbr_dpo_vft = { .dv_unlock = adj_dpo_unlock, .dv_format = format_adj_nbr, .dv_mem_show = adj_mem_show, + .dv_get_urpf = adj_dpo_get_urpf, }; 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, }; /**