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

net/ipv6: Move rcu_read_lock to callers of ip6_rt_cache_alloc 

A later patch protects 'from' in rt6_info and this simplifies the
locking needed by it.

With the move, the fib6_info_hold for the uncached_rt is no longer
needed since the rcu_lock is still held.

Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Ahern 2018-04-20 15:37:59 -07:00 committed by David S. Miller
parent a269f1a764
commit 4d85cd0c2a
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/ipv6/route.c
View File

@ -1164,10 +1164,8 @@ static struct rt6_info *ip6_rt_cache_alloc(struct fib6_info *ort,
* Clone the route. * Clone the route.
*/ */
rcu_read_lock();
dev = ip6_rt_get_dev_rcu(ort); dev = ip6_rt_get_dev_rcu(ort);
rt = ip6_dst_alloc(dev_net(dev), dev, 0); rt = ip6_dst_alloc(dev_net(dev), dev, 0);
rcu_read_unlock();
if (!rt) if (!rt)
return NULL; return NULL;
@ -1855,14 +1853,11 @@ redo_rt6_select:
* the daddr in the skb during the neighbor look-up is different * the daddr in the skb during the neighbor look-up is different
* from the fl6->daddr used to look-up route here. * from the fl6->daddr used to look-up route here.
*/ */
struct rt6_info *uncached_rt; struct rt6_info *uncached_rt;
fib6_info_hold(f6i);
rcu_read_unlock();
uncached_rt = ip6_rt_cache_alloc(f6i, &fl6->daddr, NULL); uncached_rt = ip6_rt_cache_alloc(f6i, &fl6->daddr, NULL);
fib6_info_release(f6i);
rcu_read_unlock();
if (uncached_rt) { if (uncached_rt) {
/* Uncached_rt's refcnt is taken during ip6_rt_cache_alloc() /* Uncached_rt's refcnt is taken during ip6_rt_cache_alloc()
@ -2280,7 +2275,9 @@ static void __ip6_rt_update_pmtu(struct dst_entry *dst, const struct sock *sk,
} else if (daddr) { } else if (daddr) {
struct rt6_info *nrt6; struct rt6_info *nrt6;
rcu_read_lock();
nrt6 = ip6_rt_cache_alloc(rt6->from, daddr, saddr); nrt6 = ip6_rt_cache_alloc(rt6->from, daddr, saddr);
rcu_read_unlock();
if (nrt6) { if (nrt6) {
rt6_do_update_pmtu(nrt6, mtu); rt6_do_update_pmtu(nrt6, mtu);
if (rt6_insert_exception(nrt6, rt6->from)) if (rt6_insert_exception(nrt6, rt6->from))
@ -3299,7 +3296,9 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_bu
NEIGH_UPDATE_F_ISROUTER)), NEIGH_UPDATE_F_ISROUTER)),
NDISC_REDIRECT, &ndopts); NDISC_REDIRECT, &ndopts);
rcu_read_lock();
nrt = ip6_rt_cache_alloc(rt->from, &msg->dest, NULL); nrt = ip6_rt_cache_alloc(rt->from, &msg->dest, NULL);
rcu_read_unlock();
if (!nrt) if (!nrt)
goto out; goto out;