From: Parav Pandit <parav@nvidia.com>
To: <kuba@kernel.org>, <davem@davemloft.net>,
<netdev@vger.kernel.org>, <jiri@nvidia.com>
Cc: Parav Pandit <parav@nvidia.com>
Subject: [PATCH net v2 1/2] devlink: Hold rtnl lock while reading netdev attributes
Date: Wed, 25 Nov 2020 11:16:19 +0200 [thread overview]
Message-ID: <20201125091620.6781-2-parav@nvidia.com> (raw)
In-Reply-To: <20201125091620.6781-1-parav@nvidia.com>
A netdevice of a devlink port can be moved to different net namespace
than its parent devlink instance.
This scenario occurs when devlink reload is not used.
When netdevice is undergoing migration to net namespace, its ifindex
and name may change.
In such use case, devlink port query may read stale netdev attributes.
Fix it by reading them under rtnl lock.
Fixes: bfcd3a466172 ("Introduce devlink infrastructure")
Signed-off-by: Parav Pandit <parav@nvidia.com>
---
Changelog:
v1->v2:
- avoided refactoring the code
- updated commit log
---
net/core/devlink.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/net/core/devlink.c b/net/core/devlink.c
index acc29d5157f4..04ae67bbe19c 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -792,6 +792,8 @@ static int devlink_nl_port_fill(struct sk_buff *msg, struct devlink *devlink,
if (nla_put_u32(msg, DEVLINK_ATTR_PORT_INDEX, devlink_port->index))
goto nla_put_failure;
+ /* Hold rtnl lock while accessing port's netdev attributes. */
+ rtnl_lock();
spin_lock_bh(&devlink_port->type_lock);
if (nla_put_u16(msg, DEVLINK_ATTR_PORT_TYPE, devlink_port->type))
goto nla_put_failure_type_locked;
@@ -818,6 +820,7 @@ static int devlink_nl_port_fill(struct sk_buff *msg, struct devlink *devlink,
goto nla_put_failure_type_locked;
}
spin_unlock_bh(&devlink_port->type_lock);
+ rtnl_unlock();
if (devlink_nl_port_attrs_put(msg, devlink_port))
goto nla_put_failure;
if (devlink_nl_port_function_attrs_put(msg, devlink_port, extack))
@@ -828,6 +831,7 @@ static int devlink_nl_port_fill(struct sk_buff *msg, struct devlink *devlink,
nla_put_failure_type_locked:
spin_unlock_bh(&devlink_port->type_lock);
+ rtnl_unlock();
nla_put_failure:
genlmsg_cancel(msg, hdr);
return -EMSGSIZE;
--
2.26.2
next prev parent reply other threads:[~2020-11-25 9:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-22 6:12 [PATCH net 0/2] devlink port attribute fixes Parav Pandit
2020-11-22 6:12 ` [PATCH net 1/2] devlink: Hold rtnl lock while reading netdev attributes Parav Pandit
2020-11-24 22:29 ` Jakub Kicinski
2020-11-25 7:13 ` Parav Pandit
2020-11-25 16:30 ` Jakub Kicinski
2020-11-25 17:21 ` Parav Pandit
2020-11-25 17:41 ` Jakub Kicinski
2020-11-25 18:17 ` Parav Pandit
2020-11-22 6:12 ` [PATCH net 2/2] devlink: Make sure devlink instance and port are in same net namespace Parav Pandit
2020-11-25 9:16 ` [PATCH net v2 0/2] devlink port attribute fixes Parav Pandit
2020-11-25 9:16 ` Parav Pandit [this message]
2020-11-25 9:16 ` [PATCH net v2 2/2] devlink: Make sure devlink instance and port are in same net namespace Parav Pandit
2020-11-26 1:40 ` [PATCH net v2 0/2] devlink port attribute fixes patchwork-bot+netdevbpf
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=20201125091620.6781-2-parav@nvidia.com \
--to=parav@nvidia.com \
--cc=davem@davemloft.net \
--cc=jiri@nvidia.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.