X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ffib%2Ffib_table.c;h=69746d969120e062ddf4834be5ea436c2b6b9919;hb=28c142e3;hp=75d15628c26827e7d1964beec85d93d0a9764cac;hpb=1500254bee11355bbd69cc1dd9705be4f002f2bd;p=vpp.git diff --git a/src/vnet/fib/fib_table.c b/src/vnet/fib/fib_table.c index 75d15628c26..69746d96912 100644 --- a/src/vnet/fib/fib_table.c +++ b/src/vnet/fib/fib_table.c @@ -181,8 +181,7 @@ fib_table_post_insert_actions (fib_table_t *fib_table, return; /* - * find and inform the covering entry that a new more specific - * has been inserted beneath it + * find the covering entry */ fib_entry_cover_index = fib_table_get_less_specific_i(fib_table, prefix); /* @@ -190,8 +189,26 @@ fib_table_post_insert_actions (fib_table_t *fib_table, */ if (fib_entry_cover_index != fib_entry_index) { - fib_entry_cover_change_notify(fib_entry_cover_index, - fib_entry_index); + /* + * push any inherting sources from the cover onto the covered + */ + fib_entry_inherit(fib_entry_cover_index, + fib_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. This is particularly + * beneficial since there are often many host entries sharing the + * same cover (i.e. ADJ or RR sourced entries). + */ + if (!fib_entry_is_host(fib_entry_index)) + { + fib_entry_cover_change_notify(fib_entry_cover_index, + fib_entry_index); + } } } @@ -481,7 +498,8 @@ fib_table_route_path_fixup (const fib_prefix_t *prefix, } if (fib_prefix_is_host(prefix) && ip46_address_is_zero(&path->frp_addr) && - path->frp_sw_if_index != ~0) + path->frp_sw_if_index != ~0 && + path->frp_proto != DPO_PROTO_ETHERNET) { path->frp_addr = prefix->fp_addr; path->frp_flags |= FIB_ROUTE_PATH_ATTACHED; @@ -510,7 +528,7 @@ fib_table_entry_path_add (u32 fib_index, u32 next_hop_sw_if_index, u32 next_hop_fib_index, u32 next_hop_weight, - mpls_label_t *next_hop_labels, + fib_mpls_label_t *next_hop_labels, fib_route_path_flags_t path_flags) { fib_route_path_t path = { @@ -760,7 +778,7 @@ fib_table_entry_update_one_path (u32 fib_index, u32 next_hop_sw_if_index, u32 next_hop_fib_index, u32 next_hop_weight, - mpls_label_t *next_hop_labels, + fib_mpls_label_t *next_hop_labels, fib_route_path_flags_t path_flags) { fib_node_index_t fib_entry_index; @@ -846,7 +864,8 @@ fib_table_entry_delete (u32 fib_index, * removing an etry that does not exist. * i'll allow it, but i won't like it. */ - clib_warning("%U not in FIB", format_fib_prefix, prefix); + if (0) + clib_warning("%U not in FIB", format_fib_prefix, prefix); } else { @@ -858,12 +877,20 @@ void fib_table_entry_delete_index (fib_node_index_t fib_entry_index, fib_source_t source) { - fib_prefix_t prefix; + const fib_prefix_t *prefix; - fib_entry_get_prefix(fib_entry_index, &prefix); + prefix = fib_entry_get_prefix(fib_entry_index); fib_table_entry_delete_i(fib_entry_get_fib_index(fib_entry_index), - fib_entry_index, &prefix, source); + fib_entry_index, prefix, source); +} + +u32 +fib_table_entry_get_stats_index (u32 fib_index, + const fib_prefix_t *prefix) +{ + return (fib_entry_get_stats_index( + fib_table_lookup_exact_match(fib_index, prefix))); } fib_node_index_t @@ -951,6 +978,7 @@ fib_table_get_flow_hash_config (u32 fib_index, return (fib->ft_flow_hash_config); } + flow_hash_config_t fib_table_get_default_flow_hash_config (fib_protocol_t proto) { @@ -979,7 +1007,7 @@ typedef struct fib_table_set_flow_hash_config_ctx_t_ flow_hash_config_t hash_config; } fib_table_set_flow_hash_config_ctx_t; -static int +static fib_table_walk_rc_t fib_table_set_flow_hash_config_cb (fib_node_index_t fib_entry_index, void *arg) { @@ -987,7 +1015,7 @@ fib_table_set_flow_hash_config_cb (fib_node_index_t fib_entry_index, fib_entry_set_flow_hash_config(fib_entry_index, ctx->hash_config); - return (1); + return (FIB_TABLE_WALK_CONTINUE); } void @@ -1021,6 +1049,17 @@ fib_table_get_table_id_for_sw_if_index (fib_protocol_t proto, return ((NULL != fib_table ? fib_table->ft_table_id : ~0)); } +u32 +fib_table_get_table_id (u32 fib_index, + fib_protocol_t proto) +{ + fib_table_t *fib_table; + + fib_table = fib_table_get(fib_index, proto); + + return ((NULL != fib_table ? fib_table->ft_table_id : ~0)); +} + u32 fib_table_find (fib_protocol_t proto, u32 table_id) @@ -1037,10 +1076,11 @@ fib_table_find (fib_protocol_t proto, return (~0); } -u32 -fib_table_find_or_create_and_lock (fib_protocol_t proto, - u32 table_id, - fib_source_t src) +static u32 +fib_table_find_or_create_and_lock_i (fib_protocol_t proto, + u32 table_id, + fib_source_t src, + const u8 *name) { fib_table_t *fib_table; fib_node_index_t fi; @@ -1062,13 +1102,42 @@ fib_table_find_or_create_and_lock (fib_protocol_t proto, fib_table = fib_table_get(fi, proto); - fib_table->ft_desc = format(NULL, "%U-VRF:%d", - format_fib_protocol, proto, - table_id); + if (NULL == fib_table->ft_desc) + { + if (name && name[0]) + { + fib_table->ft_desc = format(NULL, "%s", name); + } + else + { + fib_table->ft_desc = format(NULL, "%U-VRF:%d", + format_fib_protocol, proto, + table_id); + } + } return (fi); } +u32 +fib_table_find_or_create_and_lock (fib_protocol_t proto, + u32 table_id, + fib_source_t src) +{ + return (fib_table_find_or_create_and_lock_i(proto, table_id, + src, NULL)); +} + +u32 +fib_table_find_or_create_and_lock_w_name (fib_protocol_t proto, + u32 table_id, + fib_source_t src, + const u8 *name) +{ + return (fib_table_find_or_create_and_lock_i(proto, table_id, + src, name)); +} + u32 fib_table_create_and_lock (fib_protocol_t proto, fib_source_t src, @@ -1087,7 +1156,7 @@ fib_table_create_and_lock (fib_protocol_t proto, fi = ip4_fib_table_create_and_lock(src); break; case FIB_PROTOCOL_IP6: - fi = ip6_fib_table_create_and_lock(src); + fi = ip6_fib_table_create_and_lock(src, FIB_TABLE_FLAG_NONE, NULL); break; case FIB_PROTOCOL_MPLS: fi = mpls_fib_table_create_and_lock(src); @@ -1143,6 +1212,26 @@ fib_table_walk (u32 fib_index, } } +void +fib_table_sub_tree_walk (u32 fib_index, + fib_protocol_t proto, + const fib_prefix_t *root, + fib_table_walk_fn_t fn, + void *ctx) +{ + switch (proto) + { + case FIB_PROTOCOL_IP4: + ip4_fib_table_sub_tree_walk(ip4_fib_get(fib_index), root, fn, ctx); + break; + case FIB_PROTOCOL_IP6: + ip6_fib_table_sub_tree_walk(fib_index, root, fn, ctx); + break; + case FIB_PROTOCOL_MPLS: + break; + } +} + void fib_table_unlock (u32 fib_index, fib_protocol_t proto, @@ -1180,6 +1269,9 @@ fib_table_lock (u32 fib_index, fib_table_t *fib_table; fib_table = fib_table_get(fib_index, proto); + + ASSERT(fib_table->ft_locks[source] < (0xffff - 1)); + fib_table->ft_locks[source]++; fib_table->ft_locks[FIB_TABLE_TOTAL_LOCKS]++; } @@ -1197,10 +1289,10 @@ fib_table_get_num_entries (u32 fib_index, } u8* -format_fib_table_name (u8* s, va_list ap) +format_fib_table_name (u8* s, va_list* ap) { - fib_node_index_t fib_index = va_arg(ap, fib_node_index_t); - fib_protocol_t proto = va_arg(ap, int); // int promotion + fib_node_index_t fib_index = va_arg(*ap, fib_node_index_t); + fib_protocol_t proto = va_arg(*ap, int); // int promotion fib_table_t *fib_table; fib_table = fib_table_get(fib_index, proto); @@ -1227,7 +1319,7 @@ typedef struct fib_table_flush_ctx_t_ fib_source_t ftf_source; } fib_table_flush_ctx_t; -static int +static fib_table_walk_rc_t fib_table_flush_cb (fib_node_index_t fib_entry_index, void *arg) { @@ -1237,7 +1329,7 @@ fib_table_flush_cb (fib_node_index_t fib_entry_index, { vec_add1(ctx->ftf_entries, fib_entry_index); } - return (1); + return (FIB_TABLE_WALK_CONTINUE); } @@ -1263,3 +1355,13 @@ fib_table_flush (u32 fib_index, vec_free(ctx.ftf_entries); } + +u8 * +format_fib_table_memory (u8 *s, va_list *args) +{ + s = format(s, "%U", format_ip4_fib_table_memory); + s = format(s, "%U", format_ip6_fib_table_memory); + s = format(s, "%U", format_mpls_fib_table_memory); + + return (s); +}