xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net/ipv6: Move rcu locking to callers of fib6_get_cookie_safe

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

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:38:00 -07:00
committed by David S. Miller
parent 4d85cd0c2a
commit a87b7dc9f7
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/net/ip6_fib.h
View File

@@ -234,7 +234,6 @@ static inline bool fib6_get_cookie_safe(const struct fib6_info *f6i,
struct fib6_node *fn;
bool status = false;
rcu_read_lock();
fn = rcu_dereference(f6i->fib6_node);
if (fn) {
@@ -244,7 +243,6 @@ static inline bool fib6_get_cookie_safe(const struct fib6_info *f6i,
status = true;
}
rcu_read_unlock();
return status;
}
@@ -252,10 +250,14 @@ static inline u32 rt6_get_cookie(const struct rt6_info *rt)
{
u32 cookie = 0;
rcu_read_lock();
if (rt->rt6i_flags & RTF_PCPU ||
(unlikely(!list_empty(&rt->rt6i_uncached)) && rt->from))
fib6_get_cookie_safe(rt->from, &cookie);
rcu_read_unlock();
return cookie;
}