Skip to contentSkip to conversation

ipv4: Support multipath hashing on inner IP pkts for GRE tunnel

PATCH Applied Stephen Suryaputra 5 participants 6 messages Jun 13, 2019 – Jun 17, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 ipv4: Support multipath hashing on inner IP pkts for GRE tunnel

Multipath hash policy value of 0 isn't distributing since the outer IP dest and src aren't varied eventhough the inner ones are. Since the flow is on the inner ones in the case of tunneled traffic, hashing on them is desired.

This is done mainly for IP over GRE, hence only tested for that. But anything else supported by flow dissection should work.

v2: Use skb_flow_dissect_flow_keys() directly so that other tunneling
can be supported through flow dissection (per Nikolay Aleksandrov).
v3: Remove accidental inclusion of ports in the hash keys and clarify
the documentation (Nikolay Alexandrov).

---
 Documentation/networking/ip-sysctl.txt |  1 +
 net/ipv4/route.c                       | 17 +++++++++++++++++
 net/ipv4/sysctl_net_ipv4.c             |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)
Documentation/networking/ip-sysctl.txt +1 -0
index 5eedc6941ce5..f2ee426f13ad 100644
@@ -80,6 +80,7 @@ fib_multipath_hash_policy - INTEGER
 	Possible values:
 	0 - Layer 3
 	1 - Layer 4
+	2 - Layer 3 or inner Layer 3 if present
 
 fib_sync_mem - UNSIGNED INTEGER
 	Amount of dirty memory from fib entries that can be backlogged before
net/ipv4/route.c +17 -0
index 14c7fdacaa72..7ad96121ed8e 100644
@@ -1872,6 +1872,23 @@ int fib_multipath_hash(const struct net *net, const struct flowi4 *fl4,
 			hash_keys.basic.ip_proto = fl4->flowi4_proto;
 		}
 		break;
+	case 2:
+		memset(&hash_keys, 0, sizeof(hash_keys));
+		hash_keys.control.addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;
+		/* skb is currently provided only when forwarding */
+		if (skb) {
+			struct flow_keys keys;
+
+			skb_flow_dissect_flow_keys(skb, &keys, 0);
+
+			hash_keys.addrs.v4addrs.src = keys.addrs.v4addrs.src;
+			hash_keys.addrs.v4addrs.dst = keys.addrs.v4addrs.dst;
+		} else {
+			/* Same as case 0 */
+			hash_keys.addrs.v4addrs.src = fl4->saddr;
+			hash_keys.addrs.v4addrs.dst = fl4->daddr;
+		}
+		break;
 	}
 	mhash = flow_hash_from_keys(&hash_keys);
 
net/ipv4/sysctl_net_ipv4.c +1 -1
index 2316c08e9591..e1efc2e62d21 100644
@@ -960,7 +960,7 @@ static struct ctl_table ipv4_net_table[] = {
 		.mode		= 0644,
 		.proc_handler	= proc_fib_multipath_hash_policy,
 		.extra1		= &zero,
-		.extra2		= &one,
+		.extra2		= &two,
 	},
 #endif
 	{
Signature · 1 line
2.17.1
#1 lore raw
Quoted 12 lines · Stephen Suryaputra

Multipath hash policy value of 0 isn't distributing since the outer IP dest and src aren't varied eventhough the inner ones are. Since the flow is on the inner ones in the case of tunneled traffic, hashing on them is desired.

This is done mainly for IP over GRE, hence only tested for that. But anything else supported by flow dissection should work.

v2: Use skb_flow_dissect_flow_keys() directly so that other tunneling
can be supported through flow dissection (per Nikolay Aleksandrov).
v3: Remove accidental inclusion of ports in the hash keys and clarify
the documentation (Nikolay Alexandrov).

Quoted 7 lines
---
 Documentation/networking/ip-sysctl.txt |  1 +
 net/ipv4/route.c                       | 17 +++++++++++++++++
 net/ipv4/sysctl_net_ipv4.c             |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

Looks good to me,

maintainer Applied
#2 lore raw
In reply to Stephen Suryaputra

From: Stephen Suryaputra <[email protected]>
Date: Thu, 13 Jun 2019 14:38:58 -0400

Quoted 5 lines

Multipath hash policy value of 0 isn't distributing since the outer IP dest and src aren't varied eventhough the inner ones are. Since the flow is on the inner ones in the case of tunneled traffic, hashing on them is desired.

Quoted 8 lines

This is done mainly for IP over GRE, hence only tested for that. But anything else supported by flow dissection should work.

v2: Use skb_flow_dissect_flow_keys() directly so that other tunneling
can be supported through flow dissection (per Nikolay Aleksandrov).
v3: Remove accidental inclusion of ports in the hash keys and clarify
the documentation (Nikolay Alexandrov).

Applied.

#3 lore raw
In reply to Stephen Suryaputra
Quoted 5 lines · Stephen Suryaputra

Multipath hash policy value of 0 isn't distributing since the outer IP dest and src aren't varied eventhough the inner ones are. Since the flow is on the inner ones in the case of tunneled traffic, hashing on them is desired.

Quoted 8 lines

This is done mainly for IP over GRE, hence only tested for that. But anything else supported by flow dissection should work.

v2: Use skb_flow_dissect_flow_keys() directly so that other tunneling
can be supported through flow dissection (per Nikolay Aleksandrov).
v3: Remove accidental inclusion of ports in the hash keys and clarify
the documentation (Nikolay Alexandrov).

Hi,

Do you plan to add IPv6 support? Would be good to have the same features in both stacks.

Also, we have tests for these sysctls under tools/testing/selftests/net/forwarding/router_multipath.sh

Can you add a test for this change as well? You'll probably need to create a new file given the topology created by router_multipath.sh does not include tunnels.

Thanks

#4 lore raw
Quoted 3 lines · Ido Schimmel

Do you plan to add IPv6 support? Would be good to have the same features in both stacks.

we really should be mandating equal support for all new changes like this.

Quoted 10 lines

Also, we have tests for these sysctls under tools/testing/selftests/net/forwarding/router_multipath.sh

Can you add a test for this change as well? You'll probably need to create a new file given the topology created by router_multipath.sh does not include tunnels.

Thanks

#5 lore raw
Quoted 7 lines · David Ahern
Quoted 3 lines · Ido Schimmel

Do you plan to add IPv6 support? Would be good to have the same features in both stacks.

we really should be mandating equal support for all new changes like this.

I will add that.

Quoted 7 lines
Quoted 7 lines

Also, we have tests for these sysctls under tools/testing/selftests/net/forwarding/router_multipath.sh

Can you add a test for this change as well? You'll probably need to create a new file given the topology created by router_multipath.sh does not include tunnels.

I never looked at the selftests scripts, but will attempt.

Stephen.