diff options
Diffstat (limited to 'src/vnet/fib')
| -rw-r--r-- | src/vnet/fib/fib_entry.c | 29 | ||||
| -rw-r--r-- | src/vnet/fib/fib_entry.h | 2 | ||||
| -rw-r--r-- | src/vnet/fib/fib_table.c | 54 | ||||
| -rw-r--r-- | src/vnet/fib/fib_table.h | 19 | ||||
| -rw-r--r-- | src/vnet/fib/fib_test.c | 23 | ||||
| -rw-r--r-- | src/vnet/fib/ip4_fib.c | 12 | ||||
| -rw-r--r-- | src/vnet/fib/ip4_fib.h | 6 | ||||
| -rw-r--r-- | src/vnet/fib/ip6_fib.c | 12 | ||||
| -rw-r--r-- | src/vnet/fib/ip6_fib.h | 2 | ||||
| -rw-r--r-- | src/vnet/fib/mpls_fib.c | 18 | ||||
| -rw-r--r-- | src/vnet/fib/mpls_fib.h | 7 |
11 files changed, 128 insertions, 56 deletions
diff --git a/src/vnet/fib/fib_entry.c b/src/vnet/fib/fib_entry.c index 6f811aa1..29f5b359 100644 --- a/src/vnet/fib/fib_entry.c +++ b/src/vnet/fib/fib_entry.c @@ -1390,6 +1390,35 @@ fib_entry_is_resolved (fib_node_index_t fib_entry_index) } } +void +fib_entry_set_flow_hash_config (fib_node_index_t fib_entry_index, + flow_hash_config_t hash_config) +{ + fib_entry_t *fib_entry; + + fib_entry = fib_entry_get(fib_entry_index); + + /* + * pass the hash-config on to the load-balance object where it is cached. + * we can ignore LBs in the delegate chains, since they will not be of the + * correct protocol type (i.e. they are not IP) + * There's no way, nor need, to change the hash config for MPLS. + */ + if (dpo_id_is_valid(&fib_entry->fe_lb)) + { + load_balance_t *lb; + + ASSERT(DPO_LOAD_BALANCE == fib_entry->fe_lb.dpoi_type); + + lb = load_balance_get(fib_entry->fe_lb.dpoi_index); + + /* + * atomic update for packets in flight + */ + lb->lb_hash_config = hash_config; + } +} + static int fib_ip4_address_compare (const ip4_address_t * a1, const ip4_address_t * a2) diff --git a/src/vnet/fib/fib_entry.h b/src/vnet/fib/fib_entry.h index b17a0b64..2196079b 100644 --- a/src/vnet/fib/fib_entry.h +++ b/src/vnet/fib/fib_entry.h @@ -533,6 +533,8 @@ extern int fib_entry_is_sourced(fib_node_index_t fib_entry_index, extern fib_node_index_t fib_entry_get_path_list(fib_node_index_t fib_entry_index); extern int fib_entry_is_resolved(fib_node_index_t fib_entry_index); +extern void fib_entry_set_flow_hash_config(fib_node_index_t fib_entry_index, + flow_hash_config_t hash_config); extern void fib_entry_module_init(void); diff --git a/src/vnet/fib/fib_table.c b/src/vnet/fib/fib_table.c index ff428049..d50f17f1 100644 --- a/src/vnet/fib/fib_table.c +++ b/src/vnet/fib/fib_table.c @@ -945,18 +945,52 @@ flow_hash_config_t fib_table_get_flow_hash_config (u32 fib_index, fib_protocol_t proto) { - switch (proto) - { - case FIB_PROTOCOL_IP4: - return (ip4_fib_table_get_flow_hash_config(fib_index)); - case FIB_PROTOCOL_IP6: - return (ip6_fib_table_get_flow_hash_config(fib_index)); - case FIB_PROTOCOL_MPLS: - return (mpls_fib_table_get_flow_hash_config(fib_index)); - } - return (0); + fib_table_t *fib; + + fib = fib_table_get(fib_index, proto); + + return (fib->ft_flow_hash_config); } +/** + * @brief Table set flow hash config context. + */ +typedef struct fib_table_set_flow_hash_config_ctx_t_ +{ + /** + * the flow hash config to set + */ + flow_hash_config_t hash_config; +} fib_table_set_flow_hash_config_ctx_t; + +static int +fib_table_set_flow_hash_config_cb (fib_node_index_t fib_entry_index, + void *arg) +{ + fib_table_set_flow_hash_config_ctx_t *ctx = arg; + + fib_entry_set_flow_hash_config(fib_entry_index, ctx->hash_config); + + return (1); +} + +void +fib_table_set_flow_hash_config (u32 fib_index, + fib_protocol_t proto, + flow_hash_config_t hash_config) +{ + fib_table_set_flow_hash_config_ctx_t ctx = { + .hash_config = hash_config, + }; + fib_table_t *fib; + + fib = fib_table_get(fib_index, proto); + fib->ft_flow_hash_config = hash_config; + + fib_table_walk(fib_index, proto, + fib_table_set_flow_hash_config_cb, + &ctx); +} u32 fib_table_get_table_id_for_sw_if_index (fib_protocol_t proto, diff --git a/src/vnet/fib/fib_table.h b/src/vnet/fib/fib_table.h index f24d28b7..21773342 100644 --- a/src/vnet/fib/fib_table.h +++ b/src/vnet/fib/fib_table.h @@ -667,6 +667,25 @@ extern flow_hash_config_t fib_table_get_flow_hash_config(u32 fib_index, /** * @brief + * Set the flow hash configured used by the table + * + * @param fib_index + * The index of the FIB + * + * @paran proto + * The protocol of the FIB (and thus the entries therein) + * + * @param hash_config + * The flow-hash config to set + * + * @return none + */ +extern void fib_table_set_flow_hash_config(u32 fib_index, + fib_protocol_t proto, + flow_hash_config_t hash_config); + +/** + * @brief * Take a reference counting lock on the table * * @param fib_index diff --git a/src/vnet/fib/fib_test.c b/src/vnet/fib/fib_test.c index d3bdfa35..ddea6b86 100644 --- a/src/vnet/fib/fib_test.c +++ b/src/vnet/fib/fib_test.c @@ -3832,6 +3832,29 @@ fib_test_v4 (void) fib_table_entry_delete(fib_index, &pfx_10_10_10_127_s_32, FIB_SOURCE_ADJ); + /* + * change the table's flow-hash config - expect the update to propagete to + * the entries' load-balance objects + */ + flow_hash_config_t old_hash_config, new_hash_config; + + old_hash_config = fib_table_get_flow_hash_config(fib_index, + FIB_PROTOCOL_IP4); + new_hash_config = (IP_FLOW_HASH_SRC_ADDR | + IP_FLOW_HASH_DST_ADDR); + + fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_1_s_32); + dpo = fib_entry_contribute_ip_forwarding(fei); + lb = load_balance_get(dpo->dpoi_index); + FIB_TEST((lb->lb_hash_config == old_hash_config), + "Table and LB hash config match: %U", + format_ip_flow_hash_config, lb->lb_hash_config); + + fib_table_set_flow_hash_config(fib_index, FIB_PROTOCOL_IP4, new_hash_config); + + FIB_TEST((lb->lb_hash_config == new_hash_config), + "Table and LB newhash config match: %U", + format_ip_flow_hash_config, lb->lb_hash_config); /* * CLEANUP diff --git a/src/vnet/fib/ip4_fib.c b/src/vnet/fib/ip4_fib.c index 8e92d851..878b4dbf 100644 --- a/src/vnet/fib/ip4_fib.c +++ b/src/vnet/fib/ip4_fib.c @@ -124,9 +124,7 @@ ip4_create_fib_with_table_id (u32 table_id) fib_table->ft_table_id = v4_fib->table_id = table_id; - fib_table->ft_flow_hash_config = - v4_fib->flow_hash_config = - IP_FLOW_HASH_DEFAULT; + fib_table->ft_flow_hash_config = IP_FLOW_HASH_DEFAULT; v4_fib->fwd_classify_table_index = ~0; v4_fib->rev_classify_table_index = ~0; @@ -233,12 +231,6 @@ ip4_fib_table_get_index_for_sw_if_index (u32 sw_if_index) return (ip4_main.fib_index_by_sw_if_index[sw_if_index]); } -flow_hash_config_t -ip4_fib_table_get_flow_hash_config (u32 fib_index) -{ - return (ip4_fib_get(fib_index)->flow_hash_config); -} - /* * ip4_fib_table_lookup_exact_match * @@ -542,7 +534,7 @@ ip4_show_fib (vlib_main_t * vm, vlib_cli_output (vm, "%U, fib_index %d, flow hash: %U", format_fib_table_name, fib->index, FIB_PROTOCOL_IP4, fib->index, - format_ip_flow_hash_config, fib->flow_hash_config); + format_ip_flow_hash_config, fib_table->ft_flow_hash_config); /* Show summary? */ if (! verbose) diff --git a/src/vnet/fib/ip4_fib.h b/src/vnet/fib/ip4_fib.h index 4cf9e58a..006163b4 100644 --- a/src/vnet/fib/ip4_fib.h +++ b/src/vnet/fib/ip4_fib.h @@ -53,9 +53,6 @@ typedef struct ip4_fib_t_ /* Index into FIB vector. */ u32 index; - /* flow hash configuration */ - flow_hash_config_t flow_hash_config; - /* N-tuple classifier indices */ u32 fwd_classify_table_index; u32 rev_classify_table_index; @@ -149,9 +146,6 @@ u32 ip4_fib_index_from_table_id (u32 table_id) extern u32 ip4_fib_table_get_index_for_sw_if_index(u32 sw_if_index); -extern flow_hash_config_t ip4_fib_table_get_flow_hash_config(u32 fib_index); - - always_inline index_t ip4_fib_forwarding_lookup (u32 fib_index, const ip4_address_t * addr) diff --git a/src/vnet/fib/ip6_fib.c b/src/vnet/fib/ip6_fib.c index d00f4c55..e046b349 100644 --- a/src/vnet/fib/ip6_fib.c +++ b/src/vnet/fib/ip6_fib.c @@ -74,9 +74,7 @@ create_fib_with_table_id (u32 table_id) fib_table->ft_table_id = v6_fib->table_id = table_id; - fib_table->ft_flow_hash_config = - v6_fib->flow_hash_config = - IP_FLOW_HASH_DEFAULT; + fib_table->ft_flow_hash_config = IP_FLOW_HASH_DEFAULT; vnet_ip6_fib_init(fib_table->ft_index); fib_table_lock(fib_table->ft_index, FIB_PROTOCOL_IP6); @@ -390,12 +388,6 @@ u32 ip6_fib_table_fwding_lookup_with_if_index (ip6_main_t * im, return ip6_fib_table_fwding_lookup(im, fib_index, dst); } -flow_hash_config_t -ip6_fib_table_get_flow_hash_config (u32 fib_index) -{ - return (ip6_fib_get(fib_index)->flow_hash_config); -} - u32 ip6_fib_table_get_index_for_sw_if_index (u32 sw_if_index) { @@ -643,7 +635,7 @@ ip6_show_fib (vlib_main_t * vm, vlib_cli_output (vm, "%s, fib_index %d, flow hash: %U", fib_table->ft_desc, fib->index, - format_ip_flow_hash_config, fib->flow_hash_config); + format_ip_flow_hash_config, fib_table->ft_flow_hash_config); /* Show summary? */ if (! verbose) diff --git a/src/vnet/fib/ip6_fib.h b/src/vnet/fib/ip6_fib.h index e2f28452..2bf8ef78 100644 --- a/src/vnet/fib/ip6_fib.h +++ b/src/vnet/fib/ip6_fib.h @@ -133,7 +133,5 @@ u32 ip6_fib_index_from_table_id (u32 table_id) extern u32 ip6_fib_table_get_index_for_sw_if_index(u32 sw_if_index); -extern flow_hash_config_t ip6_fib_table_get_flow_hash_config(u32 fib_index); - #endif diff --git a/src/vnet/fib/mpls_fib.c b/src/vnet/fib/mpls_fib.c index 19f9f3c1..ca6271fe 100644 --- a/src/vnet/fib/mpls_fib.c +++ b/src/vnet/fib/mpls_fib.c @@ -61,11 +61,6 @@ */ static index_t mpls_fib_drop_dpo_index = INDEX_INVALID; -/** - * FIXME - */ -#define MPLS_FLOW_HASH_DEFAULT 0 - static inline u32 mpls_fib_entry_mk_key (mpls_label_t label, mpls_eos_bit_t eos) @@ -109,10 +104,8 @@ mpls_fib_create_with_table_id (u32 table_id) hash_set (mpls_main.fib_index_by_table_id, table_id, fib_table->ft_index); - fib_table->ft_table_id = - table_id; - fib_table->ft_flow_hash_config = - MPLS_FLOW_HASH_DEFAULT; + fib_table->ft_table_id = table_id; + fib_table->ft_flow_hash_config = MPLS_FLOW_HASH_DEFAULT; fib_table_lock(fib_table->ft_index, FIB_PROTOCOL_MPLS); @@ -350,13 +343,6 @@ mpls_fib_forwarding_table_reset (mpls_fib_t *mf, mf->mf_lbs[key] = mpls_fib_drop_dpo_index; } -flow_hash_config_t -mpls_fib_table_get_flow_hash_config (u32 fib_index) -{ - // FIXME. - return (0); -} - void mpls_fib_table_walk (mpls_fib_t *mpls_fib, fib_table_walk_fn_t fn, diff --git a/src/vnet/fib/mpls_fib.h b/src/vnet/fib/mpls_fib.h index 78a61a14..dfb8b7fc 100644 --- a/src/vnet/fib/mpls_fib.h +++ b/src/vnet/fib/mpls_fib.h @@ -33,6 +33,11 @@ #define MPLS_FIB_KEY_SIZE 21 #define MPLS_FIB_DB_SIZE (1 << (MPLS_FIB_KEY_SIZE-1)) +/** + * There are no options for controlling the MPLS flow hash + */ +#define MPLS_FLOW_HASH_DEFAULT 0 + typedef struct mpls_fib_t_ { /** @@ -130,6 +135,4 @@ mpls_fib_table_get_index_for_sw_if_index (u32 sw_if_index) return (mm->fib_index_by_sw_if_index[sw_if_index]); } -extern flow_hash_config_t mpls_fib_table_get_flow_hash_config(u32 fib_index); - #endif |