stuartl/linux-mainline
1
0
Fork 0
mirror of https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux synced 2025-09-16 17:47:03 +10:00
Code Issues Releases Wiki Activity

devlink: use generated split ops and remove duplicated commands from small ops

Browse Source 
Do the switch and use generated split ops for get and info_get commands.
Remove those from small ops array.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Link: https://lore.kernel.org/r/20230803111340.1074067-13-jiri@resnulli.us
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jiri Pirko 2023-08-03 13:13:40 +02:00 committed by Jakub Kicinski
parent b2551b1517
commit 6e067d0cab
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/devlink/devl_internal.h
View File

@ -124,7 +124,7 @@ struct devlink_cmd {
devlink_nl_dump_one_func_t *dump_one; devlink_nl_dump_one_func_t *dump_one;
}; };
extern const struct genl_small_ops devlink_nl_small_ops[56]; extern const struct genl_small_ops devlink_nl_small_ops[54];
struct devlink * struct devlink *
devlink_get_from_attrs_lock(struct net *net, struct nlattr **attrs); devlink_get_from_attrs_lock(struct net *net, struct nlattr **attrs);

16
net/devlink/leftover.c
View File

@ -6278,14 +6278,7 @@ static int devlink_nl_cmd_trap_policer_set_doit(struct sk_buff *skb,
return devlink_trap_policer_set(devlink, policer_item, info); return devlink_trap_policer_set(devlink, policer_item, info);
} }
const struct genl_small_ops devlink_nl_small_ops[56] = { const struct genl_small_ops devlink_nl_small_ops[54] = {
{
.cmd = DEVLINK_CMD_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = devlink_nl_get_doit,
.dumpit = devlink_nl_get_dumpit,
/* can be retrieved by unprivileged users */
},
{ {
.cmd = DEVLINK_CMD_PORT_GET, .cmd = DEVLINK_CMD_PORT_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
@ -6533,13 +6526,6 @@ const struct genl_small_ops devlink_nl_small_ops[56] = {
.dumpit = devlink_nl_cmd_region_read_dumpit, .dumpit = devlink_nl_cmd_region_read_dumpit,
.flags = GENL_ADMIN_PERM, .flags = GENL_ADMIN_PERM,
}, },
{
.cmd = DEVLINK_CMD_INFO_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.doit = devlink_nl_info_get_doit,
.dumpit = devlink_nl_info_get_dumpit,
/* can be retrieved by unprivileged users */
},
{ {
.cmd = DEVLINK_CMD_HEALTH_REPORTER_GET, .cmd = DEVLINK_CMD_HEALTH_REPORTER_GET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

2
net/devlink/netlink.c
View File

@ -248,6 +248,8 @@ struct genl_family devlink_nl_family __ro_after_init = {
.module = THIS_MODULE, .module = THIS_MODULE,
.small_ops = devlink_nl_small_ops, .small_ops = devlink_nl_small_ops,
.n_small_ops = ARRAY_SIZE(devlink_nl_small_ops), .n_small_ops = ARRAY_SIZE(devlink_nl_small_ops),
.split_ops = devlink_nl_ops,
.n_split_ops = ARRAY_SIZE(devlink_nl_ops),
.resv_start_op = DEVLINK_CMD_SELFTESTS_RUN + 1, .resv_start_op = DEVLINK_CMD_SELFTESTS_RUN + 1,
.mcgrps = devlink_nl_mcgrps, .mcgrps = devlink_nl_mcgrps,
.n_mcgrps = ARRAY_SIZE(devlink_nl_mcgrps), .n_mcgrps = ARRAY_SIZE(devlink_nl_mcgrps),