Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec6743a1 authored by Vlad Buslov's avatar Vlad Buslov Committed by David S. Miller
Browse files

net: sched: track rtnl lock status when validating extensions 



Actions API is already updated to not rely on rtnl lock for
synchronization. However, it need to be provided with rtnl status when
called from classifiers API in order to be able to correctly release the
lock when loading kernel module.

Extend extension validation function with 'rtnl_held' flag which is passed
to actions API. Add new 'rtnl_held' parameter to tcf_exts_validate() in cls
API. No classifier is currently updated to support unlocked execution, so
pass hardcoded 'true' flag parameter value.

Signed-off-by: default avatarVlad Buslov <vladbu@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 726d0612

include/net/pkt_cls.h

+1 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ tcf_exts_exec(struct sk_buff *skb, struct tcf_exts *exts, 


int tcf_exts_validate(struct net *net, struct tcf_proto *tp,

		      struct nlattr **tb, struct nlattr *rate_tlv,

		      struct tcf_exts *exts, bool ovr,

		      struct tcf_exts *exts, bool ovr, bool rtnl_held,

		      struct netlink_ext_ack *extack);

void tcf_exts_destroy(struct tcf_exts *exts);

void tcf_exts_change(struct tcf_exts *dst, struct tcf_exts *src);

net/sched/cls_api.c

+5 −4
Original line number Diff line number Diff line
@@ -2841,7 +2841,7 @@ EXPORT_SYMBOL(tcf_exts_destroy); 


int tcf_exts_validate(struct net *net, struct tcf_proto *tp, struct nlattr **tb,

		      struct nlattr *rate_tlv, struct tcf_exts *exts, bool ovr,

		      struct netlink_ext_ack *extack)

		      bool rtnl_held, struct netlink_ext_ack *extack)

{

#ifdef CONFIG_NET_CLS_ACT

	{
@@ -2851,7 +2851,8 @@ int tcf_exts_validate(struct net *net, struct tcf_proto *tp, struct nlattr **tb, 
		if (exts->police && tb[exts->police]) {

			act = tcf_action_init_1(net, tp, tb[exts->police],

						rate_tlv, "police", ovr,

						TCA_ACT_BIND, true, extack);

						TCA_ACT_BIND, rtnl_held,

						extack);

			if (IS_ERR(act))

				return PTR_ERR(act);
@@ -2863,8 +2864,8 @@ int tcf_exts_validate(struct net *net, struct tcf_proto *tp, struct nlattr **tb, 


			err = tcf_action_init(net, tp, tb[exts->action],

					      rate_tlv, NULL, ovr, TCA_ACT_BIND,

					      exts->actions, &attr_size, true,

					      extack);

					      exts->actions, &attr_size,

					      rtnl_held, extack);

			if (err < 0)

				return err;

			exts->nr_actions = err;

net/sched/cls_basic.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static int basic_set_parms(struct net *net, struct tcf_proto *tp, 
{

	int err;



	err = tcf_exts_validate(net, tp, tb, est, &f->exts, ovr, extack);

	err = tcf_exts_validate(net, tp, tb, est, &f->exts, ovr, true, extack);

	if (err < 0)

		return err;

net/sched/cls_bpf.c

+2 −1
Original line number Diff line number Diff line
@@ -417,7 +417,8 @@ static int cls_bpf_set_parms(struct net *net, struct tcf_proto *tp, 
	if ((!is_bpf && !is_ebpf) || (is_bpf && is_ebpf))

		return -EINVAL;



	ret = tcf_exts_validate(net, tp, tb, est, &prog->exts, ovr, extack);

	ret = tcf_exts_validate(net, tp, tb, est, &prog->exts, ovr, true,

				extack);

	if (ret < 0)

		return ret;

net/sched/cls_cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static int cls_cgroup_change(struct net *net, struct sk_buff *in_skb, 
		goto errout;



	err = tcf_exts_validate(net, tp, tb, tca[TCA_RATE], &new->exts, ovr,

				extack);

				true, extack);

	if (err < 0)

		goto errout;