From: Florian Westphal <fw@strlen•de>
To: <netdev@vger•kernel.org>
Cc: Florian Westphal <fw@strlen•de>
Subject: [PATCH net-next 7/7] rtnetlink: rtnl_have_link_slave_info doesn't need rtnl
Date: Thu, 21 Sep 2017 18:59:02 +0200 [thread overview]
Message-ID: <20170921165902.10746-8-fw@strlen.de> (raw)
In-Reply-To: <20170921165902.10746-1-fw@strlen.de>
it can be switched to rcu.
rtnl_link_slave_info_fill on the other hand does need it,
at least for now. Add ASSERT_RTNL annotation as a reminder.
Signed-off-by: Florian Westphal <fw@strlen•de>
---
net/core/rtnetlink.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 7af9774aec40..9fd48b437d64 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -524,11 +524,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,
@@ -539,6 +543,8 @@ static int rtnl_link_slave_info_fill(struct sk_buff *skb,
struct nlattr *slave_data;
int err;
+ ASSERT_RTNL();
+
master_dev = netdev_master_upper_dev_get((struct net_device *) dev);
if (!master_dev)
return 0;
@@ -570,6 +576,8 @@ static int rtnl_link_info_fill(struct sk_buff *skb,
struct nlattr *data;
int err;
+ ASSERT_RTNL();
+
if (!ops)
return 0;
if (nla_put_string(skb, IFLA_INFO_KIND, ops->kind) < 0)
@@ -600,6 +608,8 @@ static int rtnl_link_fill(struct sk_buff *skb, const struct net_device *dev)
struct nlattr *linkinfo;
int err = -EMSGSIZE;
+ ASSERT_RTNL();
+
linkinfo = nla_nest_start(skb, IFLA_LINKINFO);
if (linkinfo == NULL)
goto out;
--
2.13.5
next prev parent reply other threads:[~2017-09-21 16:59 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-21 16:58 [PATCH net-next] rtnetlink: prepare for further rtnl lock pushdown/removal Florian Westphal
2017-09-21 16:58 ` [PATCH net-next 1/7] selftests: rtnetlink.sh: add rudimentary vrf test Florian Westphal
2017-09-21 16:58 ` [PATCH net-next 2/7] rtnetlink: add helper to put master ifindex Florian Westphal
2017-09-21 17:16 ` David Ahern
2017-09-21 16:58 ` [PATCH net-next 3/7] rtnetlink: add helper to dump qdisc name Florian Westphal
2017-09-21 16:58 ` [PATCH net-next 4/7] rtnetlink: add helper to dump ifalias Florian Westphal
2017-09-21 16:59 ` [PATCH net-next 5/7] rtnetlink: add helper to dump vf information Florian Westphal
2017-09-21 17:17 ` David Ahern
2017-09-21 17:25 ` Florian Westphal
2017-09-21 16:59 ` [PATCH net-next 6/7] rtnetlink: link ops lookup must occur with rtnl lock held Florian Westphal
2017-09-21 16:59 ` Florian Westphal [this message]
2017-09-21 17:24 ` [PATCH net-next 7/7] rtnetlink: rtnl_have_link_slave_info doesn't need rtnl David Ahern
2017-09-21 17:31 ` Florian Westphal
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=20170921165902.10746-8-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