From: Joe Damato <jdamato@fastly.com>
To: netdev@vger.kernel.org
Cc: pabeni@redhat.com, edumazet@google.com,
amritha.nambiar@intel.com, sridhar.samudrala@intel.com,
kuba@kernel.org, mkarsten@uwaterloo.ca,
Joe Damato <jdamato@fastly.com>,
"David S. Miller" <davem@davemloft.net>,
Simon Horman <horms@kernel.org>,
Mina Almasry <almasrymina@google.com>,
linux-kernel@vger.kernel.org (open list)
Subject: [RFC net 2/2] netdev-genl: Hold rcu_read_lock in napi_set
Date: Tue, 12 Nov 2024 18:13:59 +0000 [thread overview]
Message-ID: <20241112181401.9689-3-jdamato@fastly.com> (raw)
In-Reply-To: <20241112181401.9689-1-jdamato@fastly.com>
Hold rcu_read_lock during netdev_nl_napi_set_doit, which calls
napi_by_id and requires rcu_read_lock to be held.
Add a helper function which calls napi_by_id and sets the error code and
extack. It is used by this commit and the next commit to reduce code
duplication.
Closes: https://lore.kernel.org/netdev/719083c2-e277-447b-b6ea-ca3acb293a03@redhat.com/
Fixes: 1287c1ae0fc2 ("netdev-genl: Support setting per-NAPI config values")
Signed-off-by: Joe Damato <jdamato@fastly.com>
---
net/core/netdev-genl.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/net/core/netdev-genl.c b/net/core/netdev-genl.c
index 934c63a93524..2a04270e9d2d 100644
--- a/net/core/netdev-genl.c
+++ b/net/core/netdev-genl.c
@@ -361,15 +361,13 @@ int netdev_nl_napi_set_doit(struct sk_buff *skb, struct genl_info *info)
napi_id = nla_get_u32(info->attrs[NETDEV_A_NAPI_ID]);
rtnl_lock();
+ rcu_read_lock();
- napi = napi_by_id(napi_id);
- if (napi) {
+ napi = __do_napi_by_id(napi_id, info, &err);
+ if (!err)
err = netdev_nl_napi_set_config(napi, info);
- } else {
- NL_SET_BAD_ATTR(info->extack, info->attrs[NETDEV_A_NAPI_ID]);
- err = -ENOENT;
- }
+ rcu_read_unlock();
rtnl_unlock();
return err;
--
2.25.1
prev parent reply other threads:[~2024-11-12 18:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-12 18:13 [RFC net 0/2] Fix rcu_read_lock issues in netdev-genl Joe Damato
2024-11-12 18:13 ` [RFC net 1/2] netdev-genl: Hold rcu_read_lock in napi_get Joe Damato
2024-11-13 1:28 ` Jakub Kicinski
2024-11-13 1:48 ` Joe Damato
2024-11-13 2:01 ` Jakub Kicinski
2024-11-13 2:05 ` Joe Damato
2024-11-12 18:13 ` Joe Damato [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=20241112181401.9689-3-jdamato@fastly.com \
--to=jdamato@fastly.com \
--cc=almasrymina@google.com \
--cc=amritha.nambiar@intel.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mkarsten@uwaterloo.ca \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sridhar.samudrala@intel.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).