genetlink: make policy common to family

Since maxattr is common, the policy can't really differ sanely,
so make it common as well.

The only user that did in fact manage to make a non-common policy
is taskstats, which has to be really careful about it (since it's
still using a common maxattr!). This is no longer supported, but
we can fake it using pre_doit.

This reduces the size of e.g. nl80211.o (which has lots of commands):

   text	   data	    bss	    dec	    hex	filename
 398745	  14323	   2240	 415308	  6564c	net/wireless/nl80211.o (before)
 397913	  14331	   2240	 414484	  65314	net/wireless/nl80211.o (after)
--------------------------------
   -832      +8       0    -824

Which is obviously just 8 bytes for each command, and an added 8
bytes for the new policy pointer. I'm not sure why the ops list is
counted as .text though.

Most of the code transformations were done using the following spatch:
    @ops@
    identifier OPS;
    expression POLICY;
    @@
    struct genl_ops OPS[] = {
    ...,
     {
    -	.policy = POLICY,
     },
    ...
    };

    @@
    identifier ops.OPS;
    expression ops.POLICY;
    identifier fam;
    expression M;
    @@
    struct genl_family fam = {
            .ops = OPS,
            .maxattr = M,
    +       .policy = POLICY,
            ...
    };

This also gets rid of devlink_nl_cmd_region_read_dumpit() accessing
the cb->data as ops, which we want to change in a later genl patch.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 40 deletions

diff --git a/net/core/devlink.c b/net/core/devlink.c
index 78e22cea4cc7..1a65cbf1ab05 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -3640,7 +3640,6 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,
                                              struct netlink_callback *cb)
 {
         u64 ret_offset, start_offset, end_offset = 0;
-        const struct genl_ops *ops = cb->data;
         struct devlink_region *region;
         struct nlattr *chunks_attr;
         const char *region_name;
@@ -3657,7 +3656,8 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,
                 return -ENOMEM;
 
         err = nlmsg_parse(cb->nlh, GENL_HDRLEN + devlink_nl_family.hdrsize,
-                          attrs, DEVLINK_ATTR_MAX, ops->policy, cb->extack);
+                          attrs, DEVLINK_ATTR_MAX, devlink_nl_family.policy,
+                          cb->extack);
         if (err)
                 goto out_free;
 
@@ -4923,7 +4923,6 @@ static const struct genl_ops devlink_nl_ops[] = {
                 .cmd = DEVLINK_CMD_GET,
                 .doit = devlink_nl_cmd_get_doit,
                 .dumpit = devlink_nl_cmd_get_dumpit,
-                .policy = devlink_nl_policy,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,
                 /* can be retrieved by unprivileged users */
         },
