X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ffib%2Ffib_table.h;h=8b86f8d6dd965879d818d833677bfdc6984080b4;hb=25b0494;hp=579740e9c42cc7adbb192c277d5f61e854f5fc51;hpb=da78f957e46c686434149d332a477d7ea055d76a;p=vpp.git diff --git a/src/vnet/fib/fib_table.h b/src/vnet/fib/fib_table.h index 579740e9c42..8b86f8d6dd9 100644 --- a/src/vnet/fib/fib_table.h +++ b/src/vnet/fib/fib_table.h @@ -22,6 +22,46 @@ #include #include +/** + * Keep a lock per-source and a total + */ +#define FIB_TABLE_N_LOCKS (FIB_SOURCE_MAX+1) +#define FIB_TABLE_TOTAL_LOCKS FIB_SOURCE_MAX + +/** + * Flags for the source data + */ +typedef enum fib_table_attribute_t_ { + /** + * Marker. Add new values after this one. + */ + FIB_TABLE_ATTRIBUTE_FIRST, + /** + * the table is for IP6 link local addresses + */ + FIB_TABLE_ATTRIBUTE_IP6_LL = FIB_TABLE_ATTRIBUTE_FIRST, + /** + * Marker. add new entries before this one. + */ + FIB_TABLE_ATTRIBUTE_LAST = FIB_TABLE_ATTRIBUTE_IP6_LL, +} fib_table_attribute_t; + +#define FIB_TABLE_ATTRIBUTE_MAX (FIB_TABLE_ATTRIBUTE_LAST+1) + +#define FIB_TABLE_ATTRIBUTES { \ + [FIB_TABLE_ATTRIBUTE_IP6_LL] = "ip6-ll", \ +} + +#define FOR_EACH_FIB_TABLE_ATTRIBUTE(_item) \ + for (_item = FIB_TABLE_ATTRIBUTE_FIRST; \ + _item < FIB_TABLE_ATTRIBUTE_MAX; \ + _item++) + +typedef enum fib_table_flags_t_ { + FIB_TABLE_FLAG_NONE = 0, + FIB_TABLE_FLAG_IP6_LL = (1 << FIB_TABLE_ATTRIBUTE_IP6_LL), +} __attribute__ ((packed)) fib_table_flags_t; + /** * @brief * A protocol Independent FIB table @@ -34,9 +74,14 @@ typedef struct fib_table_t_ fib_protocol_t ft_proto; /** - * number of locks on the table + * Table flags + */ + fib_table_flags_t ft_flags; + + /** + * per-source number of locks on the table */ - u16 ft_locks; + u16 ft_locks[FIB_TABLE_N_LOCKS]; /** * Table ID (hash key) for this FIB. @@ -73,7 +118,7 @@ typedef struct fib_table_t_ * @brief * Format the description/name of the table */ -extern u8* format_fib_table_name(u8* s, va_list ap); +extern u8* format_fib_table_name(u8* s, va_list *ap); /** * @brief @@ -293,7 +338,7 @@ extern fib_node_index_t 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_label_stack, + fib_mpls_label_t *next_hop_label_stack, fib_route_path_flags_t pf); /** * @brief @@ -476,7 +521,7 @@ extern fib_node_index_t 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_label_stack, + fib_mpls_label_t *next_hop_label_stack, fib_route_path_flags_t pf); /** @@ -598,6 +643,21 @@ extern u32 fib_table_get_index_for_sw_if_index(fib_protocol_t proto, extern u32 fib_table_get_table_id_for_sw_if_index(fib_protocol_t proto, u32 sw_if_index); +/** + * @brief + * Get the Table-ID of the FIB from protocol and index + * + * @param fib_index + * The FIB index + * + * @paran proto + * The protocol of the FIB (and thus the entries therein) + * + * @return fib_index + * The tableID of the FIB + */ +extern u32 fib_table_get_table_id(u32 fib_index, fib_protocol_t proto); + /** * @brief * Get the index of the FIB for a Table-ID. This DOES NOT create the @@ -628,9 +688,38 @@ extern u32 fib_table_find(fib_protocol_t proto, u32 table_id); * * @return fib_index * The index of the FIB + * + * @param source + * The ID of the client/source. */ extern u32 fib_table_find_or_create_and_lock(fib_protocol_t proto, - u32 table_id); + u32 table_id, + fib_source_t source); + +/** + * @brief + * Get the index of the FIB for a Table-ID. This DOES create the + * FIB if it does not exist. + * + * @paran proto + * The protocol of the FIB (and thus the entries therein) + * + * @param table-id + * The Table-ID + * + * @return fib_index + * The index of the FIB + * + * @param source + * The ID of the client/source. + * + * @param name + * The client is choosing the name they want the table to have + */ +extern u32 fib_table_find_or_create_and_lock_w_name(fib_protocol_t proto, + u32 table_id, + fib_source_t source, + const u8 *name); /** * @brief @@ -643,10 +732,14 @@ extern u32 fib_table_find_or_create_and_lock(fib_protocol_t proto, * @param fmt * A string to describe the table * + * @param source + * The ID of the client/source. + * * @return fib_index * The index of the FIB */ extern u32 fib_table_create_and_lock(fib_protocol_t proto, + fib_source_t source, const char *const fmt, ...); @@ -658,7 +751,7 @@ extern u32 fib_table_create_and_lock(fib_protocol_t proto, * The index of the FIB * * @paran proto - * The protocol of the FIB (and thus the entries therein) + * The protocol the packets the flow hash will be calculated for. * * @return The flow hash config */ @@ -704,9 +797,13 @@ extern void fib_table_set_flow_hash_config(u32 fib_index, * * @paran proto * The protocol of the FIB (and thus the entries therein) + * + * @param source + * The ID of the client/source. */ extern void fib_table_unlock(u32 fib_index, - fib_protocol_t proto); + fib_protocol_t proto, + fib_source_t source); /** * @brief @@ -718,9 +815,13 @@ extern void fib_table_unlock(u32 fib_index, * * @paran proto * The protocol of the FIB (and thus the entries therein) + * + * @param source + * The ID of the client/source. */ extern void fib_table_lock(u32 fib_index, - fib_protocol_t proto); + fib_protocol_t proto, + fib_source_t source); /** * @brief @@ -745,11 +846,30 @@ extern u32 fib_table_get_num_entries(u32 fib_index, extern fib_table_t *fib_table_get(fib_node_index_t index, fib_protocol_t proto); +/** + * @brief return code controlling how a table walk proceeds + */ +typedef enum fib_table_walk_rc_t_ +{ + /** + * Continue on to the next entry + */ + FIB_TABLE_WALK_CONTINUE, + /** + * Do no traverse down this sub-tree + */ + FIB_TABLE_WALK_SUB_TREE_STOP, + /** + * Stop the walk completely + */ + FIB_TABLE_WALK_STOP, +} fib_table_walk_rc_t; + /** * @brief Call back function when walking entries in a FIB table */ -typedef int (*fib_table_walk_fn_t)(fib_node_index_t fei, - void *ctx); +typedef fib_table_walk_rc_t (*fib_table_walk_fn_t)(fib_node_index_t fei, + void *ctx); /** * @brief Walk all entries in a FIB table @@ -761,4 +881,21 @@ extern void fib_table_walk(u32 fib_index, fib_table_walk_fn_t fn, void *ctx); +/** + * @brief Walk all entries in a sub-tree FIB table. The 'root' paraneter + * is the prefix at the root of the sub-tree. + * N.B: This is NOT safe to deletes. If you need to delete walk the whole + * table and store elements in a vector, then delete the elements + */ +extern 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); + +/** + * @brief format (display) the memory used by the FIB tables + */ +extern u8 *format_fib_table_memory(u8 *s, va_list *args); + #endif