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 06/14] devlink: remove start variables from dumps
Date: Tue, 3 Jan 2023 20:16:28 -0800 [thread overview]
Message-ID: <20230104041636.226398-7-kuba@kernel.org> (raw)
In-Reply-To: <20230104041636.226398-1-kuba@kernel.org>
The start variables made the code clearer when we had to access
cb->args[0] directly, as the name args doesn't explain much.
Now that we use a structure to hold state this seems no longer
needed.
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
net/devlink/leftover.c | 55 +++++++++++++++---------------------------
1 file changed, 19 insertions(+), 36 deletions(-)
diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c
index bcc930b7cfcf..9aac82dc7269 100644
--- a/net/devlink/leftover.c
+++ b/net/devlink/leftover.c
@@ -1225,7 +1225,6 @@ static int devlink_nl_cmd_rate_get_dumpit(struct sk_buff *msg,
struct devlink_nl_dump_state *dump = devl_dump_state(cb);
struct devlink_rate *devlink_rate;
struct devlink *devlink;
- int start = dump->idx;
unsigned long index;
int idx = 0;
int err = 0;
@@ -1236,7 +1235,7 @@ static int devlink_nl_cmd_rate_get_dumpit(struct sk_buff *msg,
enum devlink_command cmd = DEVLINK_CMD_RATE_NEW;
u32 id = NETLINK_CB(cb->skb).portid;
- if (idx < start) {
+ if (idx < dump->idx) {
idx++;
continue;
}
@@ -1320,13 +1319,12 @@ static int devlink_nl_cmd_get_dumpit(struct sk_buff *msg,
{
struct devlink_nl_dump_state *dump = devl_dump_state(cb);
struct devlink *devlink;
- int start = dump->idx;
unsigned long index;
int idx = 0;
int err;
devlinks_xa_for_each_registered_get(sock_net(msg->sk), index, devlink) {
- if (idx < start) {
+ if (idx < dump->idx) {
idx++;
devlink_put(devlink);
continue;
@@ -1377,14 +1375,13 @@ static int devlink_nl_cmd_port_get_dumpit(struct sk_buff *msg,
struct devlink *devlink;
struct devlink_port *devlink_port;
unsigned long index, port_index;
- int start = dump->idx;
int idx = 0;
int err;
devlinks_xa_for_each_registered_get(sock_net(msg->sk), index, devlink) {
devl_lock(devlink);
xa_for_each(&devlink->ports, port_index, devlink_port) {
- if (idx < start) {
+ if (idx < dump->idx) {
idx++;
continue;
}
@@ -2156,7 +2153,6 @@ static int devlink_nl_cmd_linecard_get_dumpit(struct sk_buff *msg,
struct devlink_nl_dump_state *dump = devl_dump_state(cb);
struct devlink_linecard *linecard;
struct devlink *devlink;
- int start = dump->idx;
unsigned long index;
int idx = 0;
int err;
@@ -2164,7 +2160,7 @@ static int devlink_nl_cmd_linecard_get_dumpit(struct sk_buff *msg,
devlinks_xa_for_each_registered_get(sock_net(msg->sk), index, devlink) {
mutex_lock(&devlink->linecards_lock);
list_for_each_entry(linecard, &devlink->linecard_list, list) {
- if (idx < start) {
+ if (idx < dump->idx) {
idx++;
continue;
}
@@ -2419,7 +2415,6 @@ static int devlink_nl_cmd_sb_get_dumpit(struct sk_buff *msg,
struct devlink_nl_dump_state *dump = devl_dump_state(cb);
struct devlink *devlink;
struct devlink_sb *devlink_sb;
- int start = dump->idx;
unsigned long index;
int idx = 0;
int err;
@@ -2427,7 +2422,7 @@ static int devlink_nl_cmd_sb_get_dumpit(struct sk_buff *msg,
devlinks_xa_for_each_registered_get(sock_net(msg->sk), index, devlink) {
devl_lock(devlink);
list_for_each_entry(devlink_sb, &devlink->sb_list, list) {
- if (idx < start) {
+ if (idx < dump->idx) {
idx++;
continue;
}
@@ -2562,7 +2557,6 @@ static int devlink_nl_cmd_sb_pool_get_dumpit(struct sk_buff *msg,
struct devlink_nl_dump_state *dump = devl_dump_state(cb);
struct devlink *devlink;
struct devlink_sb *devlink_sb;
- int start = dump->idx;
unsigned long index;
int idx = 0;
int err = 0;
@@ -2573,8 +2567,8 @@ static int devlink_nl_cmd_sb_pool_get_dumpit(struct sk_buff *msg,
devl_lock(devlink);
list_for_each_entry(devlink_sb, &devlink->sb_list, list) {
- err = __sb_pool_get_dumpit(msg, start, &idx, devlink,
- devlink_sb,
+ err = __sb_pool_get_dumpit(msg, dump->idx, &idx,
+ devlink, devlink_sb,
NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq);
if (err == -EOPNOTSUPP) {
@@ -2778,7 +2772,6 @@ static int devlink_nl_cmd_sb_port_pool_get_dumpit(struct sk_buff *msg,
struct devlink_nl_dump_state *dump = devl_dump_state(cb);
struct devlink *devlink;
struct devlink_sb *devlink_sb;
- int start = dump->idx;
unsigned long index;
int idx = 0;
int err = 0;
@@ -2789,7 +2782,7 @@ static int devlink_nl_cmd_sb_port_pool_get_dumpit(struct sk_buff *msg,
devl_lock(devlink);
list_for_each_entry(devlink_sb, &devlink->sb_list, list) {
- err = __sb_port_pool_get_dumpit(msg, start, &idx,
+ err = __sb_port_pool_get_dumpit(msg, dump->idx, &idx,
devlink, devlink_sb,
NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq);
@@ -3022,7 +3015,6 @@ devlink_nl_cmd_sb_tc_pool_bind_get_dumpit(struct sk_buff *msg,
struct devlink_nl_dump_state *dump = devl_dump_state(cb);
struct devlink *devlink;
struct devlink_sb *devlink_sb;
- int start = dump->idx;
unsigned long index;
int idx = 0;
int err = 0;
@@ -3033,9 +3025,8 @@ devlink_nl_cmd_sb_tc_pool_bind_get_dumpit(struct sk_buff *msg,
devl_lock(devlink);
list_for_each_entry(devlink_sb, &devlink->sb_list, list) {
- err = __sb_tc_pool_bind_get_dumpit(msg, start, &idx,
- devlink,
- devlink_sb,
+ err = __sb_tc_pool_bind_get_dumpit(msg, dump->idx, &idx,
+ devlink, devlink_sb,
NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq);
if (err == -EOPNOTSUPP) {
@@ -4881,13 +4872,12 @@ static int devlink_nl_cmd_selftests_get_dumpit(struct sk_buff *msg,
{
struct devlink_nl_dump_state *dump = devl_dump_state(cb);
struct devlink *devlink;
- int start = dump->idx;
unsigned long index;
int idx = 0;
int err = 0;
devlinks_xa_for_each_registered_get(sock_net(msg->sk), index, devlink) {
- if (idx < start || !devlink->ops->selftest_check)
+ if (idx < dump->idx || !devlink->ops->selftest_check)
goto inc;
devl_lock(devlink);
@@ -5363,7 +5353,6 @@ static int devlink_nl_cmd_param_get_dumpit(struct sk_buff *msg,
struct devlink_nl_dump_state *dump = devl_dump_state(cb);
struct devlink_param_item *param_item;
struct devlink *devlink;
- int start = dump->idx;
unsigned long index;
int idx = 0;
int err = 0;
@@ -5371,7 +5360,7 @@ static int devlink_nl_cmd_param_get_dumpit(struct sk_buff *msg,
devlinks_xa_for_each_registered_get(sock_net(msg->sk), index, devlink) {
devl_lock(devlink);
list_for_each_entry(param_item, &devlink->param_list, list) {
- if (idx < start) {
+ if (idx < dump->idx) {
idx++;
continue;
}
@@ -6107,14 +6096,13 @@ static int devlink_nl_cmd_region_get_dumpit(struct sk_buff *msg,
{
struct devlink_nl_dump_state *dump = devl_dump_state(cb);
struct devlink *devlink;
- int start = dump->idx;
unsigned long index;
int idx = 0;
int err = 0;
devlinks_xa_for_each_registered_get(sock_net(msg->sk), index, devlink) {
err = devlink_nl_cmd_region_get_devlink_dumpit(msg, cb, devlink,
- &idx, start);
+ &idx, dump->idx);
devlink_put(devlink);
if (err)
goto out;
@@ -6759,13 +6747,12 @@ static int devlink_nl_cmd_info_get_dumpit(struct sk_buff *msg,
{
struct devlink_nl_dump_state *dump = devl_dump_state(cb);
struct devlink *devlink;
- int start = dump->idx;
unsigned long index;
int idx = 0;
int err = 0;
devlinks_xa_for_each_registered_get(sock_net(msg->sk), index, devlink) {
- if (idx < start)
+ if (idx < dump->idx)
goto inc;
devl_lock(devlink);
@@ -7930,7 +7917,6 @@ devlink_nl_cmd_health_reporter_get_dumpit(struct sk_buff *msg,
unsigned long index, port_index;
struct devlink_port *port;
struct devlink *devlink;
- int start = dump->idx;
int idx = 0;
int err;
@@ -7938,7 +7924,7 @@ devlink_nl_cmd_health_reporter_get_dumpit(struct sk_buff *msg,
mutex_lock(&devlink->reporters_lock);
list_for_each_entry(reporter, &devlink->reporter_list,
list) {
- if (idx < start) {
+ if (idx < dump->idx) {
idx++;
continue;
}
@@ -7962,7 +7948,7 @@ devlink_nl_cmd_health_reporter_get_dumpit(struct sk_buff *msg,
xa_for_each(&devlink->ports, port_index, port) {
mutex_lock(&port->reporters_lock);
list_for_each_entry(reporter, &port->reporter_list, list) {
- if (idx < start) {
+ if (idx < dump->idx) {
idx++;
continue;
}
@@ -8513,7 +8499,6 @@ static int devlink_nl_cmd_trap_get_dumpit(struct sk_buff *msg,
struct devlink_nl_dump_state *dump = devl_dump_state(cb);
struct devlink_trap_item *trap_item;
struct devlink *devlink;
- int start = dump->idx;
unsigned long index;
int idx = 0;
int err;
@@ -8521,7 +8506,7 @@ static int devlink_nl_cmd_trap_get_dumpit(struct sk_buff *msg,
devlinks_xa_for_each_registered_get(sock_net(msg->sk), index, devlink) {
devl_lock(devlink);
list_for_each_entry(trap_item, &devlink->trap_list, list) {
- if (idx < start) {
+ if (idx < dump->idx) {
idx++;
continue;
}
@@ -8731,7 +8716,6 @@ static int devlink_nl_cmd_trap_group_get_dumpit(struct sk_buff *msg,
struct devlink_trap_group_item *group_item;
u32 portid = NETLINK_CB(cb->skb).portid;
struct devlink *devlink;
- int start = dump->idx;
unsigned long index;
int idx = 0;
int err;
@@ -8740,7 +8724,7 @@ static int devlink_nl_cmd_trap_group_get_dumpit(struct sk_buff *msg,
devl_lock(devlink);
list_for_each_entry(group_item, &devlink->trap_group_list,
list) {
- if (idx < start) {
+ if (idx < dump->idx) {
idx++;
continue;
}
@@ -9036,7 +9020,6 @@ static int devlink_nl_cmd_trap_policer_get_dumpit(struct sk_buff *msg,
struct devlink_trap_policer_item *policer_item;
u32 portid = NETLINK_CB(cb->skb).portid;
struct devlink *devlink;
- int start = dump->idx;
unsigned long index;
int idx = 0;
int err;
@@ -9045,7 +9028,7 @@ static int devlink_nl_cmd_trap_policer_get_dumpit(struct sk_buff *msg,
devl_lock(devlink);
list_for_each_entry(policer_item, &devlink->trap_policer_list,
list) {
- if (idx < start) {
+ if (idx < dump->idx) {
idx++;
continue;
}
--
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 ` Jakub Kicinski [this message]
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 ` [PATCH net-next 12/14] devlink: uniformly take the devlink instance lock in the dump loop Jakub Kicinski
2023-01-04 15:52 ` 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-7-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).