Skip to content

Commit 6e17474

Browse files
Vadim FedorenkoPaolo Abeni
authored andcommitted
net: fib: restore ECMP balance from loopback
Preference of nexthop with source address broke ECMP for packets with source addresses which are not in the broadcast domain, but rather added to loopback/dummy interfaces. Original behaviour was to balance over nexthops while now it uses the latest nexthop from the group. To fix the issue introduce next hop scoring system where next hops with source address equal to requested will always have higher priority. For the case with 198.51.100.1/32 assigned to dummy0 and routed using 192.0.2.0/24 and 203.0.113.0/24 networks: 2: dummy0: <BROADCAST,NOARP,UP,LOWER_UP> mtu 1500 qdisc noqueue state UNKNOWN group default qlen 1000 link/ether d6:54:8a:ff:78:f5 brd ff:ff:ff:ff:ff:ff inet 198.51.100.1/32 scope global dummy0 valid_lft forever preferred_lft forever 7: veth1@if6: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP group default qlen 1000 link/ether 06:ed:98:87:6d:8a brd ff:ff:ff:ff:ff:ff link-netnsid 0 inet 192.0.2.2/24 scope global veth1 valid_lft forever preferred_lft forever inet6 fe80::4ed:98ff:fe87:6d8a/64 scope link proto kernel_ll valid_lft forever preferred_lft forever 9: veth3@if8: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP group default qlen 1000 link/ether ae:75:23:38:a0:d2 brd ff:ff:ff:ff:ff:ff link-netnsid 0 inet 203.0.113.2/24 scope global veth3 valid_lft forever preferred_lft forever inet6 fe80::ac75:23ff:fe38:a0d2/64 scope link proto kernel_ll valid_lft forever preferred_lft forever ~ ip ro list: default nexthop via 192.0.2.1 dev veth1 weight 1 nexthop via 203.0.113.1 dev veth3 weight 1 192.0.2.0/24 dev veth1 proto kernel scope link src 192.0.2.2 203.0.113.0/24 dev veth3 proto kernel scope link src 203.0.113.2 before: for i in {1..255} ; do ip ro get 10.0.0.$i; done | grep veth | awk ' {print $(NF-2)}' | sort | uniq -c: 255 veth3 after: for i in {1..255} ; do ip ro get 10.0.0.$i; done | grep veth | awk ' {print $(NF-2)}' | sort | uniq -c: 122 veth1 133 veth3 Fixes: 32607a3 ("ipv4: prefer multipath nexthop that matches source address") Signed-off-by: Vadim Fedorenko <[email protected]> Reviewed-by: Ido Schimmel <[email protected]> Reviewed-by: Willem de Bruijn <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Paolo Abeni <[email protected]>
1 parent 44741e9 commit 6e17474

1 file changed

Lines changed: 10 additions & 16 deletions

File tree

net/ipv4/fib_semantics.c

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2167,8 +2167,8 @@ void fib_select_multipath(struct fib_result *res, int hash,
21672167
{
21682168
struct fib_info *fi = res->fi;
21692169
struct net *net = fi->fib_net;
2170-
bool found = false;
21712170
bool use_neigh;
2171+
int score = -1;
21722172
__be32 saddr;
21732173

21742174
if (unlikely(res->fi->nh)) {
@@ -2180,7 +2180,7 @@ void fib_select_multipath(struct fib_result *res, int hash,
21802180
saddr = fl4 ? fl4->saddr : 0;
21812181

21822182
change_nexthops(fi) {
2183-
int nh_upper_bound;
2183+
int nh_upper_bound, nh_score = 0;
21842184

21852185
/* Nexthops without a carrier are assigned an upper bound of
21862186
* minus one when "ignore_routes_with_linkdown" is set.
@@ -2190,24 +2190,18 @@ void fib_select_multipath(struct fib_result *res, int hash,
21902190
(use_neigh && !fib_good_nh(nexthop_nh)))
21912191
continue;
21922192

2193-
if (!found) {
2193+
if (saddr && nexthop_nh->nh_saddr == saddr)
2194+
nh_score += 2;
2195+
if (hash <= nh_upper_bound)
2196+
nh_score++;
2197+
if (score < nh_score) {
21942198
res->nh_sel = nhsel;
21952199
res->nhc = &nexthop_nh->nh_common;
2196-
found = !saddr || nexthop_nh->nh_saddr == saddr;
2200+
if (nh_score == 3 || (!saddr && nh_score == 1))
2201+
return;
2202+
score = nh_score;
21972203
}
21982204

2199-
if (hash > nh_upper_bound)
2200-
continue;
2201-
2202-
if (!saddr || nexthop_nh->nh_saddr == saddr) {
2203-
res->nh_sel = nhsel;
2204-
res->nhc = &nexthop_nh->nh_common;
2205-
return;
2206-
}
2207-
2208-
if (found)
2209-
return;
2210-
22112205
} endfor_nexthops(fi);
22122206
}
22132207
#endif

0 commit comments

Comments
 (0)