From: David Ahern <dsahern@gmail•com>
To: netdev@vger•kernel.org
Cc: davem@davemloft•net, idosch@idosch•org,
roopa@cumulusnetworks•com, eric.dumazet@gmail•com,
weiwan@google•com, kafai@fb•com, yoshfuji@linux-ipv6•org,
David Ahern <dsahern@gmail•com>
Subject: [PATCH net-next 4/7] net/ipv6: Move rcu locking to callers of fib6_get_cookie_safe
Date: Fri, 20 Apr 2018 15:38:00 -0700 [thread overview]
Message-ID: <20180420223803.15743-5-dsahern@gmail.com> (raw)
In-Reply-To: <20180420223803.15743-1-dsahern@gmail.com>
A later patch protects 'from' in rt6_info and this simplifies the
locking needed by it.
Signed-off-by: David Ahern <dsahern@gmail•com>
---
include/net/ip6_fib.h | 6 ++++--
net/ipv6/route.c | 13 ++++++++++---
2 files changed, 14 insertions(+), 5 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;
}
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index f8b22183b7fd..810a37ac043b 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2159,9 +2159,12 @@ static struct dst_entry *rt6_dst_from_check(struct rt6_info *rt, u32 cookie)
static struct dst_entry *ip6_dst_check(struct dst_entry *dst, u32 cookie)
{
+ struct dst_entry *dst_ret;
struct rt6_info *rt;
- rt = (struct rt6_info *) dst;
+ rt = container_of(dst, struct rt6_info, dst);
+
+ rcu_read_lock();
/* All IPV6 dsts are created with ->obsolete set to the value
* DST_OBSOLETE_FORCE_CHK which forces validation calls down
@@ -2170,9 +2173,13 @@ static struct dst_entry *ip6_dst_check(struct dst_entry *dst, u32 cookie)
if (rt->rt6i_flags & RTF_PCPU ||
(unlikely(!list_empty(&rt->rt6i_uncached)) && rt->from))
- return rt6_dst_from_check(rt, cookie);
+ dst_ret = rt6_dst_from_check(rt, cookie);
else
- return rt6_check(rt, cookie);
+ dst_ret = rt6_check(rt, cookie);
+
+ rcu_read_unlock();
+
+ return dst_ret;
}
static struct dst_entry *ip6_negative_advice(struct dst_entry *dst)
--
2.11.0
next prev parent reply other threads:[~2018-04-20 22:38 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-20 22:37 [PATCH net-next 0/7] net/ipv6: Another followup to the fib6_info change David Ahern
2018-04-20 22:37 ` [PATCH net-next 1/7] net/ipv6: Clean up rt expires helpers David Ahern
2018-04-20 22:37 ` [PATCH net-next 2/7] net/ipv6: Rename rt6_get_cookie_safe David Ahern
2018-04-20 22:37 ` [PATCH net-next 3/7] net/ipv6: Move rcu_read_lock to callers of ip6_rt_cache_alloc David Ahern
2018-04-20 22:38 ` David Ahern [this message]
2018-04-20 22:38 ` [PATCH net-next 5/7] net/ipv6: Move release of fib6_info from pcpu routes to helper David Ahern
2018-04-20 22:38 ` [PATCH net-next 6/7] net/ipv6: Make from in rt6_info rcu protected David Ahern
2018-04-20 22:38 ` [PATCH net-next 7/7] net/ipv6: Remove unncessary check on f6i in fib6_check David Ahern
2018-04-21 20:06 ` [PATCH net-next 0/7] net/ipv6: Another followup to the fib6_info change David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180420223803.15743-5-dsahern@gmail.com \
--to=dsahern@gmail$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=eric.dumazet@gmail$(echo .)com \
--cc=idosch@idosch$(echo .)org \
--cc=kafai@fb$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=roopa@cumulusnetworks$(echo .)com \
--cc=weiwan@google$(echo .)com \
--cc=yoshfuji@linux-ipv6$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox