Commit 4dd78a73 authored by Maxim Mikityanskiy's avatar Maxim Mikityanskiy Committed by Jakub Kicinski
Browse files

net: sched: Add extack to Qdisc_class_ops.delete 



In a following commit, sch_htb will start using extack in the delete
class operation to pass hardware errors in offload mode. This commit
prepares for that by adding the extack parameter to this callback and
converting usage of the existing qdiscs.

Signed-off-by: default avatarMaxim Mikityanskiy <maximmi@mellanox.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ca1e4ab1

include/net/sch_generic.h

+2 −1
Original line number Diff line number Diff line
@@ -210,7 +210,8 @@ struct Qdisc_class_ops { 
	int			(*change)(struct Qdisc *, u32, u32,

					struct nlattr **, unsigned long *,

					struct netlink_ext_ack *);

	int			(*delete)(struct Qdisc *, unsigned long);

	int			(*delete)(struct Qdisc *, unsigned long,

					  struct netlink_ext_ack *);

	void			(*walk)(struct Qdisc *, struct qdisc_walker * arg);



	/* Filter manipulation */

net/sched/sch_api.c

+4 −3
Original line number Diff line number Diff line
@@ -1866,7 +1866,8 @@ static int tclass_notify(struct net *net, struct sk_buff *oskb, 
static int tclass_del_notify(struct net *net,

			     const struct Qdisc_class_ops *cops,

			     struct sk_buff *oskb, struct nlmsghdr *n,

			     struct Qdisc *q, unsigned long cl)

			     struct Qdisc *q, unsigned long cl,

			     struct netlink_ext_ack *extack)

{

	u32 portid = oskb ? NETLINK_CB(oskb).portid : 0;

	struct sk_buff *skb;
@@ -1885,7 +1886,7 @@ static int tclass_del_notify(struct net *net, 
		return -EINVAL;

	}



	err = cops->delete(q, cl);

	err = cops->delete(q, cl, extack);

	if (err) {

		kfree_skb(skb);

		return err;
@@ -2088,7 +2089,7 @@ static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n, 
				goto out;

			break;

		case RTM_DELTCLASS:

			err = tclass_del_notify(net, cops, skb, n, q, cl);

			err = tclass_del_notify(net, cops, skb, n, q, cl, extack);

			/* Unbind the class with flilters with 0 */

			tc_bind_tclass(q, portid, clid, 0);

			goto out;

net/sched/sch_atm.c

+2 −1
Original line number Diff line number Diff line
@@ -320,7 +320,8 @@ static int atm_tc_change(struct Qdisc *sch, u32 classid, u32 parent, 
	return error;

}



static int atm_tc_delete(struct Qdisc *sch, unsigned long arg)

static int atm_tc_delete(struct Qdisc *sch, unsigned long arg,

			 struct netlink_ext_ack *extack)

{

	struct atm_qdisc_data *p = qdisc_priv(sch);

	struct atm_flow_data *flow = (struct atm_flow_data *)arg;

net/sched/sch_cbq.c

+2 −1
Original line number Diff line number Diff line
@@ -1675,7 +1675,8 @@ cbq_change_class(struct Qdisc *sch, u32 classid, u32 parentid, struct nlattr **t 
	return err;

}



static int cbq_delete(struct Qdisc *sch, unsigned long arg)

static int cbq_delete(struct Qdisc *sch, unsigned long arg,

		      struct netlink_ext_ack *extack)

{

	struct cbq_sched_data *q = qdisc_priv(sch);

	struct cbq_class *cl = (struct cbq_class *)arg;

net/sched/sch_drr.c

+2 −1
Original line number Diff line number Diff line
@@ -146,7 +146,8 @@ static void drr_destroy_class(struct Qdisc *sch, struct drr_class *cl) 
	kfree(cl);

}



static int drr_delete_class(struct Qdisc *sch, unsigned long arg)

static int drr_delete_class(struct Qdisc *sch, unsigned long arg,

			    struct netlink_ext_ack *extack)

{

	struct drr_sched *q = qdisc_priv(sch);

	struct drr_class *cl = (struct drr_class *)arg;