devlink: rename doit callbacks for per-instance dump commands

Rename netlink doit callback functions for the commands that do
implement per-instance dump to match the generated names that are going
to be introduce in the follow-up patch.

Note that the function prototypes are temporary until the generated ones
will replace them in a follow-up patch.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Acked-by: Jakub Kicinski <kuba@kernel.org>
Link: https://lore.kernel.org/r/20230811155714.1736405-5-jiri@resnulli.us
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/devlink/dev.c b/net/devlink/dev.c
index 5dfba22..167fe61 100644 (file)
--- a/net/devlink/dev.c
+++ b/net/devlink/dev.c
@@ -1206,8 +1206,7 @@ err_cancel_msg:
        return err;
 }
 
-int devlink_nl_cmd_selftests_get_doit(struct sk_buff *skb,
-                                     struct genl_info *info)
+int devlink_nl_selftests_get_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        struct sk_buff *msg;

diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h
index 9851fd4..f29ec0b 100644 (file)
--- a/net/devlink/devl_internal.h
+++ b/net/devlink/devl_internal.h
@@ -214,10 +214,22 @@ int devlink_nl_cmd_reload(struct sk_buff *skb, struct genl_info *info);
 int devlink_nl_cmd_eswitch_get_doit(struct sk_buff *skb, struct genl_info *info);
 int devlink_nl_cmd_eswitch_set_doit(struct sk_buff *skb, struct genl_info *info);
 int devlink_nl_cmd_flash_update(struct sk_buff *skb, struct genl_info *info);
-int devlink_nl_cmd_selftests_get_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_selftests_get_doit(struct sk_buff *skb, struct genl_info *info);
 int devlink_nl_cmd_selftests_run(struct sk_buff *skb, struct genl_info *info);
-int devlink_nl_cmd_health_reporter_get_doit(struct sk_buff *skb,
-                                           struct genl_info *info);
+int devlink_nl_port_get_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_rate_get_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_linecard_get_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_sb_get_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_sb_pool_get_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_sb_port_pool_get_doit(struct sk_buff *skb,
+                                    struct genl_info *info);
+int devlink_nl_sb_tc_pool_bind_get_doit(struct sk_buff *skb,
+                                       struct genl_info *info);
+int devlink_nl_param_get_doit(struct sk_buff *skb,
+                             struct genl_info *info);
+int devlink_nl_region_get_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_health_reporter_get_doit(struct sk_buff *skb,
+                                       struct genl_info *info);
 int devlink_nl_cmd_health_reporter_set_doit(struct sk_buff *skb,
                                            struct genl_info *info);
 int devlink_nl_cmd_health_reporter_recover_doit(struct sk_buff *skb,
@@ -230,3 +242,7 @@ int devlink_nl_cmd_health_reporter_dump_clear_doit(struct sk_buff *skb,
                                                   struct genl_info *info);
 int devlink_nl_cmd_health_reporter_test_doit(struct sk_buff *skb,
                                             struct genl_info *info);
+int devlink_nl_trap_get_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_trap_group_get_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_trap_policer_get_doit(struct sk_buff *skb,
+                                    struct genl_info *info);

diff --git a/net/devlink/health.c b/net/devlink/health.c
index 194340a..6df4e34 100644 (file)
--- a/net/devlink/health.c
+++ b/net/devlink/health.c
@@ -356,8 +356,8 @@ devlink_health_reporter_get_from_info(struct devlink *devlink,
        return devlink_health_reporter_get_from_attrs(devlink, info->attrs);
 }
 
-int devlink_nl_cmd_health_reporter_get_doit(struct sk_buff *skb,
-                                           struct genl_info *info)
+int devlink_nl_health_reporter_get_doit(struct sk_buff *skb,
+                                       struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        struct devlink_health_reporter *reporter;

diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c
index b7b6850..bd8fa2f 100644 (file)
--- a/net/devlink/leftover.c
+++ b/net/devlink/leftover.c
@@ -1038,8 +1038,7 @@ const struct devlink_cmd devl_cmd_rate_get = {
        .dump_one               = devlink_nl_cmd_rate_get_dump_one,
 };
 
-static int devlink_nl_cmd_rate_get_doit(struct sk_buff *skb,
-                                       struct genl_info *info)
+int devlink_nl_rate_get_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        struct devlink_rate *devlink_rate;
@@ -1077,8 +1076,7 @@ devlink_rate_is_parent_node(struct devlink_rate *devlink_rate,
        return false;
 }
 
-static int devlink_nl_cmd_port_get_doit(struct sk_buff *skb,
-                                       struct genl_info *info)
+int devlink_nl_port_get_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink_port *devlink_port = info->user_ptr[1];
        struct sk_buff *msg;
@@ -1825,8 +1823,7 @@ static void devlink_linecard_notify(struct devlink_linecard *linecard,
                                msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
 }
 
-static int devlink_nl_cmd_linecard_get_doit(struct sk_buff *skb,
-                                           struct genl_info *info)
+int devlink_nl_linecard_get_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        struct devlink_linecard *linecard;
@@ -2091,8 +2088,7 @@ nla_put_failure:
        return -EMSGSIZE;
 }
 
-static int devlink_nl_cmd_sb_get_doit(struct sk_buff *skb,
-                                     struct genl_info *info)
+int devlink_nl_sb_get_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        struct devlink_sb *devlink_sb;
@@ -2194,8 +2190,7 @@ nla_put_failure:
        return -EMSGSIZE;
 }
 
