Commit 3b0f31f2 authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 601ed4d6

drivers/block/nbd.c

+1 −4
Original line number Diff line number Diff line
@@ -1999,22 +1999,18 @@ out: 
static const struct genl_ops nbd_connect_genl_ops[] = {

	{

		.cmd	= NBD_CMD_CONNECT,

		.policy	= nbd_attr_policy,

		.doit	= nbd_genl_connect,

	},

	{

		.cmd	= NBD_CMD_DISCONNECT,

		.policy	= nbd_attr_policy,

		.doit	= nbd_genl_disconnect,

	},

	{

		.cmd	= NBD_CMD_RECONFIGURE,

		.policy	= nbd_attr_policy,

		.doit	= nbd_genl_reconfigure,

	},

	{

		.cmd	= NBD_CMD_STATUS,

		.policy	= nbd_attr_policy,

		.doit	= nbd_genl_status,

	},

};
@@ -2031,6 +2027,7 @@ static struct genl_family nbd_genl_family __ro_after_init = { 
	.ops		= nbd_connect_genl_ops,

	.n_ops		= ARRAY_SIZE(nbd_connect_genl_ops),

	.maxattr	= NBD_ATTR_MAX,

	.policy = nbd_attr_policy,

	.mcgrps		= nbd_mcast_grps,

	.n_mcgrps	= ARRAY_SIZE(nbd_mcast_grps),

};

drivers/net/gtp.c

