summaryrefslogtreecommitdiffstats
path: root/src/vnet/adj/adj_midchain.c
diff options
context:
space:
mode:
authorNeale Ranns <neale.ranns@cisco.com>2020-11-17 09:47:07 +0000
committerNeale Ranns <nranns@cisco.com>2020-12-08 16:38:19 +0000
commit5c544c8c3e084f7ccad041d168b6fff736b46cba (patch)
tree051585e200f2a2669535665aae8e53a2f37ad10e /src/vnet/adj/adj_midchain.c
parent59b792ffb1d77309b0ab17e441fd14237adb74db (diff)
fib: Adjacency flag for midchain to perfom flow hash (on inner packet)
Type: feature Signed-off-by: Neale Ranns <neale.ranns@cisco.com> Change-Id: I964afd9266645de5c87d49c58ce6b48c2c18f97f
Diffstat (limited to 'src/vnet/adj/adj_midchain.c')
-rw-r--r--src/vnet/adj/adj_midchain.c60
1 files changed, 36 insertions, 24 deletions
diff --git a/src/vnet/adj/adj_midchain.c b/src/vnet/adj/adj_midchain.c
index 15fef866c1b..93cfb550e3e 100644
--- a/src/vnet/adj/adj_midchain.c
+++ b/src/vnet/adj/adj_midchain.c
@@ -403,6 +403,10 @@ adj_midchain_setup (adj_index_t adj_index,
{
adj->rewrite_header.flags &= ~VNET_REWRITE_FIXUP_IP4_O_4;
}
+ if (!(flags & ADJ_FLAG_MIDCHAIN_FIXUP_FLOW_HASH))
+ {
+ adj->rewrite_header.flags &= ~VNET_REWRITE_FIXUP_FLOW_HASH;
+ }
tx_node = adj_nbr_midchain_get_tx_node(adj);
@@ -582,39 +586,47 @@ adj_nbr_midchain_stack_on_fib_entry (adj_index_t ai,
{
fib_entry_contribute_forwarding (fei, fct, &tmp);
- if ((adj->ia_flags & ADJ_FLAG_MIDCHAIN_IP_STACK) &&
- (DPO_LOAD_BALANCE == tmp.dpoi_type))
+ if (DPO_LOAD_BALANCE == tmp.dpoi_type)
{
- /*
- * do that hash now and stack on the choice.
- * If the choice is an incomplete adj then we will need a poke when
- * it becomes complete. This happens since the adj update walk propagates
- * as far a recursive paths.
- */
- const dpo_id_t *choice;
load_balance_t *lb;
- int hash;
lb = load_balance_get (tmp.dpoi_index);
- if (FIB_FORW_CHAIN_TYPE_UNICAST_IP4 == fct)
+ if ((adj->ia_flags & ADJ_FLAG_MIDCHAIN_IP_STACK) ||
+ lb->lb_n_buckets == 1)
{
- hash = ip4_compute_flow_hash ((ip4_header_t *) adj_get_rewrite (ai),
- lb->lb_hash_config);
+ /*
+ * do that hash now and stack on the choice.
+ * If the choice is an incomplete adj then we will need a poke when
+ * it becomes complete. This happens since the adj update walk propagates
+ * as far a recursive paths.
+ */
+ const dpo_id_t *choice;
+ int hash;
+
+ if (FIB_FORW_CHAIN_TYPE_UNICAST_IP4 == fct)
+ {
+ hash = ip4_compute_flow_hash ((ip4_header_t *) adj_get_rewrite (ai),
+ lb->lb_hash_config);
+ }
+ else if (FIB_FORW_CHAIN_TYPE_UNICAST_IP6 == fct)
+ {
+ hash = ip6_compute_flow_hash ((ip6_header_t *) adj_get_rewrite (ai),
+ lb->lb_hash_config);
+ }
+ else
+ {
+ hash = 0;
+ ASSERT(0);
+ }
+
+ choice = load_balance_get_bucket_i (lb, hash & lb->lb_n_buckets_minus_1);
+ dpo_copy (&tmp, choice);
}
- else if (FIB_FORW_CHAIN_TYPE_UNICAST_IP6 == fct)
+ else if (adj->ia_flags & ADJ_FLAG_MIDCHAIN_FIXUP_FLOW_HASH)
{
- hash = ip6_compute_flow_hash ((ip6_header_t *) adj_get_rewrite (ai),
- lb->lb_hash_config);
+ adj->rewrite_header.flags |= VNET_REWRITE_FIXUP_FLOW_HASH;
}
- else
- {
- hash = 0;
- ASSERT(0);
- }
-
- choice = load_balance_get_bucket_i (lb, hash & lb->lb_n_buckets_minus_1);
- dpo_copy (&tmp, choice);
}
}
adj_nbr_midchain_stack (ai, &tmp);