UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ipv6: Handle all fib6_nh in a nexthop in mtu updates 

Use nexthop_for_each_fib6_nh to call fib6_nh_mtu_change for each
fib6_nh in a nexthop for rt6_mtu_change_route. For __ip6_rt_update_pmtu,
we need to find the nexthop that correlates to the device and gateway
in the rt6_info.

Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Ahern 2019-06-08 14:53:31 -07:00 committed by David S. Miller
parent 49d5b8ef20
commit 2d44234bf9
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
net/ipv6/route.c
View File

@ -2679,10 +2679,31 @@ static void __ip6_rt_update_pmtu(struct dst_entry *dst, const struct sock *sk,
rcu_read_unlock(); rcu_read_unlock();
return; return;
} }
res.nh = res.f6i->fib6_nh;
res.fib6_flags = res.f6i->fib6_flags; res.fib6_flags = res.f6i->fib6_flags;
res.fib6_type = res.f6i->fib6_type; res.fib6_type = res.f6i->fib6_type;
if (res.f6i->nh) {
struct fib6_nh_match_arg arg = {
.dev = dst->dev,
.gw = &rt6->rt6i_gateway,
};
nexthop_for_each_fib6_nh(res.f6i->nh,
fib6_nh_find_match, &arg);
/* fib6_info uses a nexthop that does not have fib6_nh
* using the dst->dev + gw. Should be impossible.
*/
if (!arg.match) {
rcu_read_unlock();
return;
}
res.nh = arg.match;
} else {
res.nh = res.f6i->fib6_nh;
}
nrt6 = ip6_rt_cache_alloc(&res, daddr, saddr); nrt6 = ip6_rt_cache_alloc(&res, daddr, saddr);
if (nrt6) { if (nrt6) {
rt6_do_update_pmtu(nrt6, mtu); rt6_do_update_pmtu(nrt6, mtu);
@ -4650,6 +4671,12 @@ static int rt6_mtu_change_route(struct fib6_info *f6i, void *p_arg)
return 0; return 0;
arg->f6i = f6i; arg->f6i = f6i;
if (f6i->nh) {
/* fib6_nh_mtu_change only returns 0, so this is safe */
return nexthop_for_each_fib6_nh(f6i->nh, fib6_nh_mtu_change,
arg);
}
return fib6_nh_mtu_change(f6i->fib6_nh, arg); return fib6_nh_mtu_change(f6i->fib6_nh, arg);
} }