From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com,
jacob.e.keller@intel.com, jiri@resnulli.us,
Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH net-next 12/14] devlink: uniformly take the devlink instance lock in the dump loop
Date: Tue, 3 Jan 2023 20:16:34 -0800 [thread overview]
Message-ID: <20230104041636.226398-13-kuba@kernel.org> (raw)
In-Reply-To: <20230104041636.226398-1-kuba@kernel.org>
Move the lock taking out of devlink_nl_cmd_region_get_devlink_dumpit().
This way all dumps will take the instance lock in the main iteration
loop directly, making refactoring and reading the code easier.
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
net/devlink/leftover.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c
index d01089b65ddc..c6ad8133fc23 100644
--- a/net/devlink/leftover.c
+++ b/net/devlink/leftover.c
@@ -6050,9 +6050,8 @@ static int devlink_nl_cmd_region_get_devlink_dumpit(struct sk_buff *msg,
struct devlink_region *region;
struct devlink_port *port;
unsigned long port_index;
- int err = 0;
+ int err;
- devl_lock(devlink);
list_for_each_entry(region, &devlink->region_list, list) {
if (*idx < start) {
(*idx)++;
@@ -6064,7 +6063,7 @@ static int devlink_nl_cmd_region_get_devlink_dumpit(struct sk_buff *msg,
cb->nlh->nlmsg_seq,
NLM_F_MULTI, region);
if (err)
- goto out;
+ return err;
(*idx)++;
}
@@ -6072,12 +6071,10 @@ static int devlink_nl_cmd_region_get_devlink_dumpit(struct sk_buff *msg,
err = devlink_nl_cmd_region_get_port_dumpit(msg, cb, port, idx,
start);
if (err)
- goto out;
+ return err;
}
-out:
- devl_unlock(devlink);
- return err;
+ return 0;
}
static int devlink_nl_cmd_region_get_dumpit(struct sk_buff *msg,
@@ -6090,8 +6087,10 @@ static int devlink_nl_cmd_region_get_dumpit(struct sk_buff *msg,
devlink_dump_for_each_instance_get(msg, dump, devlink) {
int idx = 0;
+ devl_lock(devlink);
err = devlink_nl_cmd_region_get_devlink_dumpit(msg, cb, devlink,
&idx, dump->idx);
+ devl_unlock(devlink);
devlink_put(devlink);
if (err) {
dump->idx = idx;
--
2.38.1
next prev parent reply other threads:[~2023-01-04 4:17 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-04 4:16 [PATCH net-next 00/14] devlink: code split and structured instance walk Jakub Kicinski
2023-01-04 4:16 ` [PATCH net-next 01/14] devlink: move code to a dedicated directory Jakub Kicinski
2023-01-04 4:16 ` [PATCH net-next 02/14] devlink: split out core code Jakub Kicinski
2023-01-04 9:50 ` Jiri Pirko
2023-01-05 2:10 ` Jakub Kicinski
2023-01-06 23:55 ` Jacob Keller
2023-01-04 4:16 ` [PATCH net-next 03/14] devlink: split out netlink code Jakub Kicinski
2023-01-05 9:03 ` Jiri Pirko
2023-01-05 18:20 ` Jakub Kicinski
2023-01-06 8:47 ` Jiri Pirko
2023-01-04 4:16 ` [PATCH net-next 04/14] netlink: add macro for checking dump ctx size Jakub Kicinski
2023-01-04 9:51 ` Jiri Pirko
2023-01-04 4:16 ` [PATCH net-next 05/14] devlink: use an explicit structure for dump context Jakub Kicinski
2023-01-04 10:04 ` Jiri Pirko
2023-01-05 2:22 ` Jakub Kicinski
2023-01-04 4:16 ` [PATCH net-next 06/14] devlink: remove start variables from dumps Jakub Kicinski
2023-01-04 4:16 ` [PATCH net-next 07/14] devlink: drop the filter argument from devlinks_xa_find_get Jakub Kicinski
2023-01-04 10:05 ` Jiri Pirko
2023-01-04 4:16 ` [PATCH net-next 08/14] devlink: health: combine loops in dump Jakub Kicinski
2023-01-04 10:06 ` Jiri Pirko
2023-01-04 4:16 ` [PATCH net-next 09/14] devlink: restart dump based on devlink instance ids (simple) Jakub Kicinski
2023-01-04 14:18 ` Jiri Pirko
2023-01-05 3:21 ` Jakub Kicinski
2023-01-04 4:16 ` [PATCH net-next 10/14] devlink: restart dump based on devlink instance ids (nested) Jakub Kicinski
2023-01-04 15:47 ` Jiri Pirko
2023-01-04 4:16 ` [PATCH net-next 11/14] devlink: restart dump based on devlink instance ids (function) Jakub Kicinski
2023-01-04 15:51 ` Jiri Pirko
2023-01-04 4:16 ` Jakub Kicinski [this message]
2023-01-04 15:52 ` [PATCH net-next 12/14] devlink: uniformly take the devlink instance lock in the dump loop Jiri Pirko
2023-01-04 4:16 ` [PATCH net-next 13/14] devlink: add by-instance dump infra Jakub Kicinski
2023-01-04 16:50 ` Jiri Pirko
2023-01-05 3:46 ` Jakub Kicinski
2023-01-05 9:02 ` Jiri Pirko
2023-01-05 18:24 ` Jakub Kicinski
2023-01-06 8:56 ` Jiri Pirko
2023-01-06 21:12 ` Jakub Kicinski
2023-01-07 9:23 ` Jiri Pirko
2023-01-09 19:49 ` Jakub Kicinski
2023-01-10 14:31 ` Jiri Pirko
2023-01-12 0:13 ` Jacob Keller
2023-01-06 11:25 ` Jiri Pirko
2023-01-04 4:16 ` [PATCH net-next 14/14] devlink: convert remaining dumps to the by-instance scheme Jakub Kicinski
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=20230104041636.226398-13-kuba@kernel.org \
--to=kuba@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=jacob.e.keller@intel.com \
--cc=jiri@resnulli.us \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.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).