+1 −3
Original line number Diff line number Diff line
@@ -1271,20 +1271,17 @@ static const struct genl_ops gtp_genl_ops[] = { 
	{

		.cmd = GTP_CMD_NEWPDP,

		.doit = gtp_genl_new_pdp,

		.policy = gtp_genl_policy,

		.flags = GENL_ADMIN_PERM,

	},

	{

		.cmd = GTP_CMD_DELPDP,

		.doit = gtp_genl_del_pdp,

		.policy = gtp_genl_policy,

		.flags = GENL_ADMIN_PERM,

	},

	{

		.cmd = GTP_CMD_GETPDP,

		.doit = gtp_genl_get_pdp,

		.dumpit = gtp_genl_dump_pdp,

		.policy = gtp_genl_policy,

		.flags = GENL_ADMIN_PERM,

	},

};
@@ -1294,6 +1291,7 @@ static struct genl_family gtp_genl_family __ro_after_init = { 
	.version	= 0,

	.hdrsize	= 0,

	.maxattr	= GTPA_MAX,

	.policy = gtp_genl_policy,

	.netnsok	= true,

	.module		= THIS_MODULE,

	.ops		= gtp_genl_ops,

drivers/net/ieee802154/mac802154_hwsim.c

+1 −6
Original line number Diff line number Diff line
@@ -598,37 +598,31 @@ static const struct nla_policy hwsim_genl_policy[MAC802154_HWSIM_ATTR_MAX + 1] = 
static const struct genl_ops hwsim_nl_ops[] = {

	{

		.cmd = MAC802154_HWSIM_CMD_NEW_RADIO,

		.policy = hwsim_genl_policy,

		.doit = hwsim_new_radio_nl,

		.flags = GENL_UNS_ADMIN_PERM,

	},

	{

		.cmd = MAC802154_HWSIM_CMD_DEL_RADIO,

		.policy = hwsim_genl_policy,

		.doit = hwsim_del_radio_nl,

		.flags = GENL_UNS_ADMIN_PERM,

	},

	{

		.cmd = MAC802154_HWSIM_CMD_GET_RADIO,

		.policy = hwsim_genl_policy,

		.doit = hwsim_get_radio_nl,

		.dumpit = hwsim_dump_radio_nl,

	},

	{

		.cmd = MAC802154_HWSIM_CMD_NEW_EDGE,

		.policy = hwsim_genl_policy,

		.doit = hwsim_new_edge_nl,

		.flags = GENL_UNS_ADMIN_PERM,

	},

	{

		.cmd = MAC802154_HWSIM_CMD_DEL_EDGE,

		.policy = hwsim_genl_policy,

		.doit = hwsim_del_edge_nl,

		.flags = GENL_UNS_ADMIN_PERM,

	},

	{

		.cmd = MAC802154_HWSIM_CMD_SET_EDGE,

		.policy = hwsim_genl_policy,

		.doit = hwsim_set_edge_lqi,

		.flags = GENL_UNS_ADMIN_PERM,

	},
@@ -638,6 +632,7 @@ static struct genl_family hwsim_genl_family __ro_after_init = { 
	.name = "MAC802154_HWSIM",

	.version = 1,

	.maxattr = MAC802154_HWSIM_ATTR_MAX,

	.policy = hwsim_genl_policy,

	.module = THIS_MODULE,

	.ops = hwsim_nl_ops,

	.n_ops = ARRAY_SIZE(hwsim_nl_ops),

drivers/net/macsec.c

+1 −10
Original line number Diff line number Diff line
@@ -2637,60 +2637,50 @@ static const struct genl_ops macsec_genl_ops[] = { 
	{

		.cmd = MACSEC_CMD_GET_TXSC,

		.dumpit = macsec_dump_txsc,

		.policy = macsec_genl_policy,

	},

	{

		.cmd = MACSEC_CMD_ADD_RXSC,

		.doit = macsec_add_rxsc,

		.policy = macsec_genl_policy,

		.flags = GENL_ADMIN_PERM,

	},

	{

		.cmd = MACSEC_CMD_DEL_RXSC,

		.doit = macsec_del_rxsc,

		.policy = macsec_genl_policy,

		.flags = GENL_ADMIN_PERM,

	},

	{

		.cmd = MACSEC_CMD_UPD_RXSC,

		.doit = macsec_upd_rxsc,

		.policy = macsec_genl_policy,

		.flags = GENL_ADMIN_PERM,

	},

	{

		.cmd = MACSEC_CMD_ADD_TXSA,

		.doit = macsec_add_txsa,

		.policy = macsec_genl_policy,

		.flags = GENL_ADMIN_PERM,

	},

	{

		.cmd = MACSEC_CMD_DEL_TXSA,

		.doit = macsec_del_txsa,

		.policy = macsec_genl_policy,

		.flags = GENL_ADMIN_PERM,

	},

	{

		.cmd = MACSEC_CMD_UPD_TXSA,

		.doit = macsec_upd_txsa,

		.policy = macsec_genl_policy,

		.flags = GENL_ADMIN_PERM,

	},

	{

		.cmd = MACSEC_CMD_ADD_RXSA,

		.doit = macsec_add_rxsa,

		.policy = macsec_genl_policy,

		.flags = GENL_ADMIN_PERM,

	},

	{

		.cmd = MACSEC_CMD_DEL_RXSA,

		.doit = macsec_del_rxsa,

		.policy = macsec_genl_policy,

		.flags = GENL_ADMIN_PERM,

	},

	{

		.cmd = MACSEC_CMD_UPD_RXSA,

		.doit = macsec_upd_rxsa,

		.policy = macsec_genl_policy,

		.flags = GENL_ADMIN_PERM,

	},

};
@@ -2700,6 +2690,7 @@ static struct genl_family macsec_fam __ro_after_init = { 
	.hdrsize	= 0,

	.version	= MACSEC_GENL_VERSION,

	.maxattr	= MACSEC_ATTR_MAX,

	.policy = macsec_genl_policy,

	.netnsok	= true,

	.module		= THIS_MODULE,

	.ops		= macsec_genl_ops,

drivers/net/team/team.c

+1 −4
Original line number Diff line number Diff line
@@ -2725,24 +2725,20 @@ static const struct genl_ops team_nl_ops[] = { 
	{

		.cmd = TEAM_CMD_NOOP,

		.doit = team_nl_cmd_noop,

		.policy = team_nl_policy,

	},

	{

		.cmd = TEAM_CMD_OPTIONS_SET,

		.doit = team_nl_cmd_options_set,

		.policy = team_nl_policy,

		.flags = GENL_ADMIN_PERM,

	},

	{

		.cmd = TEAM_CMD_OPTIONS_GET,

		.doit = team_nl_cmd_options_get,

		.policy = team_nl_policy,

		.flags = GENL_ADMIN_PERM,

	},

	{

		.cmd = TEAM_CMD_PORT_LIST_GET,

		.doit = team_nl_cmd_port_list_get,

		.policy = team_nl_policy,

		.flags = GENL_ADMIN_PERM,

	},

};
@@ -2755,6 +2751,7 @@ static struct genl_family team_nl_family __ro_after_init = { 
	.name		= TEAM_GENL_NAME,

	.version	= TEAM_GENL_VERSION,

	.maxattr	= TEAM_ATTR_MAX,

	.policy = team_nl_policy,

	.netnsok	= true,

	.module		= THIS_MODULE,

	.ops		= team_nl_ops,

CRA Git | Maintained and supported by SUSTech CRA and CCSE