ipv4: Initialize flowi4_multipath_hash in data path
Subsystems (5)
David Ahern
maintainerPATCH 1/1 ipv4: Initialize flowi4_multipath_hash in data path
From: David Ahern <[email protected]>
flowi4_multipath_hash was added by the commit referenced below for tunnels. Unfortunately, the patch did not initialize the new field for several fast path lookups that do not initialize the entire flow struct to 0. Fix those locations. Currently, flowi4_multipath_hash is random garbage and affects the hash value computed by fib_multipath_hash for multipath selection.
--- include/net/flow.h | 1 + net/core/filter.c | 1 + net/ipv4/fib_frontend.c | 1 + net/ipv4/route.c | 1 + 4 files changed, 4 insertions(+)
include/net/flow.h +1 -0
@@ -116,6 +116,7 @@ static inline void flowi4_init_output(struct flowi4 *fl4, int oif, fl4->saddr = saddr; fl4->fl4_dport = dport; fl4->fl4_sport = sport; + fl4->flowi4_multipath_hash =0 ; }/* Reset some input parameters after previous lookup */
net/core/filter.c +1 -0
@@ -4838,6 +4838,7 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params, fl4.saddr = params->ipv4_src; fl4.fl4_sport = params->sport; fl4.fl4_dport = params->dport; + fl4.flowi4_multipath_hash =0 ;if (flags &BPF_FIB_LOOKUP_DIRECT ) {u32 tbid =l3mdev_fib_table_rcu (dev) ? :RT_TABLE_MAIN ;
net/ipv4/fib_frontend.c +1 -0
@@ -362,6 +362,7 @@ static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst, fl4.flowi4_tun_key.tun_id =0 ; fl4.flowi4_flags =0 ; fl4.flowi4_uid =sock_net_uid (net,NULL ); + fl4.flowi4_multipath_hash =0 ; no_addr = idev->ifa_list ==NULL ;
net/ipv4/route.c +1 -0
@@ -2147,6 +2147,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr, fl4.daddr = daddr; fl4.saddr = saddr; fl4.flowi4_uid =sock_net_uid (net,NULL ); + fl4.flowi4_multipath_hash =0 ;if (fib4_rules_early_flow_dissect (net, skb, &fl4, &_flkeys)) { flkeys = &_flkeys;
Signature · 1 line
2.24.3 (Apple Git-128)
David Miller
maintainerFrom: David Ahern <[email protected]>
Date: Sun, 13 Sep 2020 12:43:39 -0600
Quoted 9 lines
From: David Ahern <[email protected]>
flowi4_multipath_hashwas added by the commit referenced below for tunnels. Unfortunately, the patch did not initialize the new field for several fast path lookups that do not initialize the entire flow struct to 0. Fix those locations. Currently,flowi4_multipath_hashis random garbage and affects the hash value computed byfib_multipath_hashfor multipath selection.
Quoted 3 lines
Fixes 24ba14406c5c ("route: Add multipath_hash in flowi_common to make user-define hash")Signed-off-by David Ahern <[email protected]>Cc wenxu <[email protected]>
Applied and queued up for -stable, thanks David.