Merge tag 'for-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power...
[linux-2.6-microblaze.git] / net / devlink / netlink.c
index fc3e7c0..d0b90eb 100644 (file)
@@ -13,74 +13,37 @@ static const struct genl_multicast_group devlink_nl_mcgrps[] = {
        [DEVLINK_MCGRP_CONFIG] = { .name = DEVLINK_GENL_MCGRP_CONFIG_NAME },
 };
 
-static const struct nla_policy devlink_nl_policy[DEVLINK_ATTR_MAX + 1] = {
-       [DEVLINK_ATTR_UNSPEC] = { .strict_start_type =
-               DEVLINK_ATTR_TRAP_POLICER_ID },
-       [DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING },
-       [DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING },
-       [DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32 },
-       [DEVLINK_ATTR_PORT_TYPE] = NLA_POLICY_RANGE(NLA_U16, DEVLINK_PORT_TYPE_AUTO,
-                                                   DEVLINK_PORT_TYPE_IB),
-       [DEVLINK_ATTR_PORT_SPLIT_COUNT] = { .type = NLA_U32 },
-       [DEVLINK_ATTR_SB_INDEX] = { .type = NLA_U32 },
-       [DEVLINK_ATTR_SB_POOL_INDEX] = { .type = NLA_U16 },
-       [DEVLINK_ATTR_SB_POOL_TYPE] = { .type = NLA_U8 },
-       [DEVLINK_ATTR_SB_POOL_SIZE] = { .type = NLA_U32 },
-       [DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE] = { .type = NLA_U8 },
-       [DEVLINK_ATTR_SB_THRESHOLD] = { .type = NLA_U32 },
-       [DEVLINK_ATTR_SB_TC_INDEX] = { .type = NLA_U16 },
-       [DEVLINK_ATTR_ESWITCH_MODE] = NLA_POLICY_RANGE(NLA_U16, DEVLINK_ESWITCH_MODE_LEGACY,
-                                                      DEVLINK_ESWITCH_MODE_SWITCHDEV),
-       [DEVLINK_ATTR_ESWITCH_INLINE_MODE] = { .type = NLA_U8 },
-       [DEVLINK_ATTR_ESWITCH_ENCAP_MODE] = { .type = NLA_U8 },
-       [DEVLINK_ATTR_DPIPE_TABLE_NAME] = { .type = NLA_NUL_STRING },
-       [DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED] = { .type = NLA_U8 },
-       [DEVLINK_ATTR_RESOURCE_ID] = { .type = NLA_U64},
-       [DEVLINK_ATTR_RESOURCE_SIZE] = { .type = NLA_U64},
-       [DEVLINK_ATTR_PARAM_NAME] = { .type = NLA_NUL_STRING },
-       [DEVLINK_ATTR_PARAM_TYPE] = { .type = NLA_U8 },
-       [DEVLINK_ATTR_PARAM_VALUE_CMODE] = { .type = NLA_U8 },
-       [DEVLINK_ATTR_REGION_NAME] = { .type = NLA_NUL_STRING },
-       [DEVLINK_ATTR_REGION_SNAPSHOT_ID] = { .type = NLA_U32 },
-       [DEVLINK_ATTR_REGION_CHUNK_ADDR] = { .type = NLA_U64 },
-       [DEVLINK_ATTR_REGION_CHUNK_LEN] = { .type = NLA_U64 },
-       [DEVLINK_ATTR_HEALTH_REPORTER_NAME] = { .type = NLA_NUL_STRING },
-       [DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD] = { .type = NLA_U64 },
-       [DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER] = { .type = NLA_U8 },
-       [DEVLINK_ATTR_FLASH_UPDATE_FILE_NAME] = { .type = NLA_NUL_STRING },
-       [DEVLINK_ATTR_FLASH_UPDATE_COMPONENT] = { .type = NLA_NUL_STRING },
-       [DEVLINK_ATTR_FLASH_UPDATE_OVERWRITE_MASK] =
-               NLA_POLICY_BITFIELD32(DEVLINK_SUPPORTED_FLASH_OVERWRITE_SECTIONS),
-       [DEVLINK_ATTR_TRAP_NAME] = { .type = NLA_NUL_STRING },
-       [DEVLINK_ATTR_TRAP_ACTION] = { .type = NLA_U8 },
-       [DEVLINK_ATTR_TRAP_GROUP_NAME] = { .type = NLA_NUL_STRING },
-       [DEVLINK_ATTR_NETNS_PID] = { .type = NLA_U32 },
-       [DEVLINK_ATTR_NETNS_FD] = { .type = NLA_U32 },
-       [DEVLINK_ATTR_NETNS_ID] = { .type = NLA_U32 },
-       [DEVLINK_ATTR_HEALTH_REPORTER_AUTO_DUMP] = { .type = NLA_U8 },
-       [DEVLINK_ATTR_TRAP_POLICER_ID] = { .type = NLA_U32 },
-       [DEVLINK_ATTR_TRAP_POLICER_RATE] = { .type = NLA_U64 },
-       [DEVLINK_ATTR_TRAP_POLICER_BURST] = { .type = NLA_U64 },
-       [DEVLINK_ATTR_PORT_FUNCTION] = { .type = NLA_NESTED },
-       [DEVLINK_ATTR_RELOAD_ACTION] = NLA_POLICY_RANGE(NLA_U8, DEVLINK_RELOAD_ACTION_DRIVER_REINIT,
-                                                       DEVLINK_RELOAD_ACTION_MAX),
-       [DEVLINK_ATTR_RELOAD_LIMITS] = NLA_POLICY_BITFIELD32(DEVLINK_RELOAD_LIMITS_VALID_MASK),
-       [DEVLINK_ATTR_PORT_FLAVOUR] = { .type = NLA_U16 },
-       [DEVLINK_ATTR_PORT_PCI_PF_NUMBER] = { .type = NLA_U16 },
-       [DEVLINK_ATTR_PORT_PCI_SF_NUMBER] = { .type = NLA_U32 },
-       [DEVLINK_ATTR_PORT_CONTROLLER_NUMBER] = { .type = NLA_U32 },
-       [DEVLINK_ATTR_RATE_TYPE] = { .type = NLA_U16 },
-       [DEVLINK_ATTR_RATE_TX_SHARE] = { .type = NLA_U64 },
-       [DEVLINK_ATTR_RATE_TX_MAX] = { .type = NLA_U64 },
-       [DEVLINK_ATTR_RATE_NODE_NAME] = { .type = NLA_NUL_STRING },
-       [DEVLINK_ATTR_RATE_PARENT_NODE_NAME] = { .type = NLA_NUL_STRING },
-       [DEVLINK_ATTR_LINECARD_INDEX] = { .type = NLA_U32 },
-       [DEVLINK_ATTR_LINECARD_TYPE] = { .type = NLA_NUL_STRING },
-       [DEVLINK_ATTR_SELFTESTS] = { .type = NLA_NESTED },
-       [DEVLINK_ATTR_RATE_TX_PRIORITY] = { .type = NLA_U32 },
-       [DEVLINK_ATTR_RATE_TX_WEIGHT] = { .type = NLA_U32 },
-       [DEVLINK_ATTR_REGION_DIRECT] = { .type = NLA_FLAG },
-};
+int devlink_nl_put_nested_handle(struct sk_buff *msg, struct net *net,
+                                struct devlink *devlink, int attrtype)
+{
+       struct nlattr *nested_attr;
+       struct net *devl_net;
+
+       nested_attr = nla_nest_start(msg, attrtype);
+       if (!nested_attr)
+               return -EMSGSIZE;
+       if (devlink_nl_put_handle(msg, devlink))
+               goto nla_put_failure;
+
+       rcu_read_lock();
+       devl_net = read_pnet_rcu(&devlink->_net);
+       if (!net_eq(net, devl_net)) {
+               int id = peernet2id_alloc(net, devl_net, GFP_ATOMIC);
+
+               rcu_read_unlock();
+               if (nla_put_s32(msg, DEVLINK_ATTR_NETNS_ID, id))
+                       return -EMSGSIZE;
+       } else {
+               rcu_read_unlock();
+       }
+
+       nla_nest_end(msg, nested_attr);
+       return 0;
+
+nla_put_failure:
+       nla_nest_cancel(msg, nested_attr);
+       return -EMSGSIZE;
+}
 
 int devlink_nl_msg_reply_and_new(struct sk_buff **msg, struct genl_info *info)
 {
@@ -159,7 +122,7 @@ unlock:
 int devlink_nl_pre_doit(const struct genl_split_ops *ops,
                        struct sk_buff *skb, struct genl_info *info)
 {
-       return __devlink_nl_pre_doit(skb, info, ops->internal_flags);
+       return __devlink_nl_pre_doit(skb, info, 0);
 }
 
 int devlink_nl_pre_doit_port(const struct genl_split_ops *ops,
@@ -255,269 +218,12 @@ int devlink_nl_dumpit(struct sk_buff *msg, struct netlink_callback *cb,
                return devlink_nl_inst_iter_dumpit(msg, cb, flags, dump_one);
 }
 
-static const struct genl_small_ops devlink_nl_small_ops[40] = {
-       {
-               .cmd = DEVLINK_CMD_PORT_SET,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_port_set_doit,
-               .flags = GENL_ADMIN_PERM,
-               .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
-       },
-       {
-               .cmd = DEVLINK_CMD_RATE_SET,
-               .doit = devlink_nl_cmd_rate_set_doit,
-               .flags = GENL_ADMIN_PERM,
-       },
-       {
-               .cmd = DEVLINK_CMD_RATE_NEW,
-               .doit = devlink_nl_cmd_rate_new_doit,
-               .flags = GENL_ADMIN_PERM,
-       },
-       {
-               .cmd = DEVLINK_CMD_RATE_DEL,
-               .doit = devlink_nl_cmd_rate_del_doit,
-               .flags = GENL_ADMIN_PERM,
-       },
-       {
-               .cmd = DEVLINK_CMD_PORT_SPLIT,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_port_split_doit,
-               .flags = GENL_ADMIN_PERM,
-               .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
-       },
-       {
-               .cmd = DEVLINK_CMD_PORT_UNSPLIT,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_port_unsplit_doit,
-               .flags = GENL_ADMIN_PERM,
-               .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
-       },
-       {
-               .cmd = DEVLINK_CMD_PORT_NEW,
-               .doit = devlink_nl_cmd_port_new_doit,
-               .flags = GENL_ADMIN_PERM,
-       },
-       {
-               .cmd = DEVLINK_CMD_PORT_DEL,
-               .doit = devlink_nl_cmd_port_del_doit,
-               .flags = GENL_ADMIN_PERM,
-               .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
-       },
-
-       {
-               .cmd = DEVLINK_CMD_LINECARD_SET,
-               .doit = devlink_nl_cmd_linecard_set_doit,
-               .flags = GENL_ADMIN_PERM,
-       },
-       {
-               .cmd = DEVLINK_CMD_SB_POOL_SET,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_sb_pool_set_doit,
-               .flags = GENL_ADMIN_PERM,
-       },
-       {
-               .cmd = DEVLINK_CMD_SB_PORT_POOL_SET,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_sb_port_pool_set_doit,
-               .flags = GENL_ADMIN_PERM,
-               .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
-       },
-       {
-               .cmd = DEVLINK_CMD_SB_TC_POOL_BIND_SET,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_sb_tc_pool_bind_set_doit,
-               .flags = GENL_ADMIN_PERM,
-               .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
-       },
-       {
-               .cmd = DEVLINK_CMD_SB_OCC_SNAPSHOT,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_sb_occ_snapshot_doit,
-               .flags = GENL_ADMIN_PERM,
-       },
-       {
-               .cmd = DEVLINK_CMD_SB_OCC_MAX_CLEAR,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_sb_occ_max_clear_doit,
-               .flags = GENL_ADMIN_PERM,
-       },
-       {
-               .cmd = DEVLINK_CMD_ESWITCH_GET,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_eswitch_get_doit,
-               .flags = GENL_ADMIN_PERM,
-       },
-       {
-               .cmd = DEVLINK_CMD_ESWITCH_SET,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_eswitch_set_doit,
-               .flags = GENL_ADMIN_PERM,
-       },
-       {
-               .cmd = DEVLINK_CMD_DPIPE_TABLE_GET,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_dpipe_table_get,
-               /* can be retrieved by unprivileged users */
-       },
-       {
-               .cmd = DEVLINK_CMD_DPIPE_ENTRIES_GET,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_dpipe_entries_get,
-               /* can be retrieved by unprivileged users */
-       },
-       {
-               .cmd = DEVLINK_CMD_DPIPE_HEADERS_GET,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_dpipe_headers_get,
-               /* can be retrieved by unprivileged users */
-       },
-       {
-               .cmd = DEVLINK_CMD_DPIPE_TABLE_COUNTERS_SET,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_dpipe_table_counters_set,
-               .flags = GENL_ADMIN_PERM,
-       },
-       {
-               .cmd = DEVLINK_CMD_RESOURCE_SET,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_resource_set,
-               .flags = GENL_ADMIN_PERM,
-       },
-       {
-               .cmd = DEVLINK_CMD_RESOURCE_DUMP,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_resource_dump,
-               /* can be retrieved by unprivileged users */
-       },
-       {
-               .cmd = DEVLINK_CMD_RELOAD,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_reload,
-               .flags = GENL_ADMIN_PERM,
-       },
-       {
-               .cmd = DEVLINK_CMD_PARAM_SET,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_param_set_doit,
-               .flags = GENL_ADMIN_PERM,
-       },
-       {
-               .cmd = DEVLINK_CMD_PORT_PARAM_GET,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_port_param_get_doit,
-               .dumpit = devlink_nl_cmd_port_param_get_dumpit,
-               .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
-               /* can be retrieved by unprivileged users */
-       },
-       {
-               .cmd = DEVLINK_CMD_PORT_PARAM_SET,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_port_param_set_doit,
-               .flags = GENL_ADMIN_PERM,
-               .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
-       },
-       {
-               .cmd = DEVLINK_CMD_REGION_NEW,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_region_new,
-               .flags = GENL_ADMIN_PERM,
-       },
-       {
-               .cmd = DEVLINK_CMD_REGION_DEL,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_region_del,
-               .flags = GENL_ADMIN_PERM,
-       },
-       {
-               .cmd = DEVLINK_CMD_REGION_READ,
-               .validate = GENL_DONT_VALIDATE_STRICT |
-                           GENL_DONT_VALIDATE_DUMP_STRICT,
-               .dumpit = devlink_nl_cmd_region_read_dumpit,
-               .flags = GENL_ADMIN_PERM,
-       },
-       {
-               .cmd = DEVLINK_CMD_HEALTH_REPORTER_SET,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_health_reporter_set_doit,
-               .flags = GENL_ADMIN_PERM,
-               .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
-       },
-       {
-               .cmd = DEVLINK_CMD_HEALTH_REPORTER_RECOVER,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_health_reporter_recover_doit,
-               .flags = GENL_ADMIN_PERM,
-               .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
-       },
-       {
-               .cmd = DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_health_reporter_diagnose_doit,
-               .flags = GENL_ADMIN_PERM,
-               .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
-       },
-       {
-               .cmd = DEVLINK_CMD_HEALTH_REPORTER_DUMP_GET,
-               .validate = GENL_DONT_VALIDATE_STRICT |
-                           GENL_DONT_VALIDATE_DUMP_STRICT,
-               .dumpit = devlink_nl_cmd_health_reporter_dump_get_dumpit,
-               .flags = GENL_ADMIN_PERM,
-       },
-       {
-               .cmd = DEVLINK_CMD_HEALTH_REPORTER_DUMP_CLEAR,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_health_reporter_dump_clear_doit,
-               .flags = GENL_ADMIN_PERM,
-               .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
-       },
-       {
-               .cmd = DEVLINK_CMD_HEALTH_REPORTER_TEST,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_health_reporter_test_doit,
-               .flags = GENL_ADMIN_PERM,
-               .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT,
-       },
-       {
-               .cmd = DEVLINK_CMD_FLASH_UPDATE,
-               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .doit = devlink_nl_cmd_flash_update,
-               .flags = GENL_ADMIN_PERM,
-       },
-       {
-               .cmd = DEVLINK_CMD_TRAP_SET,
-               .doit = devlink_nl_cmd_trap_set_doit,
-               .flags = GENL_ADMIN_PERM,
-       },
-       {
-               .cmd = DEVLINK_CMD_TRAP_GROUP_SET,
-               .doit = devlink_nl_cmd_trap_group_set_doit,
-               .flags = GENL_ADMIN_PERM,
-       },
-       {
-               .cmd = DEVLINK_CMD_TRAP_POLICER_SET,
-               .doit = devlink_nl_cmd_trap_policer_set_doit,
-               .flags = GENL_ADMIN_PERM,
-       },
-       {
-               .cmd = DEVLINK_CMD_SELFTESTS_RUN,
-               .doit = devlink_nl_cmd_selftests_run,
-               .flags = GENL_ADMIN_PERM,
-       },
-       /* -- No new ops here! Use split ops going forward! -- */
-};
-
 struct genl_family devlink_nl_family __ro_after_init = {
        .name           = DEVLINK_GENL_NAME,
        .version        = DEVLINK_GENL_VERSION,
-       .maxattr        = DEVLINK_ATTR_MAX,
-       .policy         = devlink_nl_policy,
        .netnsok        = true,
        .parallel_ops   = true,
-       .pre_doit       = devlink_nl_pre_doit,
-       .post_doit      = devlink_nl_post_doit,
        .module         = THIS_MODULE,
-       .small_ops      = 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,