evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net: ipv4: Fix multipath selection with vrf

Browse source 
[ Upstream commit 7a18c5b9fb31a999afc62b0e60978aa896fc89e9 ]

fib_select_path does not call fib_select_multipath if oif is set in the
flow struct. For VRF use cases oif is always set, so multipath route
selection is bypassed. Use the FLOWI_FLAG_SKIP_NH_OIF to skip the oif
check similar to what is done in fib_table_lookup.

Add saddr and proto to the flow struct for the fib lookup done by the
VRF driver to better match hash computation for a flow.

Fixes: 613d09b30f ("net: Use VRF device index for lookups on TX")
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
David Ahern 2017-01-10 14:37:35 -08:00 • committed by Greg Kroah-Hartman
parent 67b21973ec
commit c177d491a9
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/vrf.c
View file

@ -301,7 +301,9 @@ static netdev_tx_t vrf_process_v4_outbound(struct sk_buff *skb,
.flowi4_tos = RT_TOS(ip4h->tos), .flowi4_tos = RT_TOS(ip4h->tos),
.flowi4_flags = FLOWI_FLAG_ANYSRC | FLOWI_FLAG_L3MDEV_SRC | .flowi4_flags = FLOWI_FLAG_ANYSRC | FLOWI_FLAG_L3MDEV_SRC |
FLOWI_FLAG_SKIP_NH_OIF, FLOWI_FLAG_SKIP_NH_OIF,
.flowi4_proto = ip4h->protocol,
.daddr = ip4h->daddr, .daddr = ip4h->daddr,
.saddr = ip4h->saddr,
}; };
if (vrf_send_v4_prep(skb, &fl4, vrf_dev)) if (vrf_send_v4_prep(skb, &fl4, vrf_dev))

9
net/ipv4/fib_semantics.c
View file

@ -1588,8 +1588,13 @@ void fib_select_multipath(struct fib_result *res, int hash)
void fib_select_path(struct net *net, struct fib_result *res, void fib_select_path(struct net *net, struct fib_result *res,
struct flowi4 *fl4, int mp_hash) struct flowi4 *fl4, int mp_hash)
{ {
bool oif_check;
oif_check = (fl4->flowi4_oif == 0 ||
fl4->flowi4_flags & FLOWI_FLAG_SKIP_NH_OIF);
#ifdef CONFIG_IP_ROUTE_MULTIPATH #ifdef CONFIG_IP_ROUTE_MULTIPATH
if (res->fi->fib_nhs > 1 && fl4->flowi4_oif == 0) { if (res->fi->fib_nhs > 1 && oif_check) {
if (mp_hash < 0) if (mp_hash < 0)
mp_hash = get_hash_from_flowi4(fl4) >> 1; mp_hash = get_hash_from_flowi4(fl4) >> 1;
@ -1599,7 +1604,7 @@ void fib_select_path(struct net *net, struct fib_result *res,
#endif #endif
if (!res->prefixlen && if (!res->prefixlen &&
res->table->tb_num_default > 1 && res->table->tb_num_default > 1 &&
res->type == RTN_UNICAST && !fl4->flowi4_oif) res->type == RTN_UNICAST && oif_check)
fib_select_default(fl4, res); fib_select_default(fl4, res);
if (!fl4->saddr) if (!fl4->saddr)