Commit 678cdd49 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'genetlink-support-per-command-policy-dump' 



Jakub Kicinski says:

====================
genetlink: support per-command policy dump

The objective of this series is to dump ethtool policies
to be able to tell which flags are supported by the kernel.
Current release adds ETHTOOL_FLAG_STATS for dumping extra
stats, but because of strict checking we need to make sure
that the flag is actually supported before setting it in
a request.

Ethtool policies are per command, and so far only dumping
family policies was supported.

The series adds new set of "light" ops to genl families which
don't have all the callbacks, and won't have the policy.
Most of families are then moved to these ops. This gives
us 4096B in savings on an allyesconfig build (not counting
the growth that would have happened when policy is added):

     text       data       bss        dec       hex
244415581  227958581  78372980  550747142  20d3bc06
244415581  227962677  78372980  550751238  20d3cc06

Next 5 patches deal the dumping per-op policy.

v3:

The actually patch to dump per-op policy was taken out and
will come in a series from Johannes, to make sure uAPI is
consistent from the start.

For dump-specific policies I think it should be fine to add
a new pair of members to the "full" ops, and not overthink it.

v2:
 - remove the stale comment in taskstats
 - split patch 8 -> 8, 9
 - now the getfamily policy is also in the op
 - make cmd u32
v1:
 - replace remaining uses of "light" with "small"
 - fix dump (ops can't be on the stack there)
 - coding changes in patch 4
 - new patch 7
 - don't echo op in responses - to make dump all easier

Dave - this series will cause a very trivial conflict with
the patch I sent to net. Both sides add some kdoc to struct
genl_ops so we'll need to keep it all.  I'm sending this
already because I also need to restructure ethool policies
in time for 5.10 if we want to use it for the stats flag.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5a38b4fc a4bb4f5f

drivers/block/nbd.c

+3 −3
Original line number Diff line number Diff line
@@ -2183,7 +2183,7 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info) 
	return ret;

}



static const struct genl_ops nbd_connect_genl_ops[] = {

static const struct genl_small_ops nbd_connect_genl_ops[] = {

	{

		.cmd	= NBD_CMD_CONNECT,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
@@ -2215,8 +2215,8 @@ static struct genl_family nbd_genl_family __ro_after_init = { 
	.name		= NBD_GENL_FAMILY_NAME,

	.version	= NBD_GENL_VERSION,

	.module		= THIS_MODULE,

	.ops		= nbd_connect_genl_ops,

	.n_ops		= ARRAY_SIZE(nbd_connect_genl_ops),

	.small_ops	= nbd_connect_genl_ops,

	.n_small_ops	= ARRAY_SIZE(nbd_connect_genl_ops),

	.maxattr	= NBD_ATTR_MAX,

	.policy = nbd_attr_policy,

	.mcgrps		= nbd_mcast_grps,

drivers/net/gtp.c

+3 −3
Original line number Diff line number Diff line
@@ -1339,7 +1339,7 @@ static const struct nla_policy gtp_genl_policy[GTPA_MAX + 1] = { 
	[GTPA_O_TEI]		= { .type = NLA_U32, },

};



static const struct genl_ops gtp_genl_ops[] = {

static const struct genl_small_ops gtp_genl_ops[] = {

	{

		.cmd = GTP_CMD_NEWPDP,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
@@ -1369,8 +1369,8 @@ static struct genl_family gtp_genl_family __ro_after_init = { 
	.policy = gtp_genl_policy,

	.netnsok	= true,

	.module		= THIS_MODULE,

	.ops		= gtp_genl_ops,

	.n_ops		= ARRAY_SIZE(gtp_genl_ops),

	.small_ops	= gtp_genl_ops,

	.n_small_ops	= ARRAY_SIZE(gtp_genl_ops),

	.mcgrps		= gtp_genl_mcgrps,

	.n_mcgrps	= ARRAY_SIZE(gtp_genl_mcgrps),

};

drivers/net/ieee802154/mac802154_hwsim.c

+3 −3
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ static const struct nla_policy hwsim_genl_policy[MAC802154_HWSIM_ATTR_MAX + 1] = 
};



/* Generic Netlink operations array */

static const struct genl_ops hwsim_nl_ops[] = {

static const struct genl_small_ops hwsim_nl_ops[] = {

	{

		.cmd = MAC802154_HWSIM_CMD_NEW_RADIO,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
@@ -628,8 +628,8 @@ static struct genl_family hwsim_genl_family __ro_after_init = { 
	.maxattr = MAC802154_HWSIM_ATTR_MAX,

	.policy = hwsim_genl_policy,

	.module = THIS_MODULE,

	.ops = hwsim_nl_ops,

	.n_ops = ARRAY_SIZE(hwsim_nl_ops),

	.small_ops = hwsim_nl_ops,

	.n_small_ops = ARRAY_SIZE(hwsim_nl_ops),

	.mcgrps = hwsim_mcgrps,

	.n_mcgrps = ARRAY_SIZE(hwsim_mcgrps),

};

drivers/net/macsec.c

+3 −3
Original line number Diff line number Diff line
@@ -3285,7 +3285,7 @@ static int macsec_dump_txsc(struct sk_buff *skb, struct netlink_callback *cb) 
	return skb->len;

}



static const struct genl_ops macsec_genl_ops[] = {

static const struct genl_small_ops macsec_genl_ops[] = {

	{

		.cmd = MACSEC_CMD_GET_TXSC,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
@@ -3361,8 +3361,8 @@ static struct genl_family macsec_fam __ro_after_init = { 
	.policy = macsec_genl_policy,

	.netnsok	= true,

	.module		= THIS_MODULE,

	.ops		= macsec_genl_ops,

	.n_ops		= ARRAY_SIZE(macsec_genl_ops),

	.small_ops	= macsec_genl_ops,

	.n_small_ops	= ARRAY_SIZE(macsec_genl_ops),

};



static netdev_tx_t macsec_start_xmit(struct sk_buff *skb,

drivers/net/team/team.c

+3 −3
Original line number Diff line number Diff line
@@ -2795,7 +2795,7 @@ static int team_nl_cmd_port_list_get(struct sk_buff *skb, 
	return err;

}



static const struct genl_ops team_nl_ops[] = {

static const struct genl_small_ops team_nl_ops[] = {

	{

		.cmd = TEAM_CMD_NOOP,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
@@ -2832,8 +2832,8 @@ static struct genl_family team_nl_family __ro_after_init = { 
	.policy = team_nl_policy,

	.netnsok	= true,

	.module		= THIS_MODULE,

	.ops		= team_nl_ops,

	.n_ops		= ARRAY_SIZE(team_nl_ops),

	.small_ops	= team_nl_ops,

	.n_small_ops	= ARRAY_SIZE(team_nl_ops),

	.mcgrps		= team_nl_mcgrps,

	.n_mcgrps	= ARRAY_SIZE(team_nl_mcgrps),

};