* [patch net-next 0/3] devlink: trivial names cleanup
@ 2023-01-31 9:06 Jiri Pirko
2023-01-31 9:06 ` [patch net-next 1/3] devlink: rename devlink_nl_instance_iter_dump() to "dumpit" Jiri Pirko
` (5 more replies)
0 siblings, 6 replies; 14+ messages in thread
From: Jiri Pirko @ 2023-01-31 9:06 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, pabeni, edumazet, jacob.e.keller
From: Jiri Pirko <jiri@nvidia.com>
This is a follow-up to Jakub's devlink code split and dump iteration
helper patchset. No functional changes, just couple of renames to makes
things consistent and perhaps easier to follow.
Jiri Pirko (3):
devlink: rename devlink_nl_instance_iter_dump() to "dumpit"
devlink: remove "gen" from struct devlink_gen_cmd name
devlink: rename and reorder instances of struct devlink_cmd
net/devlink/devl_internal.h | 41 ++++++++++++------------
net/devlink/leftover.c | 64 ++++++++++++++++++-------------------
net/devlink/netlink.c | 42 ++++++++++++------------
3 files changed, 73 insertions(+), 74 deletions(-)
--
2.39.0
^ permalink raw reply [flat|nested] 14+ messages in thread
* [patch net-next 1/3] devlink: rename devlink_nl_instance_iter_dump() to "dumpit"
2023-01-31 9:06 [patch net-next 0/3] devlink: trivial names cleanup Jiri Pirko
@ 2023-01-31 9:06 ` Jiri Pirko
2023-01-31 18:31 ` Jacob Keller
2023-01-31 9:06 ` [patch net-next 2/3] devlink: remove "gen" from struct devlink_gen_cmd name Jiri Pirko
` (4 subsequent siblings)
5 siblings, 1 reply; 14+ messages in thread
From: Jiri Pirko @ 2023-01-31 9:06 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, pabeni, edumazet, jacob.e.keller
From: Jiri Pirko <jiri@nvidia.com>
To have the name of the function consistent with the struct cb name,
rename devlink_nl_instance_iter_dump() to
devlink_nl_instance_iter_dumpit().
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
---
net/devlink/devl_internal.h | 4 ++--
net/devlink/leftover.c | 32 ++++++++++++++++----------------
net/devlink/netlink.c | 4 ++--
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h
index ba161de4120e..dd4366c68b96 100644
--- a/net/devlink/devl_internal.h
+++ b/net/devlink/devl_internal.h
@@ -128,8 +128,8 @@ devlink_get_from_attrs_lock(struct net *net, struct nlattr **attrs);
void devlink_notify_unregister(struct devlink *devlink);
void devlink_notify_register(struct devlink *devlink);
-int devlink_nl_instance_iter_dump(struct sk_buff *msg,
- struct netlink_callback *cb);
+int devlink_nl_instance_iter_dumpit(struct sk_buff *msg,
+ struct netlink_callback *cb);
static inline struct devlink_nl_dump_state *
devlink_dump_state(struct netlink_callback *cb)
diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c
index 92210587d349..1461eec423ff 100644
--- a/net/devlink/leftover.c
+++ b/net/devlink/leftover.c
@@ -8898,14 +8898,14 @@ const struct genl_small_ops devlink_nl_ops[56] = {
.cmd = DEVLINK_CMD_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = devlink_nl_cmd_get_doit,
- .dumpit = devlink_nl_instance_iter_dump,
+ .dumpit = devlink_nl_instance_iter_dumpit,
/* can be retrieved by unprivileged users */
},
{
.cmd = DEVLINK_CMD_PORT_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = devlink_nl_cmd_port_get_doit,
- .dumpit = devlink_nl_instance_iter_dump,
+ .dumpit = devlink_nl_instance_iter_dumpit,
.internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
/* can be retrieved by unprivileged users */
},
@@ -8919,7 +8919,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
{
.cmd = DEVLINK_CMD_RATE_GET,
.doit = devlink_nl_cmd_rate_get_doit,
- .dumpit = devlink_nl_instance_iter_dump,
+ .dumpit = devlink_nl_instance_iter_dumpit,
.internal_flags = DEVLINK_NL_FLAG_NEED_RATE,
/* can be retrieved by unprivileged users */
},
@@ -8967,7 +8967,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
{
.cmd = DEVLINK_CMD_LINECARD_GET,
.doit = devlink_nl_cmd_linecard_get_doit,
- .dumpit = devlink_nl_instance_iter_dump,
+ .dumpit = devlink_nl_instance_iter_dumpit,
.internal_flags = DEVLINK_NL_FLAG_NEED_LINECARD,
/* can be retrieved by unprivileged users */
},
@@ -8981,14 +8981,14 @@ const struct genl_small_ops devlink_nl_ops[56] = {
.cmd = DEVLINK_CMD_SB_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = devlink_nl_cmd_sb_get_doit,
- .dumpit = devlink_nl_instance_iter_dump,
+ .dumpit = devlink_nl_instance_iter_dumpit,
/* can be retrieved by unprivileged users */
},
{
.cmd = DEVLINK_CMD_SB_POOL_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = devlink_nl_cmd_sb_pool_get_doit,
- .dumpit = devlink_nl_instance_iter_dump,
+ .dumpit = devlink_nl_instance_iter_dumpit,
/* can be retrieved by unprivileged users */
},
{
@@ -9001,7 +9001,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
.cmd = DEVLINK_CMD_SB_PORT_POOL_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = devlink_nl_cmd_sb_port_pool_get_doit,
- .dumpit = devlink_nl_instance_iter_dump,
+ .dumpit = devlink_nl_instance_iter_dumpit,
.internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
/* can be retrieved by unprivileged users */
},
@@ -9016,7 +9016,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
.cmd = DEVLINK_CMD_SB_TC_POOL_BIND_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = devlink_nl_cmd_sb_tc_pool_bind_get_doit,
- .dumpit = devlink_nl_instance_iter_dump,
+ .dumpit = devlink_nl_instance_iter_dumpit,
.internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
/* can be retrieved by unprivileged users */
},
@@ -9097,7 +9097,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
.cmd = DEVLINK_CMD_PARAM_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = devlink_nl_cmd_param_get_doit,
- .dumpit = devlink_nl_instance_iter_dump,
+ .dumpit = devlink_nl_instance_iter_dumpit,
/* can be retrieved by unprivileged users */
},
{
@@ -9125,7 +9125,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
.cmd = DEVLINK_CMD_REGION_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = devlink_nl_cmd_region_get_doit,
- .dumpit = devlink_nl_instance_iter_dump,
+ .dumpit = devlink_nl_instance_iter_dumpit,
.flags = GENL_ADMIN_PERM,
},
{
@@ -9151,14 +9151,14 @@ const struct genl_small_ops devlink_nl_ops[56] = {
.cmd = DEVLINK_CMD_INFO_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = devlink_nl_cmd_info_get_doit,
- .dumpit = devlink_nl_instance_iter_dump,
+ .dumpit = devlink_nl_instance_iter_dumpit,
/* can be retrieved by unprivileged users */
},
{
.cmd = DEVLINK_CMD_HEALTH_REPORTER_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = devlink_nl_cmd_health_reporter_get_doit,
- .dumpit = devlink_nl_instance_iter_dump,
+ .dumpit = devlink_nl_instance_iter_dumpit,
.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
/* can be retrieved by unprivileged users */
},
@@ -9213,7 +9213,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
{
.cmd = DEVLINK_CMD_TRAP_GET,
.doit = devlink_nl_cmd_trap_get_doit,
- .dumpit = devlink_nl_instance_iter_dump,
+ .dumpit = devlink_nl_instance_iter_dumpit,
/* can be retrieved by unprivileged users */
},
{
@@ -9224,7 +9224,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
{
.cmd = DEVLINK_CMD_TRAP_GROUP_GET,
.doit = devlink_nl_cmd_trap_group_get_doit,
- .dumpit = devlink_nl_instance_iter_dump,
+ .dumpit = devlink_nl_instance_iter_dumpit,
/* can be retrieved by unprivileged users */
},
{
@@ -9235,7 +9235,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
{
.cmd = DEVLINK_CMD_TRAP_POLICER_GET,
.doit = devlink_nl_cmd_trap_policer_get_doit,
- .dumpit = devlink_nl_instance_iter_dump,
+ .dumpit = devlink_nl_instance_iter_dumpit,
/* can be retrieved by unprivileged users */
},
{
@@ -9246,7 +9246,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
{
.cmd = DEVLINK_CMD_SELFTESTS_GET,
.doit = devlink_nl_cmd_selftests_get_doit,
- .dumpit = devlink_nl_instance_iter_dump,
+ .dumpit = devlink_nl_instance_iter_dumpit,
/* can be retrieved by unprivileged users */
},
{
diff --git a/net/devlink/netlink.c b/net/devlink/netlink.c
index 3f44633af01c..11666edf5cd2 100644
--- a/net/devlink/netlink.c
+++ b/net/devlink/netlink.c
@@ -196,8 +196,8 @@ static const struct devlink_gen_cmd *devl_gen_cmds[] = {
[DEVLINK_CMD_SELFTESTS_GET] = &devl_gen_selftests,
};
-int devlink_nl_instance_iter_dump(struct sk_buff *msg,
- struct netlink_callback *cb)
+int devlink_nl_instance_iter_dumpit(struct sk_buff *msg,
+ struct netlink_callback *cb)
{
const struct genl_dumpit_info *info = genl_dumpit_info(cb);
struct devlink_nl_dump_state *state = devlink_dump_state(cb);
--
2.39.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [patch net-next 2/3] devlink: remove "gen" from struct devlink_gen_cmd name
2023-01-31 9:06 [patch net-next 0/3] devlink: trivial names cleanup Jiri Pirko
2023-01-31 9:06 ` [patch net-next 1/3] devlink: rename devlink_nl_instance_iter_dump() to "dumpit" Jiri Pirko
@ 2023-01-31 9:06 ` Jiri Pirko
2023-01-31 11:51 ` Leon Romanovsky
2023-01-31 9:06 ` [patch net-next 3/3] devlink: rename and reorder instances of struct devlink_cmd Jiri Pirko
` (3 subsequent siblings)
5 siblings, 1 reply; 14+ messages in thread
From: Jiri Pirko @ 2023-01-31 9:06 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, pabeni, edumazet, jacob.e.keller
From: Jiri Pirko <jiri@nvidia.com>
No need to have "gen" inside name of the structure for devlink commands.
Remove it.
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
---
net/devlink/devl_internal.h | 36 ++++++++++++++++++------------------
net/devlink/leftover.c | 32 ++++++++++++++++----------------
net/devlink/netlink.c | 4 ++--
3 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h
index dd4366c68b96..3910db5547fe 100644
--- a/net/devlink/devl_internal.h
+++ b/net/devlink/devl_internal.h
@@ -115,7 +115,7 @@ struct devlink_nl_dump_state {
};
};
-struct devlink_gen_cmd {
+struct devlink_cmd {
int (*dump_one)(struct sk_buff *msg, struct devlink *devlink,
struct netlink_callback *cb);
};
@@ -139,22 +139,22 @@ devlink_dump_state(struct netlink_callback *cb)
return (struct devlink_nl_dump_state *)cb->ctx;
}
-/* gen cmds */
-extern const struct devlink_gen_cmd devl_gen_inst;
-extern const struct devlink_gen_cmd devl_gen_port;
-extern const struct devlink_gen_cmd devl_gen_sb;
-extern const struct devlink_gen_cmd devl_gen_sb_pool;
-extern const struct devlink_gen_cmd devl_gen_sb_port_pool;
-extern const struct devlink_gen_cmd devl_gen_sb_tc_pool_bind;
-extern const struct devlink_gen_cmd devl_gen_selftests;
-extern const struct devlink_gen_cmd devl_gen_param;
-extern const struct devlink_gen_cmd devl_gen_region;
-extern const struct devlink_gen_cmd devl_gen_info;
-extern const struct devlink_gen_cmd devl_gen_health_reporter;
-extern const struct devlink_gen_cmd devl_gen_trap;
-extern const struct devlink_gen_cmd devl_gen_trap_group;
-extern const struct devlink_gen_cmd devl_gen_trap_policer;
-extern const struct devlink_gen_cmd devl_gen_linecard;
+/* Commands */
+extern const struct devlink_cmd devl_gen_inst;
+extern const struct devlink_cmd devl_gen_port;
+extern const struct devlink_cmd devl_gen_sb;
+extern const struct devlink_cmd devl_gen_sb_pool;
+extern const struct devlink_cmd devl_gen_sb_port_pool;
+extern const struct devlink_cmd devl_gen_sb_tc_pool_bind;
+extern const struct devlink_cmd devl_gen_selftests;
+extern const struct devlink_cmd devl_gen_param;
+extern const struct devlink_cmd devl_gen_region;
+extern const struct devlink_cmd devl_gen_info;
+extern const struct devlink_cmd devl_gen_health_reporter;
+extern const struct devlink_cmd devl_gen_trap;
+extern const struct devlink_cmd devl_gen_trap_group;
+extern const struct devlink_cmd devl_gen_trap_policer;
+extern const struct devlink_cmd devl_gen_linecard;
/* Ports */
int devlink_port_netdevice_event(struct notifier_block *nb,
@@ -182,7 +182,7 @@ struct devlink_linecard *
devlink_linecard_get_from_info(struct devlink *devlink, struct genl_info *info);
/* Rates */
-extern const struct devlink_gen_cmd devl_gen_rate_get;
+extern const struct devlink_cmd devl_gen_rate_get;
struct devlink_rate *
devlink_rate_get_from_info(struct devlink *devlink, struct genl_info *info);
diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c
index 1461eec423ff..16cb5975de1a 100644
--- a/net/devlink/leftover.c
+++ b/net/devlink/leftover.c
@@ -1236,7 +1236,7 @@ devlink_nl_cmd_rate_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
return err;
}
-const struct devlink_gen_cmd devl_gen_rate_get = {
+const struct devlink_cmd devl_gen_rate_get = {
.dump_one = devlink_nl_cmd_rate_get_dump_one,
};
@@ -1303,7 +1303,7 @@ devlink_nl_cmd_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
cb->nlh->nlmsg_seq, NLM_F_MULTI);
}
-const struct devlink_gen_cmd devl_gen_inst = {
+const struct devlink_cmd devl_gen_inst = {
.dump_one = devlink_nl_cmd_get_dump_one,
};
@@ -1359,7 +1359,7 @@ devlink_nl_cmd_port_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
return err;
}
-const struct devlink_gen_cmd devl_gen_port = {
+const struct devlink_cmd devl_gen_port = {
.dump_one = devlink_nl_cmd_port_get_dump_one,
};
@@ -2137,7 +2137,7 @@ static int devlink_nl_cmd_linecard_get_dump_one(struct sk_buff *msg,
return err;
}
-const struct devlink_gen_cmd devl_gen_linecard = {
+const struct devlink_cmd devl_gen_linecard = {
.dump_one = devlink_nl_cmd_linecard_get_dump_one,
};
@@ -2392,7 +2392,7 @@ devlink_nl_cmd_sb_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
return err;
}
-const struct devlink_gen_cmd devl_gen_sb = {
+const struct devlink_cmd devl_gen_sb = {
.dump_one = devlink_nl_cmd_sb_get_dump_one,
};
@@ -2530,7 +2530,7 @@ devlink_nl_cmd_sb_pool_get_dump_one(struct sk_buff *msg,
return err;
}
-const struct devlink_gen_cmd devl_gen_sb_pool = {
+const struct devlink_cmd devl_gen_sb_pool = {
.dump_one = devlink_nl_cmd_sb_pool_get_dump_one,
};
@@ -2738,7 +2738,7 @@ devlink_nl_cmd_sb_port_pool_get_dump_one(struct sk_buff *msg,
return err;
}
-const struct devlink_gen_cmd devl_gen_sb_port_pool = {
+const struct devlink_cmd devl_gen_sb_port_pool = {
.dump_one = devlink_nl_cmd_sb_port_pool_get_dump_one,
};
@@ -2973,7 +2973,7 @@ devlink_nl_cmd_sb_tc_pool_bind_get_dump_one(struct sk_buff *msg,
return err;
}
-const struct devlink_gen_cmd devl_gen_sb_tc_pool_bind = {
+const struct devlink_cmd devl_gen_sb_tc_pool_bind = {
.dump_one = devlink_nl_cmd_sb_tc_pool_bind_get_dump_one,
};
@@ -4785,7 +4785,7 @@ devlink_nl_cmd_selftests_get_dump_one(struct sk_buff *msg,
cb->extack);
}
-const struct devlink_gen_cmd devl_gen_selftests = {
+const struct devlink_cmd devl_gen_selftests = {
.dump_one = devlink_nl_cmd_selftests_get_dump_one,
};
@@ -5271,7 +5271,7 @@ devlink_nl_cmd_param_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
return err;
}
-const struct devlink_gen_cmd devl_gen_param = {
+const struct devlink_cmd devl_gen_param = {
.dump_one = devlink_nl_cmd_param_get_dump_one,
};
@@ -5978,7 +5978,7 @@ devlink_nl_cmd_region_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
return 0;
}
-const struct devlink_gen_cmd devl_gen_region = {
+const struct devlink_cmd devl_gen_region = {
.dump_one = devlink_nl_cmd_region_get_dump_one,
};
@@ -6625,7 +6625,7 @@ devlink_nl_cmd_info_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
return err;
}
-const struct devlink_gen_cmd devl_gen_info = {
+const struct devlink_cmd devl_gen_info = {
.dump_one = devlink_nl_cmd_info_get_dump_one,
};
@@ -7793,7 +7793,7 @@ devlink_nl_cmd_health_reporter_get_dump_one(struct sk_buff *msg,
return 0;
}
-const struct devlink_gen_cmd devl_gen_health_reporter = {
+const struct devlink_cmd devl_gen_health_reporter = {
.dump_one = devlink_nl_cmd_health_reporter_get_dump_one,
};
@@ -8311,7 +8311,7 @@ devlink_nl_cmd_trap_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
return err;
}
-const struct devlink_gen_cmd devl_gen_trap = {
+const struct devlink_cmd devl_gen_trap = {
.dump_one = devlink_nl_cmd_trap_get_dump_one,
};
@@ -8524,7 +8524,7 @@ devlink_nl_cmd_trap_group_get_dump_one(struct sk_buff *msg,
return err;
}
-const struct devlink_gen_cmd devl_gen_trap_group = {
+const struct devlink_cmd devl_gen_trap_group = {
.dump_one = devlink_nl_cmd_trap_group_get_dump_one,
};
@@ -8817,7 +8817,7 @@ devlink_nl_cmd_trap_policer_get_dump_one(struct sk_buff *msg,
return err;
}
-const struct devlink_gen_cmd devl_gen_trap_policer = {
+const struct devlink_cmd devl_gen_trap_policer = {
.dump_one = devlink_nl_cmd_trap_policer_get_dump_one,
};
diff --git a/net/devlink/netlink.c b/net/devlink/netlink.c
index 11666edf5cd2..33ed3984f3cb 100644
--- a/net/devlink/netlink.c
+++ b/net/devlink/netlink.c
@@ -177,7 +177,7 @@ static void devlink_nl_post_doit(const struct genl_split_ops *ops,
devlink_put(devlink);
}
-static const struct devlink_gen_cmd *devl_gen_cmds[] = {
+static const struct devlink_cmd *devl_gen_cmds[] = {
[DEVLINK_CMD_GET] = &devl_gen_inst,
[DEVLINK_CMD_PORT_GET] = &devl_gen_port,
[DEVLINK_CMD_SB_GET] = &devl_gen_sb,
@@ -201,7 +201,7 @@ int devlink_nl_instance_iter_dumpit(struct sk_buff *msg,
{
const struct genl_dumpit_info *info = genl_dumpit_info(cb);
struct devlink_nl_dump_state *state = devlink_dump_state(cb);
- const struct devlink_gen_cmd *cmd;
+ const struct devlink_cmd *cmd;
struct devlink *devlink;
int err = 0;
--
2.39.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [patch net-next 3/3] devlink: rename and reorder instances of struct devlink_cmd
2023-01-31 9:06 [patch net-next 0/3] devlink: trivial names cleanup Jiri Pirko
2023-01-31 9:06 ` [patch net-next 1/3] devlink: rename devlink_nl_instance_iter_dump() to "dumpit" Jiri Pirko
2023-01-31 9:06 ` [patch net-next 2/3] devlink: remove "gen" from struct devlink_gen_cmd name Jiri Pirko
@ 2023-01-31 9:06 ` Jiri Pirko
2023-01-31 11:58 ` [patch net-next 0/3] devlink: trivial names cleanup Leon Romanovsky
` (2 subsequent siblings)
5 siblings, 0 replies; 14+ messages in thread
From: Jiri Pirko @ 2023-01-31 9:06 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, pabeni, edumazet, jacob.e.keller
From: Jiri Pirko <jiri@nvidia.com>
In order to maintain naming consistency, rename and reorder all usages
of struct struct devlink_cmd in the following way:
1) Remove "gen" and replace it with "cmd" to match the struct name
2) Order devl_cmds[] and the header file to match the order
of enum devlink_command
3) Move devl_cmd_rate_get among the peers
4) Remove "inst" for DEVLINK_CMD_GET
5) Add "_get" suffix to all to match DEVLINK_CMD_*_GET (only rate had it
done correctly)
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
---
net/devlink/devl_internal.h | 33 ++++++++++++++++-----------------
net/devlink/leftover.c | 32 ++++++++++++++++----------------
net/devlink/netlink.c | 36 ++++++++++++++++++------------------
3 files changed, 50 insertions(+), 51 deletions(-)
diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h
index 3910db5547fe..bdd7ad25c7e8 100644
--- a/net/devlink/devl_internal.h
+++ b/net/devlink/devl_internal.h
@@ -140,21 +140,22 @@ devlink_dump_state(struct netlink_callback *cb)
}
/* Commands */
-extern const struct devlink_cmd devl_gen_inst;
-extern const struct devlink_cmd devl_gen_port;
-extern const struct devlink_cmd devl_gen_sb;
-extern const struct devlink_cmd devl_gen_sb_pool;
-extern const struct devlink_cmd devl_gen_sb_port_pool;
-extern const struct devlink_cmd devl_gen_sb_tc_pool_bind;
-extern const struct devlink_cmd devl_gen_selftests;
-extern const struct devlink_cmd devl_gen_param;
-extern const struct devlink_cmd devl_gen_region;
-extern const struct devlink_cmd devl_gen_info;
-extern const struct devlink_cmd devl_gen_health_reporter;
-extern const struct devlink_cmd devl_gen_trap;
-extern const struct devlink_cmd devl_gen_trap_group;
-extern const struct devlink_cmd devl_gen_trap_policer;
-extern const struct devlink_cmd devl_gen_linecard;
+extern const struct devlink_cmd devl_cmd_get;
+extern const struct devlink_cmd devl_cmd_port_get;
+extern const struct devlink_cmd devl_cmd_sb_get;
+extern const struct devlink_cmd devl_cmd_sb_pool_get;
+extern const struct devlink_cmd devl_cmd_sb_port_pool_get;
+extern const struct devlink_cmd devl_cmd_sb_tc_pool_bind_get;
+extern const struct devlink_cmd devl_cmd_param_get;
+extern const struct devlink_cmd devl_cmd_region_get;
+extern const struct devlink_cmd devl_cmd_info_get;
+extern const struct devlink_cmd devl_cmd_health_reporter_get;
+extern const struct devlink_cmd devl_cmd_trap_get;
+extern const struct devlink_cmd devl_cmd_trap_group_get;
+extern const struct devlink_cmd devl_cmd_trap_policer_get;
+extern const struct devlink_cmd devl_cmd_rate_get;
+extern const struct devlink_cmd devl_cmd_linecard_get;
+extern const struct devlink_cmd devl_cmd_selftests_get;
/* Ports */
int devlink_port_netdevice_event(struct notifier_block *nb,
@@ -182,8 +183,6 @@ struct devlink_linecard *
devlink_linecard_get_from_info(struct devlink *devlink, struct genl_info *info);
/* Rates */
-extern const struct devlink_cmd devl_gen_rate_get;
-
struct devlink_rate *
devlink_rate_get_from_info(struct devlink *devlink, struct genl_info *info);
struct devlink_rate *
diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c
index 16cb5975de1a..056d9ca14a3d 100644
--- a/net/devlink/leftover.c
+++ b/net/devlink/leftover.c
@@ -1236,7 +1236,7 @@ devlink_nl_cmd_rate_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
return err;
}
-const struct devlink_cmd devl_gen_rate_get = {
+const struct devlink_cmd devl_cmd_rate_get = {
.dump_one = devlink_nl_cmd_rate_get_dump_one,
};
@@ -1303,7 +1303,7 @@ devlink_nl_cmd_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
cb->nlh->nlmsg_seq, NLM_F_MULTI);
}
-const struct devlink_cmd devl_gen_inst = {
+const struct devlink_cmd devl_cmd_get = {
.dump_one = devlink_nl_cmd_get_dump_one,
};
@@ -1359,7 +1359,7 @@ devlink_nl_cmd_port_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
return err;
}
-const struct devlink_cmd devl_gen_port = {
+const struct devlink_cmd devl_cmd_port_get = {
.dump_one = devlink_nl_cmd_port_get_dump_one,
};
@@ -2137,7 +2137,7 @@ static int devlink_nl_cmd_linecard_get_dump_one(struct sk_buff *msg,
return err;
}
-const struct devlink_cmd devl_gen_linecard = {
+const struct devlink_cmd devl_cmd_linecard_get = {
.dump_one = devlink_nl_cmd_linecard_get_dump_one,
};
@@ -2392,7 +2392,7 @@ devlink_nl_cmd_sb_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
return err;
}
-const struct devlink_cmd devl_gen_sb = {
+const struct devlink_cmd devl_cmd_sb_get = {
.dump_one = devlink_nl_cmd_sb_get_dump_one,
};
@@ -2530,7 +2530,7 @@ devlink_nl_cmd_sb_pool_get_dump_one(struct sk_buff *msg,
return err;
}
-const struct devlink_cmd devl_gen_sb_pool = {
+const struct devlink_cmd devl_cmd_sb_pool_get = {
.dump_one = devlink_nl_cmd_sb_pool_get_dump_one,
};
@@ -2738,7 +2738,7 @@ devlink_nl_cmd_sb_port_pool_get_dump_one(struct sk_buff *msg,
return err;
}
-const struct devlink_cmd devl_gen_sb_port_pool = {
+const struct devlink_cmd devl_cmd_sb_port_pool_get = {
.dump_one = devlink_nl_cmd_sb_port_pool_get_dump_one,
};
@@ -2973,7 +2973,7 @@ devlink_nl_cmd_sb_tc_pool_bind_get_dump_one(struct sk_buff *msg,
return err;
}
-const struct devlink_cmd devl_gen_sb_tc_pool_bind = {
+const struct devlink_cmd devl_cmd_sb_tc_pool_bind_get = {
.dump_one = devlink_nl_cmd_sb_tc_pool_bind_get_dump_one,
};
@@ -4785,7 +4785,7 @@ devlink_nl_cmd_selftests_get_dump_one(struct sk_buff *msg,
cb->extack);
}
-const struct devlink_cmd devl_gen_selftests = {
+const struct devlink_cmd devl_cmd_selftests_get = {
.dump_one = devlink_nl_cmd_selftests_get_dump_one,
};
@@ -5271,7 +5271,7 @@ devlink_nl_cmd_param_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
return err;
}
-const struct devlink_cmd devl_gen_param = {
+const struct devlink_cmd devl_cmd_param_get = {
.dump_one = devlink_nl_cmd_param_get_dump_one,
};
@@ -5978,7 +5978,7 @@ devlink_nl_cmd_region_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
return 0;
}
-const struct devlink_cmd devl_gen_region = {
+const struct devlink_cmd devl_cmd_region_get = {
.dump_one = devlink_nl_cmd_region_get_dump_one,
};
@@ -6625,7 +6625,7 @@ devlink_nl_cmd_info_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
return err;
}
-const struct devlink_cmd devl_gen_info = {
+const struct devlink_cmd devl_cmd_info_get = {
.dump_one = devlink_nl_cmd_info_get_dump_one,
};
@@ -7793,7 +7793,7 @@ devlink_nl_cmd_health_reporter_get_dump_one(struct sk_buff *msg,
return 0;
}
-const struct devlink_cmd devl_gen_health_reporter = {
+const struct devlink_cmd devl_cmd_health_reporter_get = {
.dump_one = devlink_nl_cmd_health_reporter_get_dump_one,
};
@@ -8311,7 +8311,7 @@ devlink_nl_cmd_trap_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
return err;
}
-const struct devlink_cmd devl_gen_trap = {
+const struct devlink_cmd devl_cmd_trap_get = {
.dump_one = devlink_nl_cmd_trap_get_dump_one,
};
@@ -8524,7 +8524,7 @@ devlink_nl_cmd_trap_group_get_dump_one(struct sk_buff *msg,
return err;
}
-const struct devlink_cmd devl_gen_trap_group = {
+const struct devlink_cmd devl_cmd_trap_group_get = {
.dump_one = devlink_nl_cmd_trap_group_get_dump_one,
};
@@ -8817,7 +8817,7 @@ devlink_nl_cmd_trap_policer_get_dump_one(struct sk_buff *msg,
return err;
}
-const struct devlink_cmd devl_gen_trap_policer = {
+const struct devlink_cmd devl_cmd_trap_policer_get = {
.dump_one = devlink_nl_cmd_trap_policer_get_dump_one,
};
diff --git a/net/devlink/netlink.c b/net/devlink/netlink.c
index 33ed3984f3cb..7a332eb70f70 100644
--- a/net/devlink/netlink.c
+++ b/net/devlink/netlink.c
@@ -177,23 +177,23 @@ static void devlink_nl_post_doit(const struct genl_split_ops *ops,
devlink_put(devlink);
}
-static const struct devlink_cmd *devl_gen_cmds[] = {
- [DEVLINK_CMD_GET] = &devl_gen_inst,
- [DEVLINK_CMD_PORT_GET] = &devl_gen_port,
- [DEVLINK_CMD_SB_GET] = &devl_gen_sb,
- [DEVLINK_CMD_SB_POOL_GET] = &devl_gen_sb_pool,
- [DEVLINK_CMD_SB_PORT_POOL_GET] = &devl_gen_sb_port_pool,
- [DEVLINK_CMD_SB_TC_POOL_BIND_GET] = &devl_gen_sb_tc_pool_bind,
- [DEVLINK_CMD_PARAM_GET] = &devl_gen_param,
- [DEVLINK_CMD_REGION_GET] = &devl_gen_region,
- [DEVLINK_CMD_INFO_GET] = &devl_gen_info,
- [DEVLINK_CMD_HEALTH_REPORTER_GET] = &devl_gen_health_reporter,
- [DEVLINK_CMD_RATE_GET] = &devl_gen_rate_get,
- [DEVLINK_CMD_TRAP_GET] = &devl_gen_trap,
- [DEVLINK_CMD_TRAP_GROUP_GET] = &devl_gen_trap_group,
- [DEVLINK_CMD_TRAP_POLICER_GET] = &devl_gen_trap_policer,
- [DEVLINK_CMD_LINECARD_GET] = &devl_gen_linecard,
- [DEVLINK_CMD_SELFTESTS_GET] = &devl_gen_selftests,
+static const struct devlink_cmd *devl_cmds[] = {
+ [DEVLINK_CMD_GET] = &devl_cmd_get,
+ [DEVLINK_CMD_PORT_GET] = &devl_cmd_port_get,
+ [DEVLINK_CMD_SB_GET] = &devl_cmd_sb_get,
+ [DEVLINK_CMD_SB_POOL_GET] = &devl_cmd_sb_pool_get,
+ [DEVLINK_CMD_SB_PORT_POOL_GET] = &devl_cmd_sb_port_pool_get,
+ [DEVLINK_CMD_SB_TC_POOL_BIND_GET] = &devl_cmd_sb_tc_pool_bind_get,
+ [DEVLINK_CMD_PARAM_GET] = &devl_cmd_param_get,
+ [DEVLINK_CMD_REGION_GET] = &devl_cmd_region_get,
+ [DEVLINK_CMD_INFO_GET] = &devl_cmd_info_get,
+ [DEVLINK_CMD_HEALTH_REPORTER_GET] = &devl_cmd_health_reporter_get,
+ [DEVLINK_CMD_TRAP_GET] = &devl_cmd_trap_get,
+ [DEVLINK_CMD_TRAP_GROUP_GET] = &devl_cmd_trap_group_get,
+ [DEVLINK_CMD_TRAP_POLICER_GET] = &devl_cmd_trap_policer_get,
+ [DEVLINK_CMD_RATE_GET] = &devl_cmd_rate_get,
+ [DEVLINK_CMD_LINECARD_GET] = &devl_cmd_linecard_get,
+ [DEVLINK_CMD_SELFTESTS_GET] = &devl_cmd_selftests_get,
};
int devlink_nl_instance_iter_dumpit(struct sk_buff *msg,
@@ -205,7 +205,7 @@ int devlink_nl_instance_iter_dumpit(struct sk_buff *msg,
struct devlink *devlink;
int err = 0;
- cmd = devl_gen_cmds[info->op.cmd];
+ cmd = devl_cmds[info->op.cmd];
while ((devlink = devlinks_xa_find_get(sock_net(msg->sk),
&state->instance))) {
--
2.39.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [patch net-next 2/3] devlink: remove "gen" from struct devlink_gen_cmd name
2023-01-31 9:06 ` [patch net-next 2/3] devlink: remove "gen" from struct devlink_gen_cmd name Jiri Pirko
@ 2023-01-31 11:51 ` Leon Romanovsky
2023-01-31 11:54 ` Jiri Pirko
0 siblings, 1 reply; 14+ messages in thread
From: Leon Romanovsky @ 2023-01-31 11:51 UTC (permalink / raw)
To: Jiri Pirko; +Cc: netdev, davem, kuba, pabeni, edumazet, jacob.e.keller
On Tue, Jan 31, 2023 at 10:06:12AM +0100, Jiri Pirko wrote:
> From: Jiri Pirko <jiri@nvidia.com>
>
> No need to have "gen" inside name of the structure for devlink commands.
> Remove it.
And what about devl_gen_* names? Should they be renamed too?
Thanks
>
> Signed-off-by: Jiri Pirko <jiri@nvidia.com>
> ---
> net/devlink/devl_internal.h | 36 ++++++++++++++++++------------------
> net/devlink/leftover.c | 32 ++++++++++++++++----------------
> net/devlink/netlink.c | 4 ++--
> 3 files changed, 36 insertions(+), 36 deletions(-)
>
> diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h
> index dd4366c68b96..3910db5547fe 100644
> --- a/net/devlink/devl_internal.h
> +++ b/net/devlink/devl_internal.h
> @@ -115,7 +115,7 @@ struct devlink_nl_dump_state {
> };
> };
>
> -struct devlink_gen_cmd {
> +struct devlink_cmd {
> int (*dump_one)(struct sk_buff *msg, struct devlink *devlink,
> struct netlink_callback *cb);
> };
> @@ -139,22 +139,22 @@ devlink_dump_state(struct netlink_callback *cb)
> return (struct devlink_nl_dump_state *)cb->ctx;
> }
>
> -/* gen cmds */
> -extern const struct devlink_gen_cmd devl_gen_inst;
> -extern const struct devlink_gen_cmd devl_gen_port;
> -extern const struct devlink_gen_cmd devl_gen_sb;
> -extern const struct devlink_gen_cmd devl_gen_sb_pool;
> -extern const struct devlink_gen_cmd devl_gen_sb_port_pool;
> -extern const struct devlink_gen_cmd devl_gen_sb_tc_pool_bind;
> -extern const struct devlink_gen_cmd devl_gen_selftests;
> -extern const struct devlink_gen_cmd devl_gen_param;
> -extern const struct devlink_gen_cmd devl_gen_region;
> -extern const struct devlink_gen_cmd devl_gen_info;
> -extern const struct devlink_gen_cmd devl_gen_health_reporter;
> -extern const struct devlink_gen_cmd devl_gen_trap;
> -extern const struct devlink_gen_cmd devl_gen_trap_group;
> -extern const struct devlink_gen_cmd devl_gen_trap_policer;
> -extern const struct devlink_gen_cmd devl_gen_linecard;
> +/* Commands */
> +extern const struct devlink_cmd devl_gen_inst;
> +extern const struct devlink_cmd devl_gen_port;
> +extern const struct devlink_cmd devl_gen_sb;
> +extern const struct devlink_cmd devl_gen_sb_pool;
> +extern const struct devlink_cmd devl_gen_sb_port_pool;
> +extern const struct devlink_cmd devl_gen_sb_tc_pool_bind;
> +extern const struct devlink_cmd devl_gen_selftests;
> +extern const struct devlink_cmd devl_gen_param;
> +extern const struct devlink_cmd devl_gen_region;
> +extern const struct devlink_cmd devl_gen_info;
> +extern const struct devlink_cmd devl_gen_health_reporter;
> +extern const struct devlink_cmd devl_gen_trap;
> +extern const struct devlink_cmd devl_gen_trap_group;
> +extern const struct devlink_cmd devl_gen_trap_policer;
> +extern const struct devlink_cmd devl_gen_linecard;
>
> /* Ports */
> int devlink_port_netdevice_event(struct notifier_block *nb,
> @@ -182,7 +182,7 @@ struct devlink_linecard *
> devlink_linecard_get_from_info(struct devlink *devlink, struct genl_info *info);
>
> /* Rates */
> -extern const struct devlink_gen_cmd devl_gen_rate_get;
> +extern const struct devlink_cmd devl_gen_rate_get;
>
> struct devlink_rate *
> devlink_rate_get_from_info(struct devlink *devlink, struct genl_info *info);
> diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c
> index 1461eec423ff..16cb5975de1a 100644
> --- a/net/devlink/leftover.c
> +++ b/net/devlink/leftover.c
> @@ -1236,7 +1236,7 @@ devlink_nl_cmd_rate_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
> return err;
> }
>
> -const struct devlink_gen_cmd devl_gen_rate_get = {
> +const struct devlink_cmd devl_gen_rate_get = {
> .dump_one = devlink_nl_cmd_rate_get_dump_one,
> };
>
> @@ -1303,7 +1303,7 @@ devlink_nl_cmd_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
> cb->nlh->nlmsg_seq, NLM_F_MULTI);
> }
>
> -const struct devlink_gen_cmd devl_gen_inst = {
> +const struct devlink_cmd devl_gen_inst = {
> .dump_one = devlink_nl_cmd_get_dump_one,
> };
>
> @@ -1359,7 +1359,7 @@ devlink_nl_cmd_port_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
> return err;
> }
>
> -const struct devlink_gen_cmd devl_gen_port = {
> +const struct devlink_cmd devl_gen_port = {
> .dump_one = devlink_nl_cmd_port_get_dump_one,
> };
>
> @@ -2137,7 +2137,7 @@ static int devlink_nl_cmd_linecard_get_dump_one(struct sk_buff *msg,
> return err;
> }
>
> -const struct devlink_gen_cmd devl_gen_linecard = {
> +const struct devlink_cmd devl_gen_linecard = {
> .dump_one = devlink_nl_cmd_linecard_get_dump_one,
> };
>
> @@ -2392,7 +2392,7 @@ devlink_nl_cmd_sb_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
> return err;
> }
>
> -const struct devlink_gen_cmd devl_gen_sb = {
> +const struct devlink_cmd devl_gen_sb = {
> .dump_one = devlink_nl_cmd_sb_get_dump_one,
> };
>
> @@ -2530,7 +2530,7 @@ devlink_nl_cmd_sb_pool_get_dump_one(struct sk_buff *msg,
> return err;
> }
>
> -const struct devlink_gen_cmd devl_gen_sb_pool = {
> +const struct devlink_cmd devl_gen_sb_pool = {
> .dump_one = devlink_nl_cmd_sb_pool_get_dump_one,
> };
>
> @@ -2738,7 +2738,7 @@ devlink_nl_cmd_sb_port_pool_get_dump_one(struct sk_buff *msg,
> return err;
> }
>
> -const struct devlink_gen_cmd devl_gen_sb_port_pool = {
> +const struct devlink_cmd devl_gen_sb_port_pool = {
> .dump_one = devlink_nl_cmd_sb_port_pool_get_dump_one,
> };
>
> @@ -2973,7 +2973,7 @@ devlink_nl_cmd_sb_tc_pool_bind_get_dump_one(struct sk_buff *msg,
> return err;
> }
>
> -const struct devlink_gen_cmd devl_gen_sb_tc_pool_bind = {
> +const struct devlink_cmd devl_gen_sb_tc_pool_bind = {
> .dump_one = devlink_nl_cmd_sb_tc_pool_bind_get_dump_one,
> };
>
> @@ -4785,7 +4785,7 @@ devlink_nl_cmd_selftests_get_dump_one(struct sk_buff *msg,
> cb->extack);
> }
>
> -const struct devlink_gen_cmd devl_gen_selftests = {
> +const struct devlink_cmd devl_gen_selftests = {
> .dump_one = devlink_nl_cmd_selftests_get_dump_one,
> };
>
> @@ -5271,7 +5271,7 @@ devlink_nl_cmd_param_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
> return err;
> }
>
> -const struct devlink_gen_cmd devl_gen_param = {
> +const struct devlink_cmd devl_gen_param = {
> .dump_one = devlink_nl_cmd_param_get_dump_one,
> };
>
> @@ -5978,7 +5978,7 @@ devlink_nl_cmd_region_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
> return 0;
> }
>
> -const struct devlink_gen_cmd devl_gen_region = {
> +const struct devlink_cmd devl_gen_region = {
> .dump_one = devlink_nl_cmd_region_get_dump_one,
> };
>
> @@ -6625,7 +6625,7 @@ devlink_nl_cmd_info_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
> return err;
> }
>
> -const struct devlink_gen_cmd devl_gen_info = {
> +const struct devlink_cmd devl_gen_info = {
> .dump_one = devlink_nl_cmd_info_get_dump_one,
> };
>
> @@ -7793,7 +7793,7 @@ devlink_nl_cmd_health_reporter_get_dump_one(struct sk_buff *msg,
> return 0;
> }
>
> -const struct devlink_gen_cmd devl_gen_health_reporter = {
> +const struct devlink_cmd devl_gen_health_reporter = {
> .dump_one = devlink_nl_cmd_health_reporter_get_dump_one,
> };
>
> @@ -8311,7 +8311,7 @@ devlink_nl_cmd_trap_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
> return err;
> }
>
> -const struct devlink_gen_cmd devl_gen_trap = {
> +const struct devlink_cmd devl_gen_trap = {
> .dump_one = devlink_nl_cmd_trap_get_dump_one,
> };
>
> @@ -8524,7 +8524,7 @@ devlink_nl_cmd_trap_group_get_dump_one(struct sk_buff *msg,
> return err;
> }
>
> -const struct devlink_gen_cmd devl_gen_trap_group = {
> +const struct devlink_cmd devl_gen_trap_group = {
> .dump_one = devlink_nl_cmd_trap_group_get_dump_one,
> };
>
> @@ -8817,7 +8817,7 @@ devlink_nl_cmd_trap_policer_get_dump_one(struct sk_buff *msg,
> return err;
> }
>
> -const struct devlink_gen_cmd devl_gen_trap_policer = {
> +const struct devlink_cmd devl_gen_trap_policer = {
> .dump_one = devlink_nl_cmd_trap_policer_get_dump_one,
> };
>
> diff --git a/net/devlink/netlink.c b/net/devlink/netlink.c
> index 11666edf5cd2..33ed3984f3cb 100644
> --- a/net/devlink/netlink.c
> +++ b/net/devlink/netlink.c
> @@ -177,7 +177,7 @@ static void devlink_nl_post_doit(const struct genl_split_ops *ops,
> devlink_put(devlink);
> }
>
> -static const struct devlink_gen_cmd *devl_gen_cmds[] = {
> +static const struct devlink_cmd *devl_gen_cmds[] = {
> [DEVLINK_CMD_GET] = &devl_gen_inst,
> [DEVLINK_CMD_PORT_GET] = &devl_gen_port,
> [DEVLINK_CMD_SB_GET] = &devl_gen_sb,
> @@ -201,7 +201,7 @@ int devlink_nl_instance_iter_dumpit(struct sk_buff *msg,
> {
> const struct genl_dumpit_info *info = genl_dumpit_info(cb);
> struct devlink_nl_dump_state *state = devlink_dump_state(cb);
> - const struct devlink_gen_cmd *cmd;
> + const struct devlink_cmd *cmd;
> struct devlink *devlink;
> int err = 0;
>
> --
> 2.39.0
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [patch net-next 2/3] devlink: remove "gen" from struct devlink_gen_cmd name
2023-01-31 11:51 ` Leon Romanovsky
@ 2023-01-31 11:54 ` Jiri Pirko
2023-01-31 11:57 ` Leon Romanovsky
0 siblings, 1 reply; 14+ messages in thread
From: Jiri Pirko @ 2023-01-31 11:54 UTC (permalink / raw)
To: Leon Romanovsky; +Cc: netdev, davem, kuba, pabeni, edumazet, jacob.e.keller
Tue, Jan 31, 2023 at 12:51:47PM CET, leon@kernel.org wrote:
>On Tue, Jan 31, 2023 at 10:06:12AM +0100, Jiri Pirko wrote:
>> From: Jiri Pirko <jiri@nvidia.com>
>>
>> No need to have "gen" inside name of the structure for devlink commands.
>> Remove it.
>
>And what about devl_gen_* names? Should they be renamed too?
Yep, see the next patch :)
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [patch net-next 2/3] devlink: remove "gen" from struct devlink_gen_cmd name
2023-01-31 11:54 ` Jiri Pirko
@ 2023-01-31 11:57 ` Leon Romanovsky
2023-01-31 12:08 ` Jiri Pirko
0 siblings, 1 reply; 14+ messages in thread
From: Leon Romanovsky @ 2023-01-31 11:57 UTC (permalink / raw)
To: Jiri Pirko; +Cc: netdev, davem, kuba, pabeni, edumazet, jacob.e.keller
On Tue, Jan 31, 2023 at 12:54:20PM +0100, Jiri Pirko wrote:
> Tue, Jan 31, 2023 at 12:51:47PM CET, leon@kernel.org wrote:
> >On Tue, Jan 31, 2023 at 10:06:12AM +0100, Jiri Pirko wrote:
> >> From: Jiri Pirko <jiri@nvidia.com>
> >>
> >> No need to have "gen" inside name of the structure for devlink commands.
> >> Remove it.
> >
> >And what about devl_gen_* names? Should they be renamed too?
>
> Yep, see the next patch :)
Ohh, I would organize them differently.
Thanks
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [patch net-next 0/3] devlink: trivial names cleanup
2023-01-31 9:06 [patch net-next 0/3] devlink: trivial names cleanup Jiri Pirko
` (2 preceding siblings ...)
2023-01-31 9:06 ` [patch net-next 3/3] devlink: rename and reorder instances of struct devlink_cmd Jiri Pirko
@ 2023-01-31 11:58 ` Leon Romanovsky
2023-01-31 18:32 ` Jacob Keller
2023-02-01 5:18 ` Jakub Kicinski
2023-02-01 19:10 ` patchwork-bot+netdevbpf
5 siblings, 1 reply; 14+ messages in thread
From: Leon Romanovsky @ 2023-01-31 11:58 UTC (permalink / raw)
To: Jiri Pirko; +Cc: netdev, davem, kuba, pabeni, edumazet, jacob.e.keller
On Tue, Jan 31, 2023 at 10:06:10AM +0100, Jiri Pirko wrote:
> From: Jiri Pirko <jiri@nvidia.com>
>
> This is a follow-up to Jakub's devlink code split and dump iteration
> helper patchset. No functional changes, just couple of renames to makes
> things consistent and perhaps easier to follow.
>
> Jiri Pirko (3):
> devlink: rename devlink_nl_instance_iter_dump() to "dumpit"
> devlink: remove "gen" from struct devlink_gen_cmd name
> devlink: rename and reorder instances of struct devlink_cmd
>
Thanks,
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [patch net-next 2/3] devlink: remove "gen" from struct devlink_gen_cmd name
2023-01-31 11:57 ` Leon Romanovsky
@ 2023-01-31 12:08 ` Jiri Pirko
0 siblings, 0 replies; 14+ messages in thread
From: Jiri Pirko @ 2023-01-31 12:08 UTC (permalink / raw)
To: Leon Romanovsky; +Cc: netdev, davem, kuba, pabeni, edumazet, jacob.e.keller
Tue, Jan 31, 2023 at 12:57:56PM CET, leon@kernel.org wrote:
>On Tue, Jan 31, 2023 at 12:54:20PM +0100, Jiri Pirko wrote:
>> Tue, Jan 31, 2023 at 12:51:47PM CET, leon@kernel.org wrote:
>> >On Tue, Jan 31, 2023 at 10:06:12AM +0100, Jiri Pirko wrote:
>> >> From: Jiri Pirko <jiri@nvidia.com>
>> >>
>> >> No need to have "gen" inside name of the structure for devlink commands.
>> >> Remove it.
>> >
>> >And what about devl_gen_* names? Should they be renamed too?
>>
>> Yep, see the next patch :)
>
>Ohh, I would organize them differently.
I wanted to rename the variable names once. That's why I have it in the
next patch.
>
>Thanks
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [patch net-next 1/3] devlink: rename devlink_nl_instance_iter_dump() to "dumpit"
2023-01-31 9:06 ` [patch net-next 1/3] devlink: rename devlink_nl_instance_iter_dump() to "dumpit" Jiri Pirko
@ 2023-01-31 18:31 ` Jacob Keller
0 siblings, 0 replies; 14+ messages in thread
From: Jacob Keller @ 2023-01-31 18:31 UTC (permalink / raw)
To: Jiri Pirko, netdev; +Cc: davem, kuba, pabeni, edumazet
On 1/31/2023 1:06 AM, Jiri Pirko wrote:
> From: Jiri Pirko <jiri@nvidia.com>
>
> To have the name of the function consistent with the struct cb name,
> rename devlink_nl_instance_iter_dump() to
> devlink_nl_instance_iter_dumpit().
>
> Signed-off-by: Jiri Pirko <jiri@nvidia.com>
> ---
It's a few extra characters, but I think i prefer seeing dumpit in the
name vs dump. I understand that the use of "it" comes from the fact that
.do is invalid. However, being consistent seems better to me here.
Easier to search for dumpit as well vs dump.
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Thanks,
Jake
> net/devlink/devl_internal.h | 4 ++--
> net/devlink/leftover.c | 32 ++++++++++++++++----------------
> net/devlink/netlink.c | 4 ++--
> 3 files changed, 20 insertions(+), 20 deletions(-)
>
> diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h
> index ba161de4120e..dd4366c68b96 100644
> --- a/net/devlink/devl_internal.h
> +++ b/net/devlink/devl_internal.h
> @@ -128,8 +128,8 @@ devlink_get_from_attrs_lock(struct net *net, struct nlattr **attrs);
> void devlink_notify_unregister(struct devlink *devlink);
> void devlink_notify_register(struct devlink *devlink);
>
> -int devlink_nl_instance_iter_dump(struct sk_buff *msg,
> - struct netlink_callback *cb);
> +int devlink_nl_instance_iter_dumpit(struct sk_buff *msg,
> + struct netlink_callback *cb);
>
> static inline struct devlink_nl_dump_state *
> devlink_dump_state(struct netlink_callback *cb)
> diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c
> index 92210587d349..1461eec423ff 100644
> --- a/net/devlink/leftover.c
> +++ b/net/devlink/leftover.c
> @@ -8898,14 +8898,14 @@ const struct genl_small_ops devlink_nl_ops[56] = {
> .cmd = DEVLINK_CMD_GET,
> .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
> .doit = devlink_nl_cmd_get_doit,
> - .dumpit = devlink_nl_instance_iter_dump,
> + .dumpit = devlink_nl_instance_iter_dumpit,
> /* can be retrieved by unprivileged users */
> },
> {
> .cmd = DEVLINK_CMD_PORT_GET,
> .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
> .doit = devlink_nl_cmd_port_get_doit,
> - .dumpit = devlink_nl_instance_iter_dump,
> + .dumpit = devlink_nl_instance_iter_dumpit,
> .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
> /* can be retrieved by unprivileged users */
> },
> @@ -8919,7 +8919,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
> {
> .cmd = DEVLINK_CMD_RATE_GET,
> .doit = devlink_nl_cmd_rate_get_doit,
> - .dumpit = devlink_nl_instance_iter_dump,
> + .dumpit = devlink_nl_instance_iter_dumpit,
> .internal_flags = DEVLINK_NL_FLAG_NEED_RATE,
> /* can be retrieved by unprivileged users */
> },
> @@ -8967,7 +8967,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
> {
> .cmd = DEVLINK_CMD_LINECARD_GET,
> .doit = devlink_nl_cmd_linecard_get_doit,
> - .dumpit = devlink_nl_instance_iter_dump,
> + .dumpit = devlink_nl_instance_iter_dumpit,
> .internal_flags = DEVLINK_NL_FLAG_NEED_LINECARD,
> /* can be retrieved by unprivileged users */
> },
> @@ -8981,14 +8981,14 @@ const struct genl_small_ops devlink_nl_ops[56] = {
> .cmd = DEVLINK_CMD_SB_GET,
> .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
> .doit = devlink_nl_cmd_sb_get_doit,
> - .dumpit = devlink_nl_instance_iter_dump,
> + .dumpit = devlink_nl_instance_iter_dumpit,
> /* can be retrieved by unprivileged users */
> },
> {
> .cmd = DEVLINK_CMD_SB_POOL_GET,
> .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
> .doit = devlink_nl_cmd_sb_pool_get_doit,
> - .dumpit = devlink_nl_instance_iter_dump,
> + .dumpit = devlink_nl_instance_iter_dumpit,
> /* can be retrieved by unprivileged users */
> },
> {
> @@ -9001,7 +9001,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
> .cmd = DEVLINK_CMD_SB_PORT_POOL_GET,
> .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
> .doit = devlink_nl_cmd_sb_port_pool_get_doit,
> - .dumpit = devlink_nl_instance_iter_dump,
> + .dumpit = devlink_nl_instance_iter_dumpit,
> .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
> /* can be retrieved by unprivileged users */
> },
> @@ -9016,7 +9016,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
> .cmd = DEVLINK_CMD_SB_TC_POOL_BIND_GET,
> .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
> .doit = devlink_nl_cmd_sb_tc_pool_bind_get_doit,
> - .dumpit = devlink_nl_instance_iter_dump,
> + .dumpit = devlink_nl_instance_iter_dumpit,
> .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
> /* can be retrieved by unprivileged users */
> },
> @@ -9097,7 +9097,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
> .cmd = DEVLINK_CMD_PARAM_GET,
> .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
> .doit = devlink_nl_cmd_param_get_doit,
> - .dumpit = devlink_nl_instance_iter_dump,
> + .dumpit = devlink_nl_instance_iter_dumpit,
> /* can be retrieved by unprivileged users */
> },
> {
> @@ -9125,7 +9125,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
> .cmd = DEVLINK_CMD_REGION_GET,
> .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
> .doit = devlink_nl_cmd_region_get_doit,
> - .dumpit = devlink_nl_instance_iter_dump,
> + .dumpit = devlink_nl_instance_iter_dumpit,
> .flags = GENL_ADMIN_PERM,
> },
> {
> @@ -9151,14 +9151,14 @@ const struct genl_small_ops devlink_nl_ops[56] = {
> .cmd = DEVLINK_CMD_INFO_GET,
> .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
> .doit = devlink_nl_cmd_info_get_doit,
> - .dumpit = devlink_nl_instance_iter_dump,
> + .dumpit = devlink_nl_instance_iter_dumpit,
> /* can be retrieved by unprivileged users */
> },
> {
> .cmd = DEVLINK_CMD_HEALTH_REPORTER_GET,
> .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
> .doit = devlink_nl_cmd_health_reporter_get_doit,
> - .dumpit = devlink_nl_instance_iter_dump,
> + .dumpit = devlink_nl_instance_iter_dumpit,
> .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
> /* can be retrieved by unprivileged users */
> },
> @@ -9213,7 +9213,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
> {
> .cmd = DEVLINK_CMD_TRAP_GET,
> .doit = devlink_nl_cmd_trap_get_doit,
> - .dumpit = devlink_nl_instance_iter_dump,
> + .dumpit = devlink_nl_instance_iter_dumpit,
> /* can be retrieved by unprivileged users */
> },
> {
> @@ -9224,7 +9224,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
> {
> .cmd = DEVLINK_CMD_TRAP_GROUP_GET,
> .doit = devlink_nl_cmd_trap_group_get_doit,
> - .dumpit = devlink_nl_instance_iter_dump,
> + .dumpit = devlink_nl_instance_iter_dumpit,
> /* can be retrieved by unprivileged users */
> },
> {
> @@ -9235,7 +9235,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
> {
> .cmd = DEVLINK_CMD_TRAP_POLICER_GET,
> .doit = devlink_nl_cmd_trap_policer_get_doit,
> - .dumpit = devlink_nl_instance_iter_dump,
> + .dumpit = devlink_nl_instance_iter_dumpit,
> /* can be retrieved by unprivileged users */
> },
> {
> @@ -9246,7 +9246,7 @@ const struct genl_small_ops devlink_nl_ops[56] = {
> {
> .cmd = DEVLINK_CMD_SELFTESTS_GET,
> .doit = devlink_nl_cmd_selftests_get_doit,
> - .dumpit = devlink_nl_instance_iter_dump,
> + .dumpit = devlink_nl_instance_iter_dumpit,
> /* can be retrieved by unprivileged users */
> },
> {
> diff --git a/net/devlink/netlink.c b/net/devlink/netlink.c
> index 3f44633af01c..11666edf5cd2 100644
> --- a/net/devlink/netlink.c
> +++ b/net/devlink/netlink.c
> @@ -196,8 +196,8 @@ static const struct devlink_gen_cmd *devl_gen_cmds[] = {
> [DEVLINK_CMD_SELFTESTS_GET] = &devl_gen_selftests,
> };
>
> -int devlink_nl_instance_iter_dump(struct sk_buff *msg,
> - struct netlink_callback *cb)
> +int devlink_nl_instance_iter_dumpit(struct sk_buff *msg,
> + struct netlink_callback *cb)
> {
> const struct genl_dumpit_info *info = genl_dumpit_info(cb);
> struct devlink_nl_dump_state *state = devlink_dump_state(cb);
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [patch net-next 0/3] devlink: trivial names cleanup
2023-01-31 11:58 ` [patch net-next 0/3] devlink: trivial names cleanup Leon Romanovsky
@ 2023-01-31 18:32 ` Jacob Keller
0 siblings, 0 replies; 14+ messages in thread
From: Jacob Keller @ 2023-01-31 18:32 UTC (permalink / raw)
To: Leon Romanovsky, Jiri Pirko; +Cc: netdev, davem, kuba, pabeni, edumazet
On 1/31/2023 3:58 AM, Leon Romanovsky wrote:
> On Tue, Jan 31, 2023 at 10:06:10AM +0100, Jiri Pirko wrote:
>> From: Jiri Pirko <jiri@nvidia.com>
>>
>> This is a follow-up to Jakub's devlink code split and dump iteration
>> helper patchset. No functional changes, just couple of renames to makes
>> things consistent and perhaps easier to follow.
>>
>> Jiri Pirko (3):
>> devlink: rename devlink_nl_instance_iter_dump() to "dumpit"
>> devlink: remove "gen" from struct devlink_gen_cmd name
>> devlink: rename and reorder instances of struct devlink_cmd
>>
>
> Thanks,
> Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
I like these name cleanups as well.
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Thanks,
Jake
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [patch net-next 0/3] devlink: trivial names cleanup
2023-01-31 9:06 [patch net-next 0/3] devlink: trivial names cleanup Jiri Pirko
` (3 preceding siblings ...)
2023-01-31 11:58 ` [patch net-next 0/3] devlink: trivial names cleanup Leon Romanovsky
@ 2023-02-01 5:18 ` Jakub Kicinski
2023-02-01 12:10 ` Jiri Pirko
2023-02-01 19:10 ` patchwork-bot+netdevbpf
5 siblings, 1 reply; 14+ messages in thread
From: Jakub Kicinski @ 2023-02-01 5:18 UTC (permalink / raw)
To: Jiri Pirko; +Cc: netdev, davem, pabeni, edumazet, jacob.e.keller
On Tue, 31 Jan 2023 10:06:10 +0100 Jiri Pirko wrote:
> This is a follow-up to Jakub's devlink code split and dump iteration
> helper patchset. No functional changes, just couple of renames to makes
> things consistent and perhaps easier to follow.
What's the weakest form of ack?
Seen-by: Jakub Kicinski <kuba@kernel.org>
? ;)
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [patch net-next 0/3] devlink: trivial names cleanup
2023-02-01 5:18 ` Jakub Kicinski
@ 2023-02-01 12:10 ` Jiri Pirko
0 siblings, 0 replies; 14+ messages in thread
From: Jiri Pirko @ 2023-02-01 12:10 UTC (permalink / raw)
To: Jakub Kicinski; +Cc: netdev, davem, pabeni, edumazet, jacob.e.keller
Wed, Feb 01, 2023 at 06:18:13AM CET, kuba@kernel.org wrote:
>On Tue, 31 Jan 2023 10:06:10 +0100 Jiri Pirko wrote:
>> This is a follow-up to Jakub's devlink code split and dump iteration
>> helper patchset. No functional changes, just couple of renames to makes
>> things consistent and perhaps easier to follow.
>
>What's the weakest form of ack?
>
>Seen-by: Jakub Kicinski <kuba@kernel.org>
Thanks for looking :D
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [patch net-next 0/3] devlink: trivial names cleanup
2023-01-31 9:06 [patch net-next 0/3] devlink: trivial names cleanup Jiri Pirko
` (4 preceding siblings ...)
2023-02-01 5:18 ` Jakub Kicinski
@ 2023-02-01 19:10 ` patchwork-bot+netdevbpf
5 siblings, 0 replies; 14+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-02-01 19:10 UTC (permalink / raw)
To: Jiri Pirko; +Cc: netdev, davem, kuba, pabeni, edumazet, jacob.e.keller
Hello:
This series was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:
On Tue, 31 Jan 2023 10:06:10 +0100 you wrote:
> From: Jiri Pirko <jiri@nvidia.com>
>
> This is a follow-up to Jakub's devlink code split and dump iteration
> helper patchset. No functional changes, just couple of renames to makes
> things consistent and perhaps easier to follow.
>
> Jiri Pirko (3):
> devlink: rename devlink_nl_instance_iter_dump() to "dumpit"
> devlink: remove "gen" from struct devlink_gen_cmd name
> devlink: rename and reorder instances of struct devlink_cmd
>
> [...]
Here is the summary with links:
- [net-next,1/3] devlink: rename devlink_nl_instance_iter_dump() to "dumpit"
https://git.kernel.org/netdev/net-next/c/c3a4fd5718ea
- [net-next,2/3] devlink: remove "gen" from struct devlink_gen_cmd name
https://git.kernel.org/netdev/net-next/c/f87445953d4c
- [net-next,3/3] devlink: rename and reorder instances of struct devlink_cmd
https://git.kernel.org/netdev/net-next/c/8589ba4e642a
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2023-02-01 19:10 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-31 9:06 [patch net-next 0/3] devlink: trivial names cleanup Jiri Pirko
2023-01-31 9:06 ` [patch net-next 1/3] devlink: rename devlink_nl_instance_iter_dump() to "dumpit" Jiri Pirko
2023-01-31 18:31 ` Jacob Keller
2023-01-31 9:06 ` [patch net-next 2/3] devlink: remove "gen" from struct devlink_gen_cmd name Jiri Pirko
2023-01-31 11:51 ` Leon Romanovsky
2023-01-31 11:54 ` Jiri Pirko
2023-01-31 11:57 ` Leon Romanovsky
2023-01-31 12:08 ` Jiri Pirko
2023-01-31 9:06 ` [patch net-next 3/3] devlink: rename and reorder instances of struct devlink_cmd Jiri Pirko
2023-01-31 11:58 ` [patch net-next 0/3] devlink: trivial names cleanup Leon Romanovsky
2023-01-31 18:32 ` Jacob Keller
2023-02-01 5:18 ` Jakub Kicinski
2023-02-01 12:10 ` Jiri Pirko
2023-02-01 19:10 ` patchwork-bot+netdevbpf
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).