summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEyal Bari <ebari@cisco.com>2018-04-25 13:50:57 +0300
committerNeale Ranns <nranns@cisco.com>2018-04-25 13:47:45 +0000
commit99ed486d1edf5d3eb6550179f3c379b1e9d4cafe (patch)
treed051360159a561c8e80080dfcba59a0a2c8f922d
parent720d86f82b06cec71d57e997ab0a2a55fe7f280b (diff)
vxlan:remove single bucket load-balance dpo's
from encap path Change-Id: I62a8d13495355ad5e687f13b86c2a5d360bb2b7f Signed-off-by: Eyal Bari <ebari@cisco.com>
-rw-r--r--src/vnet/vxlan/vxlan.c32
1 files changed, 23 insertions, 9 deletions
diff --git a/src/vnet/vxlan/vxlan.c b/src/vnet/vxlan/vxlan.c
index 9a68ae80154..3d9a3edd7dc 100644
--- a/src/vnet/vxlan/vxlan.c
+++ b/src/vnet/vxlan/vxlan.c
@@ -123,15 +123,29 @@ VNET_HW_INTERFACE_CLASS (vxlan_hw_class) = {
static void
vxlan_tunnel_restack_dpo(vxlan_tunnel_t * t)
{
- dpo_id_t dpo = DPO_INVALID;
- u32 encap_index = ip46_address_is_ip4(&t->dst) ?
- vxlan4_encap_node.index : vxlan6_encap_node.index;
- fib_forward_chain_type_t forw_type = ip46_address_is_ip4(&t->dst) ?
- FIB_FORW_CHAIN_TYPE_UNICAST_IP4 : FIB_FORW_CHAIN_TYPE_UNICAST_IP6;
-
- fib_entry_contribute_forwarding (t->fib_entry_index, forw_type, &dpo);
- dpo_stack_from_node (encap_index, &t->next_dpo, &dpo);
- dpo_reset(&dpo);
+ u8 is_ip4 = ip46_address_is_ip4(&t->dst);
+ dpo_id_t dpo = DPO_INVALID;
+ fib_forward_chain_type_t forw_type = is_ip4 ?
+ FIB_FORW_CHAIN_TYPE_UNICAST_IP4 : FIB_FORW_CHAIN_TYPE_UNICAST_IP6;
+
+ fib_entry_contribute_forwarding (t->fib_entry_index, forw_type, &dpo);
+
+ /* vxlan uses the payload hash as the udp source port
+ * hence the packet's hash is unknown
+ * skip single bucket load balance dpo's */
+ while (DPO_LOAD_BALANCE == dpo.dpoi_type)
+ {
+ load_balance_t *lb = load_balance_get (dpo.dpoi_index);
+ if (lb->lb_n_buckets > 1)
+ break;
+
+ dpo_copy (&dpo, load_balance_get_bucket_i (lb, 0));
+ }
+
+ u32 encap_index = is_ip4 ?
+ vxlan4_encap_node.index : vxlan6_encap_node.index;
+ dpo_stack_from_node (encap_index, &t->next_dpo, &dpo);
+ dpo_reset(&dpo);
}
static vxlan_tunnel_t *