-static int devlink_nl_cmd_sb_pool_get_doit(struct sk_buff *skb,
-                                          struct genl_info *info)
+int devlink_nl_sb_pool_get_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        struct devlink_sb *devlink_sb;
@@ -2394,8 +2389,8 @@ sb_occ_get_failure:
        return err;
 }
 
-static int devlink_nl_cmd_sb_port_pool_get_doit(struct sk_buff *skb,
-                                               struct genl_info *info)
+int devlink_nl_sb_port_pool_get_doit(struct sk_buff *skb,
+                                    struct genl_info *info)
 {
        struct devlink_port *devlink_port = info->user_ptr[1];
        struct devlink *devlink = devlink_port->devlink;
@@ -2603,8 +2598,8 @@ nla_put_failure:
        return -EMSGSIZE;
 }
 
-static int devlink_nl_cmd_sb_tc_pool_bind_get_doit(struct sk_buff *skb,
-                                                  struct genl_info *info)
+int devlink_nl_sb_tc_pool_bind_get_doit(struct sk_buff *skb,
+                                       struct genl_info *info)
 {
        struct devlink_port *devlink_port = info->user_ptr[1];
        struct devlink *devlink = devlink_port->devlink;
@@ -4295,8 +4290,8 @@ devlink_param_get_from_info(struct xarray *params, struct genl_info *info)
        return devlink_param_find_by_name(params, param_name);
 }
 
-static int devlink_nl_cmd_param_get_doit(struct sk_buff *skb,
-                                        struct genl_info *info)
+int devlink_nl_param_get_doit(struct sk_buff *skb,
+                             struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        struct devlink_param_item *param_item;
@@ -4793,8 +4788,7 @@ static void devlink_region_snapshot_del(struct devlink_region *region,
        kfree(snapshot);
 }
 
-static int devlink_nl_cmd_region_get_doit(struct sk_buff *skb,
-                                         struct genl_info *info)
+int devlink_nl_region_get_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct devlink *devlink = info->user_ptr[0];
        struct devlink_port *port = NULL;
@@ -5655,8 +5649,7 @@ nla_put_failure:
        return -EMSGSIZE;
 }
 
-static int devlink_nl_cmd_trap_get_doit(struct sk_buff *skb,
-                                       struct genl_info *info)
+int devlink_nl_trap_get_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct netlink_ext_ack *extack = info->extack;
        struct devlink *devlink = info->user_ptr[0];
@@ -5866,8 +5859,7 @@ nla_put_failure:
        return -EMSGSIZE;
 }
 
-static int devlink_nl_cmd_trap_group_get_doit(struct sk_buff *skb,
-                                             struct genl_info *info)
+int devlink_nl_trap_group_get_doit(struct sk_buff *skb, struct genl_info *info)
 {
        struct netlink_ext_ack *extack = info->extack;
        struct devlink *devlink = info->user_ptr[0];
@@ -6160,8 +6152,8 @@ nla_put_failure:
        return -EMSGSIZE;
 }
 
