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

Commit 715df5ec authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

net: sched: propagate extack to cls->destroy callbacks 



Propagate extack to cls->destroy callbacks when called from
non-error paths.  On error paths pass NULL to avoid overwriting
the failure message.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 46410c2e

include/net/sch_generic.h

+2 −1
Original line number Diff line number Diff line
@@ -233,7 +233,8 @@ struct tcf_proto_ops { 
					    const struct tcf_proto *,

					    struct tcf_result *);

	int			(*init)(struct tcf_proto*);

	void			(*destroy)(struct tcf_proto*);

	void			(*destroy)(struct tcf_proto *tp,

					   struct netlink_ext_ack *extack);



	void*			(*get)(struct tcf_proto*, u32 handle);

	int			(*change)(struct net *net, struct sk_buff *,

net/sched/cls_api.c

+8 −7
Original line number Diff line number Diff line
@@ -172,9 +172,10 @@ static struct tcf_proto *tcf_proto_create(const char *kind, u32 protocol, 
	return ERR_PTR(err);

}



static void tcf_proto_destroy(struct tcf_proto *tp)

static void tcf_proto_destroy(struct tcf_proto *tp,

			      struct netlink_ext_ack *extack)

{

	tp->ops->destroy(tp);

	tp->ops->destroy(tp, extack);

	module_put(tp->ops->owner);

	kfree_rcu(tp, rcu);

}
@@ -223,7 +224,7 @@ static void tcf_chain_flush(struct tcf_chain *chain) 
	tcf_chain_head_change(chain, NULL);

	while (tp) {

		RCU_INIT_POINTER(chain->filter_chain, tp->next);

		tcf_proto_destroy(tp);

		tcf_proto_destroy(tp, NULL);

		tp = rtnl_dereference(chain->filter_chain);

		tcf_chain_put(chain);

	}
@@ -1182,7 +1183,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, 
			tcf_chain_tp_remove(chain, &chain_info, tp);

			tfilter_notify(net, skb, n, tp, block, q, parent, fh,

				       RTM_DELTFILTER, false);

			tcf_proto_destroy(tp);

			tcf_proto_destroy(tp, extack);

			err = 0;

			goto errout;

		}
@@ -1200,7 +1201,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, 
		case RTM_NEWTFILTER:

			if (n->nlmsg_flags & NLM_F_EXCL) {

				if (tp_created)

					tcf_proto_destroy(tp);

					tcf_proto_destroy(tp, NULL);

				NL_SET_ERR_MSG(extack, "Filter already exists");

				err = -EEXIST;

				goto errout;
@@ -1214,7 +1215,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, 
				goto errout;

			if (last) {

				tcf_chain_tp_remove(chain, &chain_info, tp);

				tcf_proto_destroy(tp);

				tcf_proto_destroy(tp, extack);

			}

			goto errout;

		case RTM_GETTFILTER:
@@ -1240,7 +1241,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, 
			       RTM_NEWTFILTER, false);

	} else {

		if (tp_created)

			tcf_proto_destroy(tp);

			tcf_proto_destroy(tp, NULL);

	}



errout:

net/sched/cls_basic.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static void basic_delete_filter(struct rcu_head *head) 
	tcf_queue_work(&f->work);

}



static void basic_destroy(struct tcf_proto *tp)

static void basic_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack)

{

	struct basic_head *head = rtnl_dereference(tp->root);

	struct basic_filter *f, *n;

net/sched/cls_bpf.c

+2 −1
Original line number Diff line number Diff line
@@ -314,7 +314,8 @@ static int cls_bpf_delete(struct tcf_proto *tp, void *arg, bool *last, 
	return 0;

}



static void cls_bpf_destroy(struct tcf_proto *tp)

static void cls_bpf_destroy(struct tcf_proto *tp,

			    struct netlink_ext_ack *extack)

{

	struct cls_bpf_head *head = rtnl_dereference(tp->root);

	struct cls_bpf_prog *prog, *tmp;

net/sched/cls_cgroup.c

+2 −1
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@ static int cls_cgroup_change(struct net *net, struct sk_buff *in_skb, 
	return err;

}



static void cls_cgroup_destroy(struct tcf_proto *tp)

static void cls_cgroup_destroy(struct tcf_proto *tp,

			       struct netlink_ext_ack *extack)

{

	struct cls_cgroup_head *head = rtnl_dereference(tp->root);