X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fmfib%2Fmfib_table.c;h=a6a8277479461636c692f57a8cc21ce5463f5346;hb=9db6ada77;hp=82431e370eefedfa487a83c98cfd61b211244b9c;hpb=1ec3652c25c593a7dcaae293b2f7dbed6eb15963;p=vpp.git diff --git a/src/vnet/mfib/mfib_table.c b/src/vnet/mfib/mfib_table.c index 82431e370ee..a6a82774794 100644 --- a/src/vnet/mfib/mfib_table.c +++ b/src/vnet/mfib/mfib_table.c @@ -20,8 +20,12 @@ #include #include #include +#include +#include #include +const static char * mfib_table_flags_strings[] = MFIB_TABLE_ATTRIBUTES; + mfib_table_t * mfib_table_get (fib_node_index_t index, fib_protocol_t proto) @@ -99,10 +103,41 @@ mfib_table_lookup_exact_match (u32 fib_index, prefix)); } +static fib_node_index_t +mfib_table_get_less_specific_i (const mfib_table_t *mfib_table, + const mfib_prefix_t *prefix) +{ + switch (prefix->fp_proto) + { + case FIB_PROTOCOL_IP4: + return (ip4_mfib_table_get_less_specific(&mfib_table->v4, + &prefix->fp_src_addr.ip4, + &prefix->fp_grp_addr.ip4, + prefix->fp_len)); + case FIB_PROTOCOL_IP6: + return (ip6_mfib_table_get_less_specific(&mfib_table->v6, + &prefix->fp_src_addr.ip6, + &prefix->fp_grp_addr.ip6, + prefix->fp_len)); + case FIB_PROTOCOL_MPLS: + break; + } + return (FIB_NODE_INDEX_INVALID); +} + +fib_node_index_t +mfib_table_get_less_specific (u32 fib_index, + const mfib_prefix_t *prefix) +{ + return (mfib_table_get_less_specific_i(mfib_table_get(fib_index, + prefix->fp_proto), + prefix)); +} + static void mfib_table_entry_remove (mfib_table_t *mfib_table, const mfib_prefix_t *prefix, - fib_node_index_t fib_entry_index) + fib_node_index_t mfib_entry_index) { vlib_smp_unsafe_warning(); @@ -127,9 +162,44 @@ mfib_table_entry_remove (mfib_table_t *mfib_table, break; } - mfib_entry_unlock(fib_entry_index); + mfib_entry_cover_change_notify(mfib_entry_index, + FIB_NODE_INDEX_INVALID); + mfib_entry_unlock(mfib_entry_index); +} + +static void +mfib_table_post_insert_actions (mfib_table_t *mfib_table, + const mfib_prefix_t *prefix, + fib_node_index_t mfib_entry_index) +{ + fib_node_index_t mfib_entry_cover_index; + + /* + * find the covering entry + */ + mfib_entry_cover_index = mfib_table_get_less_specific_i(mfib_table, + prefix); + /* + * the indicies are the same when the default route is first added + */ + if (mfib_entry_cover_index != mfib_entry_index) + { + /* + * inform the covering entry that a new more specific + * has been inserted beneath it. + * If the prefix that has been inserted is a host route + * then it is not possible that it will be the cover for any + * other entry, so we can elide the walk. + */ + if (!mfib_entry_is_host(mfib_entry_index)) + { + mfib_entry_cover_change_notify(mfib_entry_cover_index, + mfib_entry_index); + } + } } + static void mfib_table_entry_insert (mfib_table_t *mfib_table, const mfib_prefix_t *prefix, @@ -159,6 +229,8 @@ mfib_table_entry_insert (mfib_table_t *mfib_table, case FIB_PROTOCOL_MPLS: break; } + + mfib_table_post_insert_actions(mfib_table, prefix, mfib_entry_index); } fib_node_index_t @@ -183,7 +255,8 @@ mfib_table_entry_update (u32 fib_index, */ mfib_entry_index = mfib_entry_create(fib_index, source, prefix, rpf_id, - entry_flags); + entry_flags, + INDEX_INVALID); mfib_table_entry_insert(mfib_table, prefix, mfib_entry_index); } @@ -215,12 +288,11 @@ mfib_table_entry_update (u32 fib_index, return (mfib_entry_index); } -fib_node_index_t -mfib_table_entry_path_update (u32 fib_index, - const mfib_prefix_t *prefix, - mfib_source_t source, - const fib_route_path_t *rpath, - mfib_itf_flags_t itf_flags) +static fib_node_index_t +mfib_table_entry_paths_update_i (u32 fib_index, + const mfib_prefix_t *prefix, + mfib_source_t source, + const fib_route_path_t *rpaths) { fib_node_index_t mfib_entry_index; mfib_table_t *mfib_table; @@ -234,24 +306,54 @@ mfib_table_entry_path_update (u32 fib_index, source, prefix, MFIB_RPF_ID_NONE, - MFIB_ENTRY_FLAG_NONE); + MFIB_ENTRY_FLAG_NONE, + INDEX_INVALID); + + mfib_entry_path_update(mfib_entry_index, source, rpaths); mfib_table_entry_insert(mfib_table, prefix, mfib_entry_index); } + else + { + mfib_entry_path_update(mfib_entry_index, source, rpaths); + } + return (mfib_entry_index); +} - mfib_entry_path_update(mfib_entry_index, - source, - rpath, - itf_flags); +fib_node_index_t +mfib_table_entry_path_update (u32 fib_index, + const mfib_prefix_t *prefix, + mfib_source_t source, + const fib_route_path_t *rpath) +{ + fib_node_index_t mfib_entry_index; + fib_route_path_t *rpaths = NULL; + + vec_add1(rpaths, *rpath); + + mfib_entry_index = mfib_table_entry_paths_update_i(fib_index, prefix, + source, rpaths); + + vec_free(rpaths); return (mfib_entry_index); } -void -mfib_table_entry_path_remove (u32 fib_index, +fib_node_index_t +mfib_table_entry_paths_update (u32 fib_index, const mfib_prefix_t *prefix, mfib_source_t source, - const fib_route_path_t *rpath) + const fib_route_path_t *rpaths) +{ + return (mfib_table_entry_paths_update_i(fib_index, prefix, + source, rpaths)); +} + +static void +mfib_table_entry_paths_remove_i (u32 fib_index, + const mfib_prefix_t *prefix, + mfib_source_t source, + const fib_route_path_t *rpaths) { fib_node_index_t mfib_entry_index; mfib_table_t *mfib_table; @@ -262,7 +364,7 @@ mfib_table_entry_path_remove (u32 fib_index, if (FIB_NODE_INDEX_INVALID == mfib_entry_index) { /* - * removing an etry that does not exist. i'll allow it. + * removing an entry that does not exist. i'll allow it. */ } else @@ -276,7 +378,7 @@ mfib_table_entry_path_remove (u32 fib_index, no_more_sources = mfib_entry_path_remove(mfib_entry_index, source, - rpath); + rpaths); if (no_more_sources) { @@ -289,13 +391,42 @@ mfib_table_entry_path_remove (u32 fib_index, mfib_entry_unlock(mfib_entry_index); } } +void +mfib_table_entry_paths_remove (u32 fib_index, + const mfib_prefix_t *prefix, + mfib_source_t source, + const fib_route_path_t *rpaths) +{ + mfib_table_entry_paths_remove_i(fib_index, + prefix, + source, + rpaths); +} + +void +mfib_table_entry_path_remove (u32 fib_index, + const mfib_prefix_t *prefix, + mfib_source_t source, + const fib_route_path_t *rpath) +{ + fib_route_path_t *rpaths = NULL; + + vec_add1(rpaths, *rpath); + + mfib_table_entry_paths_remove_i(fib_index, + prefix, + source, + rpaths); + + vec_free(rpaths); +} fib_node_index_t mfib_table_entry_special_add (u32 fib_index, const mfib_prefix_t *prefix, mfib_source_t source, mfib_entry_flags_t entry_flags, - index_t rep_dpo) + index_t repi) { fib_node_index_t mfib_entry_index; mfib_table_t *mfib_table; @@ -303,21 +434,27 @@ mfib_table_entry_special_add (u32 fib_index, mfib_table = mfib_table_get(fib_index, prefix->fp_proto); mfib_entry_index = mfib_table_lookup_exact_match_i(mfib_table, prefix); + if (INDEX_INVALID != repi) + { + entry_flags |= MFIB_ENTRY_FLAG_EXCLUSIVE; + } + if (FIB_NODE_INDEX_INVALID == mfib_entry_index) { mfib_entry_index = mfib_entry_create(fib_index, source, prefix, MFIB_RPF_ID_NONE, - MFIB_ENTRY_FLAG_NONE); + entry_flags, + repi); mfib_table_entry_insert(mfib_table, prefix, mfib_entry_index); } - - mfib_entry_update(mfib_entry_index, source, - (MFIB_ENTRY_FLAG_EXCLUSIVE | entry_flags), - MFIB_RPF_ID_NONE, - rep_dpo); + else + { + mfib_entry_special_add(mfib_entry_index, source, entry_flags, + MFIB_RPF_ID_NONE, repi); + } return (mfib_entry_index); } @@ -380,12 +517,10 @@ void mfib_table_entry_delete_index (fib_node_index_t mfib_entry_index, mfib_source_t source) { - mfib_prefix_t prefix; - - mfib_entry_get_prefix(mfib_entry_index, &prefix); - mfib_table_entry_delete_i(mfib_entry_get_fib_index(mfib_entry_index), - mfib_entry_index, &prefix, source); + mfib_entry_index, + mfib_entry_get_prefix(mfib_entry_index), + source); } u32 @@ -405,6 +540,17 @@ mfib_table_get_index_for_sw_if_index (fib_protocol_t proto, return (~0); } +u32 +mfib_table_get_table_id (u32 fib_index, + fib_protocol_t proto) +{ + mfib_table_t *mfib_table; + + mfib_table = mfib_table_get(fib_index, proto); + + return ((NULL != mfib_table ? mfib_table->mft_table_id : ~0)); +} + u32 mfib_table_find (fib_protocol_t proto, u32 table_id) @@ -499,7 +645,7 @@ typedef struct mfib_table_flush_ctx_t_ mfib_source_t mftf_source; } mfib_table_flush_ctx_t; -static int +static walk_rc_t mfib_table_flush_cb (fib_node_index_t mfib_entry_index, void *arg) { @@ -509,7 +655,7 @@ mfib_table_flush_cb (fib_node_index_t mfib_entry_index, { vec_add1(ctx->mftf_entries, mfib_entry_index); } - return (1); + return (WALK_CONTINUE); } void @@ -535,6 +681,79 @@ mfib_table_flush (u32 mfib_index, vec_free(ctx.mftf_entries); } +static walk_rc_t +mfib_table_mark_cb (fib_node_index_t fib_entry_index, + void *arg) +{ + mfib_table_flush_ctx_t *ctx = arg; + + if (mfib_entry_is_sourced(fib_entry_index, ctx->mftf_source)) + { + mfib_entry_mark(fib_entry_index, ctx->mftf_source); + } + return (WALK_CONTINUE); +} + +void +mfib_table_mark (u32 fib_index, + fib_protocol_t proto, + mfib_source_t source) +{ + mfib_table_flush_ctx_t ctx = { + .mftf_source = source, + }; + mfib_table_t *mfib_table; + + mfib_table = mfib_table_get(fib_index, proto); + + mfib_table->mft_epoch++; + mfib_table->mft_flags |= MFIB_TABLE_FLAG_RESYNC; + + mfib_table_walk(fib_index, proto, + mfib_table_mark_cb, + &ctx); +} + +static walk_rc_t +mfib_table_sweep_cb (fib_node_index_t fib_entry_index, + void *arg) +{ + mfib_table_flush_ctx_t *ctx = arg; + + if (mfib_entry_is_marked(fib_entry_index, ctx->mftf_source)) + { + vec_add1(ctx->mftf_entries, fib_entry_index); + } + return (WALK_CONTINUE); +} + +void +mfib_table_sweep (u32 fib_index, + fib_protocol_t proto, + mfib_source_t source) +{ + mfib_table_flush_ctx_t ctx = { + .mftf_source = source, + }; + fib_node_index_t *fib_entry_index; + mfib_table_t *mfib_table; + + mfib_table = mfib_table_get(fib_index, proto); + + mfib_table->mft_flags &= ~MFIB_TABLE_FLAG_RESYNC; + + mfib_table_walk(fib_index, proto, + mfib_table_sweep_cb, + &ctx); + + vec_foreach(fib_entry_index, ctx.mftf_entries) + { + mfib_table_entry_delete_index(*fib_entry_index, source); + } + + vec_free(ctx.mftf_entries); +} + static void mfib_table_destroy (mfib_table_t *mfib_table) { @@ -595,6 +814,17 @@ mfib_table_lock (u32 fib_index, mfib_table->mft_locks[MFIB_TABLE_TOTAL_LOCKS]++; } +u32 +mfib_table_get_n_routes (fib_node_index_t fib_index, + fib_protocol_t proto) +{ + mfib_table_t *mfib_table; + + mfib_table = mfib_table_get(fib_index, proto); + + return (mfib_table->mft_total_route_counts); +} + void mfib_table_walk (u32 fib_index, fib_protocol_t proto, @@ -614,6 +844,26 @@ mfib_table_walk (u32 fib_index, } } +u8* +format_mfib_table_flags (u8 *s, va_list *args) +{ + mfib_table_flags_t flags = va_arg(*args, int); + mfib_table_attribute_t attr; + + if (!flags) + { + return format(s, "none"); + } + + FOR_EACH_MFIB_TABLE_ATTRIBUTE(attr) { + if (1 << attr & flags) { + s = format(s, "%s", mfib_table_flags_strings[attr]); + } + } + + return (s); +} + u8* format_mfib_table_name (u8* s, va_list *ap) { @@ -642,6 +892,7 @@ mfib_module_init (vlib_main_t * vm) { clib_error_t * error; + mfib_entry_src_module_init(); mfib_entry_module_init(); mfib_signal_module_init();