diff options
Diffstat (limited to 'vnet/vnet/fib/fib_entry_src_rr.c')
| -rw-r--r-- | vnet/vnet/fib/fib_entry_src_rr.c | 36 |
1 files changed, 35 insertions, 1 deletions
diff --git a/vnet/vnet/fib/fib_entry_src_rr.c b/vnet/vnet/fib/fib_entry_src_rr.c index 9219d58e46e..6d56541dec2 100644 --- a/vnet/vnet/fib/fib_entry_src_rr.c +++ b/vnet/vnet/fib/fib_entry_src_rr.c @@ -17,6 +17,7 @@ #include <vnet/ip/format.h> #include <vnet/ip/lookup.h> #include <vnet/adj/adj.h> +#include <vnet/dpo/drop_dpo.h> #include "fib_entry_src.h" #include "fib_entry_cover.h" @@ -100,7 +101,40 @@ fib_entry_src_rr_activate (fib_entry_src_t *src, } else { - src->fes_pl = cover->fe_parent; + /* + * use the path-list of the cover, unless it would form a loop. + * that is unless the cover is via this entry. + * If a loop were to form it would be a 1 level loop (i.e. X via X), + * and there would be 2 locks on the path-list; one since its used + * by the cover, and 1 from here. The first lock will go when the + * cover is removed, the second, and last, when the covered walk + * occurs during the cover's removel - this is not a place where + * we can handle last lock gone. + * In short, don't let the loop form. The usual rules of 'we must + * let it form so we know when it breaks' don't apply here, since + * the loop will break when the cover changes, and this function + * will be called again when that happens. + */ + fib_node_index_t *entries = NULL; + fib_protocol_t proto; + + proto = fib_entry->fe_prefix.fp_proto; + vec_add1(entries, fib_entry_get_index(fib_entry)); + + if (fib_path_list_recursive_loop_detect(cover->fe_parent, + &entries)) + { + src->fes_pl = fib_path_list_create_special( + proto, + FIB_PATH_LIST_FLAG_DROP, + drop_dpo_get(fib_proto_to_dpo(proto))); + } + else + { + src->fes_pl = cover->fe_parent; + } + vec_free(entries); + } fib_path_list_lock(src->fes_pl); |