@@ -4931,21 +4930,18 @@ static const struct genl_ops devlink_nl_ops[] = {
                 .cmd = DEVLINK_CMD_PORT_GET,
                 .doit = devlink_nl_cmd_port_get_doit,
                 .dumpit = devlink_nl_cmd_port_get_dumpit,
-                .policy = devlink_nl_policy,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
                 /* can be retrieved by unprivileged users */
         },
         {
                 .cmd = DEVLINK_CMD_PORT_SET,
                 .doit = devlink_nl_cmd_port_set_doit,
-                .policy = devlink_nl_policy,
                 .flags = GENL_ADMIN_PERM,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
         },
         {
                 .cmd = DEVLINK_CMD_PORT_SPLIT,
                 .doit = devlink_nl_cmd_port_split_doit,
-                .policy = devlink_nl_policy,
                 .flags = GENL_ADMIN_PERM,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |
                                   DEVLINK_NL_FLAG_NO_LOCK,
@@ -4953,7 +4949,6 @@ static const struct genl_ops devlink_nl_ops[] = {
         {
                 .cmd = DEVLINK_CMD_PORT_UNSPLIT,
                 .doit = devlink_nl_cmd_port_unsplit_doit,
-                .policy = devlink_nl_policy,
                 .flags = GENL_ADMIN_PERM,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |
                                   DEVLINK_NL_FLAG_NO_LOCK,
@@ -4962,7 +4957,6 @@ static const struct genl_ops devlink_nl_ops[] = {
                 .cmd = DEVLINK_CMD_SB_GET,
                 .doit = devlink_nl_cmd_sb_get_doit,
                 .dumpit = devlink_nl_cmd_sb_get_dumpit,
-                .policy = devlink_nl_policy,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |
                                   DEVLINK_NL_FLAG_NEED_SB,
                 /* can be retrieved by unprivileged users */
@@ -4971,7 +4965,6 @@ static const struct genl_ops devlink_nl_ops[] = {
                 .cmd = DEVLINK_CMD_SB_POOL_GET,
                 .doit = devlink_nl_cmd_sb_pool_get_doit,
                 .dumpit = devlink_nl_cmd_sb_pool_get_dumpit,
-                .policy = devlink_nl_policy,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |
                                   DEVLINK_NL_FLAG_NEED_SB,
                 /* can be retrieved by unprivileged users */
@@ -4979,7 +4972,6 @@ static const struct genl_ops devlink_nl_ops[] = {
         {
                 .cmd = DEVLINK_CMD_SB_POOL_SET,
                 .doit = devlink_nl_cmd_sb_pool_set_doit,
-                .policy = devlink_nl_policy,
                 .flags = GENL_ADMIN_PERM,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |
                                   DEVLINK_NL_FLAG_NEED_SB,
@@ -4988,7 +4980,6 @@ static const struct genl_ops devlink_nl_ops[] = {
                 .cmd = DEVLINK_CMD_SB_PORT_POOL_GET,
                 .doit = devlink_nl_cmd_sb_port_pool_get_doit,
                 .dumpit = devlink_nl_cmd_sb_port_pool_get_dumpit,
-                .policy = devlink_nl_policy,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_PORT |
                                   DEVLINK_NL_FLAG_NEED_SB,
                 /* can be retrieved by unprivileged users */
@@ -4996,7 +4987,6 @@ static const struct genl_ops devlink_nl_ops[] = {
         {
                 .cmd = DEVLINK_CMD_SB_PORT_POOL_SET,
                 .doit = devlink_nl_cmd_sb_port_pool_set_doit,
-                .policy = devlink_nl_policy,
                 .flags = GENL_ADMIN_PERM,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_PORT |
                                   DEVLINK_NL_FLAG_NEED_SB,
@@ -5005,7 +4995,6 @@ static const struct genl_ops devlink_nl_ops[] = {
                 .cmd = DEVLINK_CMD_SB_TC_POOL_BIND_GET,
                 .doit = devlink_nl_cmd_sb_tc_pool_bind_get_doit,
                 .dumpit = devlink_nl_cmd_sb_tc_pool_bind_get_dumpit,
-                .policy = devlink_nl_policy,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_PORT |
                                   DEVLINK_NL_FLAG_NEED_SB,
                 /* can be retrieved by unprivileged users */
@@ -5013,7 +5002,6 @@ static const struct genl_ops devlink_nl_ops[] = {
         {
                 .cmd = DEVLINK_CMD_SB_TC_POOL_BIND_SET,
                 .doit = devlink_nl_cmd_sb_tc_pool_bind_set_doit,
-                .policy = devlink_nl_policy,
                 .flags = GENL_ADMIN_PERM,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_PORT |
                                   DEVLINK_NL_FLAG_NEED_SB,
@@ -5021,7 +5009,6 @@ static const struct genl_ops devlink_nl_ops[] = {
         {
                 .cmd = DEVLINK_CMD_SB_OCC_SNAPSHOT,
                 .doit = devlink_nl_cmd_sb_occ_snapshot_doit,
-                .policy = devlink_nl_policy,
                 .flags = GENL_ADMIN_PERM,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |
                                   DEVLINK_NL_FLAG_NEED_SB,
@@ -5029,7 +5016,6 @@ static const struct genl_ops devlink_nl_ops[] = {
         {
                 .cmd = DEVLINK_CMD_SB_OCC_MAX_CLEAR,
                 .doit = devlink_nl_cmd_sb_occ_max_clear_doit,
-                .policy = devlink_nl_policy,
                 .flags = GENL_ADMIN_PERM,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |
                                   DEVLINK_NL_FLAG_NEED_SB,
@@ -5037,14 +5023,12 @@ static const struct genl_ops devlink_nl_ops[] = {
         {
                 .cmd = DEVLINK_CMD_ESWITCH_GET,
                 .doit = devlink_nl_cmd_eswitch_get_doit,
-                .policy = devlink_nl_policy,
                 .flags = GENL_ADMIN_PERM,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,
         },
         {
                 .cmd = DEVLINK_CMD_ESWITCH_SET,
                 .doit = devlink_nl_cmd_eswitch_set_doit,
-                .policy = devlink_nl_policy,
                 .flags = GENL_ADMIN_PERM,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |
                                   DEVLINK_NL_FLAG_NO_LOCK,
@@ -5052,49 +5036,42 @@ static const struct genl_ops devlink_nl_ops[] = {
         {
                 .cmd = DEVLINK_CMD_DPIPE_TABLE_GET,
                 .doit = devlink_nl_cmd_dpipe_table_get,
-                .policy = devlink_nl_policy,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,
                 /* can be retrieved by unprivileged users */
         },
         {
                 .cmd = DEVLINK_CMD_DPIPE_ENTRIES_GET,
                 .doit = devlink_nl_cmd_dpipe_entries_get,
-                .policy = devlink_nl_policy,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,
                 /* can be retrieved by unprivileged users */
         },
         {
                 .cmd = DEVLINK_CMD_DPIPE_HEADERS_GET,
                 .doit = devlink_nl_cmd_dpipe_headers_get,
-                .policy = devlink_nl_policy,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,
                 /* can be retrieved by unprivileged users */
         },
         {
                 .cmd = DEVLINK_CMD_DPIPE_TABLE_COUNTERS_SET,
                 .doit = devlink_nl_cmd_dpipe_table_counters_set,
-                .policy = devlink_nl_policy,
                 .flags = GENL_ADMIN_PERM,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,
         },
         {
                 .cmd = DEVLINK_CMD_RESOURCE_SET,
                 .doit = devlink_nl_cmd_resource_set,
-                .policy = devlink_nl_policy,
                 .flags = GENL_ADMIN_PERM,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,
         },
         {
                 .cmd = DEVLINK_CMD_RESOURCE_DUMP,
                 .doit = devlink_nl_cmd_resource_dump,
-                .policy = devlink_nl_policy,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,
                 /* can be retrieved by unprivileged users */
         },
         {
                 .cmd = DEVLINK_CMD_RELOAD,
                 .doit = devlink_nl_cmd_reload,
-                .policy = devlink_nl_policy,
                 .flags = GENL_ADMIN_PERM,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |
                                   DEVLINK_NL_FLAG_NO_LOCK,
@@ -5103,14 +5080,12 @@ static const struct genl_ops devlink_nl_ops[] = {
                 .cmd = DEVLINK_CMD_PARAM_GET,
                 .doit = devlink_nl_cmd_param_get_doit,
                 .dumpit = devlink_nl_cmd_param_get_dumpit,
-                .policy = devlink_nl_policy,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,
                 /* can be retrieved by unprivileged users */
         },
         {
                 .cmd = DEVLINK_CMD_PARAM_SET,
                 .doit = devlink_nl_cmd_param_set_doit,
-                .policy = devlink_nl_policy,
                 .flags = GENL_ADMIN_PERM,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,
         },
@@ -5118,14 +5093,12 @@ static const struct genl_ops devlink_nl_ops[] = {
                 .cmd = DEVLINK_CMD_PORT_PARAM_GET,
                 .doit = devlink_nl_cmd_port_param_get_doit,
                 .dumpit = devlink_nl_cmd_port_param_get_dumpit,
-                .policy = devlink_nl_policy,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
                 /* can be retrieved by unprivileged users */
         },
         {
                 .cmd = DEVLINK_CMD_PORT_PARAM_SET,
                 .doit = devlink_nl_cmd_port_param_set_doit,
-                .policy = devlink_nl_policy,
                 .flags = GENL_ADMIN_PERM,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
         },
@@ -5133,21 +5106,18 @@ static const struct genl_ops devlink_nl_ops[] = {
                 .cmd = DEVLINK_CMD_REGION_GET,
                 .doit = devlink_nl_cmd_region_get_doit,
                 .dumpit = devlink_nl_cmd_region_get_dumpit,
-                .policy = devlink_nl_policy,
                 .flags = GENL_ADMIN_PERM,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,
         },
         {
                 .cmd = DEVLINK_CMD_REGION_DEL,
                 .doit = devlink_nl_cmd_region_del,
-                .policy = devlink_nl_policy,
                 .flags = GENL_ADMIN_PERM,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,
         },
         {
                 .cmd = DEVLINK_CMD_REGION_READ,
                 .dumpit = devlink_nl_cmd_region_read_dumpit,
-                .policy = devlink_nl_policy,
                 .flags = GENL_ADMIN_PERM,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,
         },
@@ -5155,7 +5125,6 @@ static const struct genl_ops devlink_nl_ops[] = {
                 .cmd = DEVLINK_CMD_INFO_GET,
                 .doit = devlink_nl_cmd_info_get_doit,
                 .dumpit = devlink_nl_cmd_info_get_dumpit,
-                .policy = devlink_nl_policy,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,
                 /* can be retrieved by unprivileged users */
         },
@@ -5163,35 +5132,30 @@ static const struct genl_ops devlink_nl_ops[] = {
                 .cmd = DEVLINK_CMD_HEALTH_REPORTER_GET,
                 .doit = devlink_nl_cmd_health_reporter_get_doit,
                 .dumpit = devlink_nl_cmd_health_reporter_get_dumpit,
-                .policy = devlink_nl_policy,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,
                 /* can be retrieved by unprivileged users */
         },
         {
                 .cmd = DEVLINK_CMD_HEALTH_REPORTER_SET,
                 .doit = devlink_nl_cmd_health_reporter_set_doit,
-                .policy = devlink_nl_policy,
                 .flags = GENL_ADMIN_PERM,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,
         },
         {
                 .cmd = DEVLINK_CMD_HEALTH_REPORTER_RECOVER,
                 .doit = devlink_nl_cmd_health_reporter_recover_doit,
-                .policy = devlink_nl_policy,
                 .flags = GENL_ADMIN_PERM,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,
         },
         {
                 .cmd = DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE,
                 .doit = devlink_nl_cmd_health_reporter_diagnose_doit,
-                .policy = devlink_nl_policy,
                 .flags = GENL_ADMIN_PERM,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,
         },
         {
                 .cmd = DEVLINK_CMD_HEALTH_REPORTER_DUMP_GET,
                 .doit = devlink_nl_cmd_health_reporter_dump_get_doit,
-                .policy = devlink_nl_policy,
                 .flags = GENL_ADMIN_PERM,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |
                                   DEVLINK_NL_FLAG_NO_LOCK,
@@ -5199,7 +5163,6 @@ static const struct genl_ops devlink_nl_ops[] = {
         {
                 .cmd = DEVLINK_CMD_HEALTH_REPORTER_DUMP_CLEAR,
                 .doit = devlink_nl_cmd_health_reporter_dump_clear_doit,
-                .policy = devlink_nl_policy,
                 .flags = GENL_ADMIN_PERM,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK |
                                   DEVLINK_NL_FLAG_NO_LOCK,
@@ -5207,7 +5170,6 @@ static const struct genl_ops devlink_nl_ops[] = {
         {
                 .cmd = DEVLINK_CMD_FLASH_UPDATE,
                 .doit = devlink_nl_cmd_flash_update,
-                .policy = devlink_nl_policy,
                 .flags = GENL_ADMIN_PERM,
                 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,
         },
@@ -5217,6 +5179,7 @@ static 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,
         .pre_doit       = devlink_nl_pre_doit,
         .post_doit      = devlink_nl_post_doit,