Commit a0596c2c authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Jakub Kicinski
Browse files

net: fib_rules: Factorise fib_newrule() and fib_delrule(). 



fib_nl_newrule() / fib_nl_delrule() is the doit() handler for
RTM_NEWRULE / RTM_DELRULE but also called from vrf_newlink().

Currently, we hold RTNL on both paths but will not on the former.

Also, we set dev_net(dev)->rtnl to skb->sk in vrf_fib_rule() because
fib_nl_newrule() / fib_nl_delrule() fetch net as sock_net(skb->sk).

Let's Factorise the two functions and pass net and rtnl_held flag.

Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
Tested-by: default avatarIdo Schimmel <idosch@nvidia.com>
Link: https://patch.msgid.link/20250207072502.87775-6-kuniyu@amazon.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5a1ccffd

drivers/net/vrf.c

+2 −4
Original line number Diff line number Diff line
@@ -1537,14 +1537,12 @@ static int vrf_fib_rule(const struct net_device *dev, __u8 family, bool add_it) 


	nlmsg_end(skb, nlh);



	/* fib_nl_{new,del}rule handling looks for net from skb->sk */

	skb->sk = dev_net(dev)->rtnl;

	if (add_it) {

		err = fib_nl_newrule(skb, nlh, NULL);

		err = fib_newrule(dev_net(dev), skb, nlh, NULL, true);

		if (err == -EEXIST)

			err = 0;

	} else {

		err = fib_nl_delrule(skb, nlh, NULL);

		err = fib_delrule(dev_net(dev), skb, nlh, NULL, true);

		if (err == -ENOENT)

			err = 0;

	}

include/net/fib_rules.h

+4 −4
Original line number Diff line number Diff line
@@ -178,10 +178,10 @@ int fib_rules_dump(struct net *net, struct notifier_block *nb, int family, 
		   struct netlink_ext_ack *extack);

unsigned int fib_rules_seq_read(const struct net *net, int family);



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

		   struct netlink_ext_ack *extack);

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

		   struct netlink_ext_ack *extack);

int fib_newrule(struct net *net, struct sk_buff *skb, struct nlmsghdr *nlh,

		struct netlink_ext_ack *extack, bool rtnl_held);

int fib_delrule(struct net *net, struct sk_buff *skb, struct nlmsghdr *nlh,

		struct netlink_ext_ack *extack, bool rtnl_held);



INDIRECT_CALLABLE_DECLARE(int fib6_rule_match(struct fib_rule *rule,

					    struct flowi *fl, int flags));

net/core/fib_rules.c

+23 −13
Original line number Diff line number Diff line
@@ -783,15 +783,14 @@ static const struct nla_policy fib_rule_policy[FRA_MAX + 1] = { 
	[FRA_FLOWLABEL_MASK] = { .type = NLA_BE32 },

};



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

		   struct netlink_ext_ack *extack)

int fib_newrule(struct net *net, struct sk_buff *skb, struct nlmsghdr *nlh,

		struct netlink_ext_ack *extack, bool rtnl_held)

{

	struct net *net = sock_net(skb->sk);

	struct fib_rule *rule = NULL, *r, *last = NULL;

	struct fib_rule_hdr *frh = nlmsg_data(nlh);

	int err = -EINVAL, unresolved = 0;

	struct fib_rules_ops *ops = NULL;

	struct fib_rule *rule = NULL, *r, *last = NULL;

	struct nlattr *tb[FRA_MAX + 1];

	int err = -EINVAL, unresolved = 0;

	bool user_priority = false;



	if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*frh))) {
@@ -893,18 +892,23 @@ int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr *nlh, 
	rules_ops_put(ops);

	return err;

}

EXPORT_SYMBOL_GPL(fib_nl_newrule);

EXPORT_SYMBOL_GPL(fib_newrule);



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

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

			  struct netlink_ext_ack *extack)

{

	struct net *net = sock_net(skb->sk);

	return fib_newrule(sock_net(skb->sk), skb, nlh, extack, true);

}



int fib_delrule(struct net *net, struct sk_buff *skb, struct nlmsghdr *nlh,

		struct netlink_ext_ack *extack, bool rtnl_held)

{

	struct fib_rule *rule = NULL, *nlrule = NULL;

	struct fib_rule_hdr *frh = nlmsg_data(nlh);

	struct fib_rules_ops *ops = NULL;

	struct fib_rule *rule = NULL, *r, *nlrule = NULL;

	struct nlattr *tb[FRA_MAX+1];

	int err = -EINVAL;

	bool user_priority = false;

	int err = -EINVAL;



	if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*frh))) {

		NL_SET_ERR_MSG(extack, "Invalid msg length");
@@ -969,7 +973,7 @@ int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr *nlh, 
	 * current if it is goto rule, have actually been added.

	 */

	if (ops->nr_goto_rules > 0) {

		struct fib_rule *n;

		struct fib_rule *n, *r;



		n = list_next_entry(rule, list);

		if (&n->list == &ops->rules_list || n->pref != rule->pref)
@@ -998,7 +1002,13 @@ int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr *nlh, 
	rules_ops_put(ops);

	return err;

}

EXPORT_SYMBOL_GPL(fib_nl_delrule);

EXPORT_SYMBOL_GPL(fib_delrule);



static int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr *nlh,

			  struct netlink_ext_ack *extack)

{

	return fib_delrule(sock_net(skb->sk), skb, nlh, extack, true);

}



static inline size_t fib_rule_nlmsg_size(struct fib_rules_ops *ops,

					 struct fib_rule *rule)