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

Commit 7306db38 authored by Alexander Aring's avatar Alexander Aring Committed by David S. Miller
Browse files

net: sched: cls: add extack support for change callback 



This patch adds extack support for classifier change callback api. This
prepares to handle extack support inside each specific classifier
implementation.

Cc: David Ahern <dsahern@gmail.com>
Signed-off-by: default avatarAlexander Aring <aring@mojatatu.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c35a4acc

include/net/sch_generic.h

+2 −1
Original line number Diff line number Diff line
@@ -239,7 +239,8 @@ struct tcf_proto_ops { 
	int			(*change)(struct net *net, struct sk_buff *,

					struct tcf_proto*, unsigned long,

					u32 handle, struct nlattr **,

					void **, bool);

					void **, bool,

					struct netlink_ext_ack *);

	int			(*delete)(struct tcf_proto *tp, void *arg,

					  bool *last);

	void			(*walk)(struct tcf_proto*, struct tcf_walker *arg);

net/sched/cls_api.c

+2 −1
Original line number Diff line number Diff line
@@ -1231,7 +1231,8 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, 
	}



	err = tp->ops->change(net, skb, tp, cl, t->tcm_handle, tca, &fh,

			      n->nlmsg_flags & NLM_F_CREATE ? TCA_ACT_NOREPLACE : TCA_ACT_REPLACE);

			      n->nlmsg_flags & NLM_F_CREATE ? TCA_ACT_NOREPLACE : TCA_ACT_REPLACE,

			      extack);

	if (err == 0) {

		if (tp_created)

			tcf_chain_tp_insert(chain, &chain_info, tp);

net/sched/cls_basic.c

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


static int basic_change(struct net *net, struct sk_buff *in_skb,

			struct tcf_proto *tp, unsigned long base, u32 handle,

			struct nlattr **tca, void **arg, bool ovr)

			struct nlattr **tca, void **arg, bool ovr,

			struct netlink_ext_ack *extack)

{

	int err;

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

net/sched/cls_bpf.c

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ static int cls_bpf_set_parms(struct net *net, struct tcf_proto *tp, 
static int cls_bpf_change(struct net *net, struct sk_buff *in_skb,

			  struct tcf_proto *tp, unsigned long base,

			  u32 handle, struct nlattr **tca,

			  void **arg, bool ovr)

			  void **arg, bool ovr, struct netlink_ext_ack *extack)

{

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

	struct cls_bpf_prog *oldprog = *arg;

net/sched/cls_cgroup.c

+2 −1
Original line number Diff line number Diff line
@@ -91,7 +91,8 @@ static void cls_cgroup_destroy_rcu(struct rcu_head *root) 
static int cls_cgroup_change(struct net *net, struct sk_buff *in_skb,

			     struct tcf_proto *tp, unsigned long base,

			     u32 handle, struct nlattr **tca,

			     void **arg, bool ovr)

			     void **arg, bool ovr,

			     struct netlink_ext_ack *extack)

{

	struct nlattr *tb[TCA_CGROUP_MAX + 1];

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