-static int devlink_nl_cmd_trap_policer_get_doit(struct sk_buff *skb,
-                                               struct genl_info *info)
+int devlink_nl_trap_policer_get_doit(struct sk_buff *skb,
+                                    struct genl_info *info)
 {
        struct devlink_trap_policer_item *policer_item;
        struct netlink_ext_ack *extack = info->extack;
@@ -6305,7 +6297,7 @@ const struct genl_small_ops devlink_nl_small_ops[54] = {
        {
                .cmd = DEVLINK_CMD_PORT_GET,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_port_get_doit,
+               .doit = devlink_nl_port_get_doit,
                .dumpit = devlink_nl_instance_iter_dumpit,
                .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
                /* can be retrieved by unprivileged users */
@@ -6319,7 +6311,7 @@ const struct genl_small_ops devlink_nl_small_ops[54] = {
        },
        {
                .cmd = DEVLINK_CMD_RATE_GET,
-               .doit = devlink_nl_cmd_rate_get_doit,
+               .doit = devlink_nl_rate_get_doit,
                .dumpit = devlink_nl_instance_iter_dumpit,
                /* can be retrieved by unprivileged users */
        },
@@ -6365,7 +6357,7 @@ const struct genl_small_ops devlink_nl_small_ops[54] = {
        },
        {
                .cmd = DEVLINK_CMD_LINECARD_GET,
-               .doit = devlink_nl_cmd_linecard_get_doit,
+               .doit = devlink_nl_linecard_get_doit,
                .dumpit = devlink_nl_instance_iter_dumpit,
                /* can be retrieved by unprivileged users */
        },
@@ -6377,14 +6369,14 @@ const struct genl_small_ops devlink_nl_small_ops[54] = {
        {
                .cmd = DEVLINK_CMD_SB_GET,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_sb_get_doit,
+               .doit = devlink_nl_sb_get_doit,
                .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,
+               .doit = devlink_nl_sb_pool_get_doit,
                .dumpit = devlink_nl_instance_iter_dumpit,
                /* can be retrieved by unprivileged users */
        },
@@ -6397,7 +6389,7 @@ const struct genl_small_ops devlink_nl_small_ops[54] = {
        {
                .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,
+               .doit = devlink_nl_sb_port_pool_get_doit,
                .dumpit = devlink_nl_instance_iter_dumpit,
                .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
                /* can be retrieved by unprivileged users */
@@ -6412,7 +6404,7 @@ const struct genl_small_ops devlink_nl_small_ops[54] = {
        {
                .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,
+               .doit = devlink_nl_sb_tc_pool_bind_get_doit,
                .dumpit = devlink_nl_instance_iter_dumpit,
                .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
                /* can be retrieved by unprivileged users */
@@ -6493,7 +6485,7 @@ const struct genl_small_ops devlink_nl_small_ops[54] = {
        {
                .cmd = DEVLINK_CMD_PARAM_GET,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_param_get_doit,
+               .doit = devlink_nl_param_get_doit,
                .dumpit = devlink_nl_instance_iter_dumpit,
                /* can be retrieved by unprivileged users */
        },
@@ -6521,7 +6513,7 @@ const struct genl_small_ops devlink_nl_small_ops[54] = {
        {
                .cmd = DEVLINK_CMD_REGION_GET,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_region_get_doit,
+               .doit = devlink_nl_region_get_doit,
                .dumpit = devlink_nl_instance_iter_dumpit,
                .flags = GENL_ADMIN_PERM,
        },
@@ -6547,7 +6539,7 @@ const struct genl_small_ops devlink_nl_small_ops[54] = {
        {
                .cmd = DEVLINK_CMD_HEALTH_REPORTER_GET,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_health_reporter_get_doit,
+               .doit = devlink_nl_health_reporter_get_doit,
                .dumpit = devlink_nl_instance_iter_dumpit,
                .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
                /* can be retrieved by unprivileged users */
@@ -6602,7 +6594,7 @@ const struct genl_small_ops devlink_nl_small_ops[54] = {
        },
        {
                .cmd = DEVLINK_CMD_TRAP_GET,
-               .doit = devlink_nl_cmd_trap_get_doit,
+               .doit = devlink_nl_trap_get_doit,
                .dumpit = devlink_nl_instance_iter_dumpit,
                /* can be retrieved by unprivileged users */
        },
@@ -6613,7 +6605,7 @@ const struct genl_small_ops devlink_nl_small_ops[54] = {
        },
        {
                .cmd = DEVLINK_CMD_TRAP_GROUP_GET,
-               .doit = devlink_nl_cmd_trap_group_get_doit,
+               .doit = devlink_nl_trap_group_get_doit,
                .dumpit = devlink_nl_instance_iter_dumpit,
                /* can be retrieved by unprivileged users */
        },
@@ -6624,7 +6616,7 @@ const struct genl_small_ops devlink_nl_small_ops[54] = {
        },
        {
                .cmd = DEVLINK_CMD_TRAP_POLICER_GET,
-               .doit = devlink_nl_cmd_trap_policer_get_doit,
+               .doit = devlink_nl_trap_policer_get_doit,
                .dumpit = devlink_nl_instance_iter_dumpit,
                /* can be retrieved by unprivileged users */
        },
@@ -6635,7 +6627,7 @@ const struct genl_small_ops devlink_nl_small_ops[54] = {
        },
        {
                .cmd = DEVLINK_CMD_SELFTESTS_GET,
-               .doit = devlink_nl_cmd_selftests_get_doit,
+               .doit = devlink_nl_selftests_get_doit,
                .dumpit = devlink_nl_instance_iter_dumpit,
                /* can be retrieved by unprivileged users */
        },