diff options
| author | David Ahern <dsahern@gmail.com> | 2018-04-20 15:38:00 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-04-21 16:06:13 -0400 |
| commit | a87b7dc9f7fa7c87cbd575361553e8e9e4ab4473 (patch) | |
| tree | 43496ce1a064a81166e64d01017bf5f03158c80a /include | |
| parent | 4d85cd0c2a1ce22a9aca1fa668ba11043c834bbc (diff) | |
| download | linux-a87b7dc9f7fa7c87cbd575361553e8e9e4ab4473.tar.bz2 | |
net/ipv6: Move rcu locking to callers of fib6_get_cookie_safe
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/ip6_fib.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index dd1481ed8bdb..dc3505fb62b3 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h @@ -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; } |