From: Florian Westphal <fw@strlen•de>
To: <netdev@vger•kernel.org>
Cc: Florian Westphal <fw@strlen•de>
Subject: [PATCH net-next v3 6/6] rtnetlink: rtnl_have_link_slave_info doesn't need rtnl
Date: Sat, 23 Sep 2017 21:26:36 +0200 [thread overview]
Message-ID: <20170923192636.3932-7-fw@strlen.de> (raw)
In-Reply-To: <20170923192636.3932-1-fw@strlen.de>
it can be switched to rcu.
Reviewed-by: David Ahern <dsahern@gmail•com>
Signed-off-by: Florian Westphal <fw@strlen•de>
---
Changes since v2: remove ASSERT_RTNL.
net/core/rtnetlink.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index e858a2b48d7e..c69451964a44 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -522,11 +522,15 @@ static size_t rtnl_link_get_af_size(const struct net_device *dev,
static bool rtnl_have_link_slave_info(const struct net_device *dev)
{
struct net_device *master_dev;
+ bool ret = false;
- master_dev = netdev_master_upper_dev_get((struct net_device *) dev);
+ rcu_read_lock();
+
+ master_dev = netdev_master_upper_dev_get_rcu((struct net_device *)dev);
if (master_dev && master_dev->rtnl_link_ops)
- return true;
- return false;
+ ret = true;
+ rcu_read_unlock();
+ return ret;
}
static int rtnl_link_slave_info_fill(struct sk_buff *skb,
--
2.13.5
prev parent reply other threads:[~2017-09-23 19:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-23 19:26 [PATCH net-next v3 0/6] rtnetlink: preparation patches for further rtnl lock pushdown/removal Florian Westphal
2017-09-23 19:26 ` [PATCH net-next v3 1/6] selftests: rtnetlink.sh: add rudimentary vrf test Florian Westphal
2017-09-23 19:26 ` [PATCH net-next v3 2/6] rtnetlink: add helper to put master and link ifindexes Florian Westphal
2017-09-23 19:26 ` [PATCH net-next v3 3/6] rtnetlink: add helper to dump ifalias Florian Westphal
2017-09-23 21:04 ` Eric Dumazet
2017-09-23 21:21 ` Florian Westphal
2017-09-26 3:34 ` David Miller
2017-09-23 19:26 ` [PATCH net-next v3 4/6] rtnetlink: add helpers to dump vf information Florian Westphal
2017-09-23 19:26 ` [PATCH net-next v3 5/6] rtnetlink: add helpers to dump netnsid information Florian Westphal
2017-09-23 19:26 ` Florian Westphal [this message]
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=20170923192636.3932-7-fw@strlen.de \
--to=fw@strlen$(echo .)de \
--cc=netdev@vger$(echo .)kernel.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