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

net: sch: api: add extack support in qdisc_create_dflt 



This patch adds extack support for the function qdisc_create_dflt which is
a common used function in the tc subsystem. Callers which are interested
in the receiving error can assign extack to get a more detailed
information why qdisc_create_dflt failed. The function qdisc_create_dflt
will also call an init callback which can fail by any per-qdisc specific
handling.

Cc: David Ahern <dsahern@gmail.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarAlexander Aring <aring@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d0bd684d

include/net/pkt_sched.h

+2 −1
Original line number Diff line number Diff line
@@ -89,7 +89,8 @@ extern struct Qdisc_ops pfifo_head_drop_qdisc_ops; 


int fifo_set_limit(struct Qdisc *q, unsigned int limit);

struct Qdisc *fifo_create_dflt(struct Qdisc *sch, struct Qdisc_ops *ops,

			       unsigned int limit);

			       unsigned int limit,

			       struct netlink_ext_ack *extack);



int register_qdisc(struct Qdisc_ops *qops);

int unregister_qdisc(struct Qdisc_ops *qops);

include/net/sch_generic.h

+2 −1
Original line number Diff line number Diff line
@@ -474,7 +474,8 @@ struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue, 
			  const struct Qdisc_ops *ops,

			  struct netlink_ext_ack *extack);

struct Qdisc *qdisc_create_dflt(struct netdev_queue *dev_queue,

				const struct Qdisc_ops *ops, u32 parentid);

				const struct Qdisc_ops *ops, u32 parentid,

				struct netlink_ext_ack *extack);

void __qdisc_calculate_pkt_len(struct sk_buff *skb,

			       const struct qdisc_size_table *stab);

int skb_do_redirect(struct sk_buff *);

net/sched/sch_atm.c

+3 −2
Original line number Diff line number Diff line
@@ -290,7 +290,8 @@ static int atm_tc_change(struct Qdisc *sch, u32 classid, u32 parent, 
		goto err_out;

	}



	flow->q = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops, classid);

	flow->q = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops, classid,

				    extack);

	if (!flow->q)

		flow->q = &noop_qdisc;

	pr_debug("atm_tc_change: qdisc %p\n", flow->q);
@@ -546,7 +547,7 @@ static int atm_tc_init(struct Qdisc *sch, struct nlattr *opt, 
	INIT_LIST_HEAD(&p->link.list);

	list_add(&p->link.list, &p->flows);

	p->link.q = qdisc_create_dflt(sch->dev_queue,

				      &pfifo_qdisc_ops, sch->handle);

				      &pfifo_qdisc_ops, sch->handle, extack);

	if (!p->link.q)

		p->link.q = &noop_qdisc;

	pr_debug("atm_tc_init: link (%p) qdisc %p\n", &p->link, p->link.q);

net/sched/sch_cbq.c

+5 −4
Original line number Diff line number Diff line
@@ -1172,7 +1172,7 @@ static int cbq_init(struct Qdisc *sch, struct nlattr *opt, 
	q->link.common.classid = sch->handle;

	q->link.qdisc = sch;

	q->link.q = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops,

				      sch->handle);

				      sch->handle, NULL);

	if (!q->link.q)

		q->link.q = &noop_qdisc;

	else
@@ -1376,8 +1376,8 @@ static int cbq_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new, 
	struct cbq_class *cl = (struct cbq_class *)arg;



	if (new == NULL) {

		new = qdisc_create_dflt(sch->dev_queue,

					&pfifo_qdisc_ops, cl->common.classid);

		new = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops,

					cl->common.classid, extack);

		if (new == NULL)

			return -ENOBUFS;

	}
@@ -1596,7 +1596,8 @@ cbq_change_class(struct Qdisc *sch, u32 classid, u32 parentid, struct nlattr **t 


	cl->R_tab = rtab;

	rtab = NULL;

	cl->q = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops, classid);

	cl->q = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops, classid,

				  NULL);

	if (!cl->q)

		cl->q = &noop_qdisc;

	else

net/sched/sch_drr.c

+4 −3
Original line number Diff line number Diff line
@@ -114,7 +114,8 @@ static int drr_change_class(struct Qdisc *sch, u32 classid, u32 parentid, 
	cl->common.classid = classid;

	cl->quantum	   = quantum;

	cl->qdisc	   = qdisc_create_dflt(sch->dev_queue,

					       &pfifo_qdisc_ops, classid);

					       &pfifo_qdisc_ops, classid,

					       NULL);

	if (cl->qdisc == NULL)

		cl->qdisc = &noop_qdisc;

	else
@@ -209,8 +210,8 @@ static int drr_graft_class(struct Qdisc *sch, unsigned long arg, 
	struct drr_class *cl = (struct drr_class *)arg;



	if (new == NULL) {

		new = qdisc_create_dflt(sch->dev_queue,

					&pfifo_qdisc_ops, cl->common.classid);

		new = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops,

					cl->common.classid, NULL);

		if (new == NULL)

			new = &noop_qdisc;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE