From 623b4f85e6ee4611ae15bb3103fe30725ca977ed Mon Sep 17 00:00:00 2001 From: Shawn Ji Date: Wed, 18 Dec 2019 10:10:54 +0800 Subject: vxlan: reuse inner packet flow hash for tunnel outer header load balance Type: fix Several tunnels encapsulation use udp as outer header and udp src port is set by inner header flow hash, such as gtpu, geneve, vxlan, vxlan-gbd Since flow hash of inner header is already been calculated, keeping it to vnet_buffere[b]->ip.flow_hash should save load-balance node work to select ECMP uplinks. Change-Id: I0e4e2b27178f4fcc5785e221d6d1f3e8747d0d59 Signed-off-by: Shawn Ji --- src/vnet/vxlan/encap.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/vnet/vxlan') diff --git a/src/vnet/vxlan/encap.c b/src/vnet/vxlan/encap.c index eec460d5bc5..da890b2d5fb 100644 --- a/src/vnet/vxlan/encap.c +++ b/src/vnet/vxlan/encap.c @@ -287,6 +287,10 @@ vxlan_encap_inline (vlib_main_t * vm, udp1->checksum = 0xffff; } + /* save inner packet flow_hash for load-balance node */ + vnet_buffer (b0)->ip.flow_hash = flow_hash0; + vnet_buffer (b1)->ip.flow_hash = flow_hash1; + if (sw_if_index0 == sw_if_index1) { vlib_increment_combined_counter (tx_counter, thread_index, @@ -424,6 +428,9 @@ vxlan_encap_inline (vlib_main_t * vm, udp0->checksum = 0xffff; } + /* reuse inner packet flow_hash for load-balance node */ + vnet_buffer (b0)->ip.flow_hash = flow_hash0; + vlib_increment_combined_counter (tx_counter, thread_index, sw_if_index0, 1, len0); pkts_encapsulated ++; -- cgit 1.2.3-korg