Commit 0f473bb6 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'fib-merge-nl-policies' 

Florian Westphal says:

====================
fib: merge nl policies

v4: resend with fixed subject line.  I preserved review tags
    from David Ahern.
v3: drop first two patches, otherwise unchanged.

This series merges the different (largely identical) nla policies.

v2 also squashed the ->suppress() implementation, I've dropped this.
Problem is that it needs ugly ifdef'ry to avoid build breakage
with CONFIG_INET=n || IPV6=n.

Given that even microbenchmark doesn't show any noticeable improvement
when ->suppress is inlined (it uses INDIRECT_CALLABLE) i decided to toss
the patch instead of adding more ifdefs.
====================

Link: https://lore.kernel.org/r/20211216120507.3299-1-fw@strlen.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 604ba230 66495f30

include/net/fib_rules.h

+0 −21
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ struct fib_rules_ops { 
	void			(*flush_cache)(struct fib_rules_ops *ops);



	int			nlgroup;

	const struct nla_policy	*policy;

	struct list_head	rules_list;

	struct module		*owner;

	struct net		*fro_net;
@@ -103,26 +102,6 @@ struct fib_rule_notifier_info { 
	struct fib_rule *rule;

};



#define FRA_GENERIC_POLICY \

	[FRA_UNSPEC]	= { .strict_start_type = FRA_DPORT_RANGE + 1 }, \

	[FRA_IIFNAME]	= { .type = NLA_STRING, .len = IFNAMSIZ - 1 }, \

	[FRA_OIFNAME]	= { .type = NLA_STRING, .len = IFNAMSIZ - 1 }, \

	[FRA_PRIORITY]	= { .type = NLA_U32 }, \

	[FRA_FWMARK]	= { .type = NLA_U32 }, \

	[FRA_TUN_ID]	= { .type = NLA_U64 }, \

	[FRA_FWMASK]	= { .type = NLA_U32 }, \

	[FRA_TABLE]     = { .type = NLA_U32 }, \

	[FRA_SUPPRESS_PREFIXLEN] = { .type = NLA_U32 }, \

	[FRA_SUPPRESS_IFGROUP] = { .type = NLA_U32 }, \

	[FRA_GOTO]	= { .type = NLA_U32 }, \

	[FRA_L3MDEV]	= { .type = NLA_U8 }, \

	[FRA_UID_RANGE]	= { .len = sizeof(struct fib_rule_uid_range) }, \

	[FRA_PROTOCOL]  = { .type = NLA_U8 }, \

	[FRA_IP_PROTO]  = { .type = NLA_U8 }, \

	[FRA_SPORT_RANGE] = { .len = sizeof(struct fib_rule_port_range) }, \

	[FRA_DPORT_RANGE] = { .len = sizeof(struct fib_rule_port_range) }





static inline void fib_rule_get(struct fib_rule *rule)

{

	refcount_inc(&rule->refcnt);

net/core/fib_rules.c

+23 −2
Original line number Diff line number Diff line
@@ -750,6 +750,27 @@ static int rule_exists(struct fib_rules_ops *ops, struct fib_rule_hdr *frh, 
	return 0;

}



static const struct nla_policy fib_rule_policy[FRA_MAX + 1] = {

	[FRA_UNSPEC]	= { .strict_start_type = FRA_DPORT_RANGE + 1 },

	[FRA_IIFNAME]	= { .type = NLA_STRING, .len = IFNAMSIZ - 1 },

	[FRA_OIFNAME]	= { .type = NLA_STRING, .len = IFNAMSIZ - 1 },

	[FRA_PRIORITY]	= { .type = NLA_U32 },

	[FRA_FWMARK]	= { .type = NLA_U32 },

	[FRA_FLOW]	= { .type = NLA_U32 },

	[FRA_TUN_ID]	= { .type = NLA_U64 },

	[FRA_FWMASK]	= { .type = NLA_U32 },

	[FRA_TABLE]     = { .type = NLA_U32 },

	[FRA_SUPPRESS_PREFIXLEN] = { .type = NLA_U32 },

	[FRA_SUPPRESS_IFGROUP] = { .type = NLA_U32 },

	[FRA_GOTO]	= { .type = NLA_U32 },

	[FRA_L3MDEV]	= { .type = NLA_U8 },

	[FRA_UID_RANGE]	= { .len = sizeof(struct fib_rule_uid_range) },

	[FRA_PROTOCOL]  = { .type = NLA_U8 },

	[FRA_IP_PROTO]  = { .type = NLA_U8 },

	[FRA_SPORT_RANGE] = { .len = sizeof(struct fib_rule_port_range) },

	[FRA_DPORT_RANGE] = { .len = sizeof(struct fib_rule_port_range) }

};



int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr *nlh,

		   struct netlink_ext_ack *extack)

{
@@ -774,7 +795,7 @@ int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr *nlh, 
	}



	err = nlmsg_parse_deprecated(nlh, sizeof(*frh), tb, FRA_MAX,

				     ops->policy, extack);

				     fib_rule_policy, extack);

	if (err < 0) {

		NL_SET_ERR_MSG(extack, "Error parsing msg");

		goto errout;
@@ -882,7 +903,7 @@ int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr *nlh, 
	}



	err = nlmsg_parse_deprecated(nlh, sizeof(*frh), tb, FRA_MAX,

				     ops->policy, extack);

				     fib_rule_policy, extack);

	if (err < 0) {

		NL_SET_ERR_MSG(extack, "Error parsing msg");

		goto errout;

net/decnet/dn_rules.c

+0 −5
Original line number Diff line number Diff line
@@ -101,10 +101,6 @@ static int dn_fib_rule_action(struct fib_rule *rule, struct flowi *flp, 
	return err;

}



static const struct nla_policy dn_fib_rule_policy[FRA_MAX+1] = {

	FRA_GENERIC_POLICY,

};



static int dn_fib_rule_match(struct fib_rule *rule, struct flowi *fl, int flags)

{

	struct dn_fib_rule *r = (struct dn_fib_rule *)rule;
@@ -235,7 +231,6 @@ static const struct fib_rules_ops __net_initconst dn_fib_rules_ops_template = { 
	.fill		= dn_fib_rule_fill,

	.flush_cache	= dn_fib_rule_flush_cache,

	.nlgroup	= RTNLGRP_DECnet_RULE,

	.policy		= dn_fib_rule_policy,

	.owner		= THIS_MODULE,

	.fro_net	= &init_net,

};

net/ipv4/fib_rules.c

+0 −6
Original line number Diff line number Diff line
@@ -216,11 +216,6 @@ static struct fib_table *fib_empty_table(struct net *net) 
	return NULL;

}



static const struct nla_policy fib4_rule_policy[FRA_MAX+1] = {

	FRA_GENERIC_POLICY,

	[FRA_FLOW]	= { .type = NLA_U32 },

};



static int fib4_rule_configure(struct fib_rule *rule, struct sk_buff *skb,

			       struct fib_rule_hdr *frh,

			       struct nlattr **tb,
@@ -386,7 +381,6 @@ static const struct fib_rules_ops __net_initconst fib4_rules_ops_template = { 
	.nlmsg_payload	= fib4_rule_nlmsg_payload,

	.flush_cache	= fib4_rule_flush_cache,

	.nlgroup	= RTNLGRP_IPV4_RULE,

	.policy		= fib4_rule_policy,

	.owner		= THIS_MODULE,

};

net/ipv4/ipmr.c

+0 −5
Original line number Diff line number Diff line
@@ -195,10 +195,6 @@ static int ipmr_rule_match(struct fib_rule *rule, struct flowi *fl, int flags) 
	return 1;

}



static const struct nla_policy ipmr_rule_policy[FRA_MAX + 1] = {

	FRA_GENERIC_POLICY,

};



static int ipmr_rule_configure(struct fib_rule *rule, struct sk_buff *skb,

			       struct fib_rule_hdr *frh, struct nlattr **tb,

			       struct netlink_ext_ack *extack)
@@ -231,7 +227,6 @@ static const struct fib_rules_ops __net_initconst ipmr_rules_ops_template = { 
	.compare	= ipmr_rule_compare,

	.fill		= ipmr_rule_fill,

	.nlgroup	= RTNLGRP_IPV4_RULE,

	.policy		= ipmr_rule_policy,

	.owner		= THIS_MODULE,

};