Skip to content

Commit

Permalink
net: sched: sch: add extack for init callback
Browse files Browse the repository at this point in the history 
This patch adds extack support for init callback to prepare per-qdisc
specific changes for extack.

Cc: David Ahern <[email protected]>
Acked-by: Jamal Hadi Salim <[email protected]>
Signed-off-by: Alexander Aring <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
@davem330
Alexander Aring authored and davem330 committed Dec 21, 2017
1 parent 0921559 commit e63d7df
Show file tree
Hide file tree
Showing 31 changed files with 74 additions and 37 deletions.
3 changes: 2 additions & 1 deletion include/net/sch_generic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,8 @@ struct Qdisc_ops {
struct sk_buff * (*dequeue)(struct Qdisc *);
struct sk_buff * (*peek)(struct Qdisc *);

int (*init)(struct Qdisc *sch, struct nlattr *arg);
int (*init)(struct Qdisc *sch, struct nlattr *arg,
struct netlink_ext_ack *extack);
void (*reset)(struct Qdisc *);
void (*destroy)(struct Qdisc *);
int (*change)(struct Qdisc *sch,
Expand Down
2 changes: 1 addition & 1 deletion net/sched/sch_api.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1084,7 +1084,7 @@ static struct Qdisc *qdisc_create(struct net_device *dev,
}

if (ops->init) {
err = ops->init(sch, tca[TCA_OPTIONS]);
err = ops->init(sch, tca[TCA_OPTIONS], extack);
if (err != 0)
goto err_out5;
}
Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_atm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,8 @@ static struct sk_buff *atm_tc_peek(struct Qdisc *sch)
return p->link.q->ops->peek(p->link.q);
}

static int atm_tc_init(struct Qdisc *sch, struct nlattr *opt)
static int atm_tc_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct atm_qdisc_data *p = qdisc_priv(sch);
int err;
Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_cbq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1132,7 +1132,8 @@ static const struct nla_policy cbq_policy[TCA_CBQ_MAX + 1] = {
[TCA_CBQ_POLICE] = { .len = sizeof(struct tc_cbq_police) },
};

static int cbq_init(struct Qdisc *sch, struct nlattr *opt)
static int cbq_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct cbq_sched_data *q = qdisc_priv(sch);
struct nlattr *tb[TCA_CBQ_MAX + 1];
Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_cbs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,8 @@ static int cbs_change(struct Qdisc *sch, struct nlattr *opt)
return 0;
}

static int cbs_init(struct Qdisc *sch, struct nlattr *opt)
static int cbs_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct cbs_sched_data *q = qdisc_priv(sch);
struct net_device *dev = qdisc_dev(sch);
Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_choke.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,8 @@ static int choke_change(struct Qdisc *sch, struct nlattr *opt)
return 0;
}

static int choke_init(struct Qdisc *sch, struct nlattr *opt)
static int choke_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
return choke_change(sch, opt);
}
Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_codel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ static int codel_change(struct Qdisc *sch, struct nlattr *opt)
return 0;
}

static int codel_init(struct Qdisc *sch, struct nlattr *opt)
static int codel_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct codel_sched_data *q = qdisc_priv(sch);

Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_drr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,8 @@ static struct sk_buff *drr_dequeue(struct Qdisc *sch)
return NULL;
}

static int drr_init_qdisc(struct Qdisc *sch, struct nlattr *opt)
static int drr_init_qdisc(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct drr_sched *q = qdisc_priv(sch);
int err;
Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_dsmark.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,8 @@ static struct sk_buff *dsmark_peek(struct Qdisc *sch)
return p->q->ops->peek(p->q);
}

static int dsmark_init(struct Qdisc *sch, struct nlattr *opt)
static int dsmark_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct dsmark_qdisc_data *p = qdisc_priv(sch);
struct nlattr *tb[TCA_DSMARK_MAX + 1];
Expand Down
14 changes: 10 additions & 4 deletions net/sched/sch_fifo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ static int pfifo_tail_enqueue(struct sk_buff *skb, struct Qdisc *sch,
return NET_XMIT_CN;
}

static int fifo_init(struct Qdisc *sch, struct nlattr *opt)
static int fifo_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
bool bypass;
bool is_bfifo = sch->ops == &bfifo_qdisc_ops;
Expand Down Expand Up @@ -88,6 +89,11 @@ static int fifo_init(struct Qdisc *sch, struct nlattr *opt)
return 0;
}

static int fifo_change(struct Qdisc *sch, struct nlattr *opt)
{
return fifo_init(sch, opt, NULL);
}

static int fifo_dump(struct Qdisc *sch, struct sk_buff *skb)
{
struct tc_fifo_qopt opt = { .limit = sch->limit };
Expand All @@ -108,7 +114,7 @@ struct Qdisc_ops pfifo_qdisc_ops __read_mostly = {
.peek = qdisc_peek_head,
.init = fifo_init,
.reset = qdisc_reset_queue,
.change = fifo_init,
.change = fifo_change,
.dump = fifo_dump,
.owner = THIS_MODULE,
};
Expand All @@ -122,7 +128,7 @@ struct Qdisc_ops bfifo_qdisc_ops __read_mostly = {
.peek = qdisc_peek_head,
.init = fifo_init,
.reset = qdisc_reset_queue,
.change = fifo_init,
.change = fifo_change,
.dump = fifo_dump,
.owner = THIS_MODULE,
};
Expand All @@ -136,7 +142,7 @@ struct Qdisc_ops pfifo_head_drop_qdisc_ops __read_mostly = {
.peek = qdisc_peek_head,
.init = fifo_init,
.reset = qdisc_reset_queue,
.change = fifo_init,
.change = fifo_change,
.dump = fifo_dump,
.owner = THIS_MODULE,
};
Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_fq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,8 @@ static void fq_destroy(struct Qdisc *sch)
qdisc_watchdog_cancel(&q->watchdog);
}

static int fq_init(struct Qdisc *sch, struct nlattr *opt)
static int fq_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct fq_sched_data *q = qdisc_priv(sch);
int err;
Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_fq_codel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,8 @@ static void fq_codel_destroy(struct Qdisc *sch)
kvfree(q->flows);
}

static int fq_codel_init(struct Qdisc *sch, struct nlattr *opt)
static int fq_codel_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct fq_codel_sched_data *q = qdisc_priv(sch);
int i;
Expand Down
8 changes: 5 additions & 3 deletions net/sched/sch_generic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,8 @@ struct Qdisc noop_qdisc = {
};
EXPORT_SYMBOL(noop_qdisc);

static int noqueue_init(struct Qdisc *qdisc, struct nlattr *opt)
static int noqueue_init(struct Qdisc *qdisc, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
/* register_qdisc() assigns a default of noop_enqueue if unset,
* but __dev_queue_xmit() treats noqueue only as such
Expand Down Expand Up @@ -690,7 +691,8 @@ static int pfifo_fast_dump(struct Qdisc *qdisc, struct sk_buff *skb)
return -1;
}

static int pfifo_fast_init(struct Qdisc *qdisc, struct nlattr *opt)
static int pfifo_fast_init(struct Qdisc *qdisc, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
unsigned int qlen = qdisc_dev(qdisc)->tx_queue_len;
struct pfifo_fast_priv *priv = qdisc_priv(qdisc);
Expand Down Expand Up @@ -840,7 +842,7 @@ struct Qdisc *qdisc_create_dflt(struct netdev_queue *dev_queue,
}
sch->parent = parentid;

if (!ops->init || ops->init(sch, NULL) == 0)
if (!ops->init || ops->init(sch, NULL, NULL) == 0)
return sch;

qdisc_destroy(sch);
Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_gred.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,8 @@ static int gred_change(struct Qdisc *sch, struct nlattr *opt)
return err;
}

static int gred_init(struct Qdisc *sch, struct nlattr *opt)
static int gred_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct nlattr *tb[TCA_GRED_MAX + 1];
int err;
Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_hfsc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1388,7 +1388,8 @@ hfsc_schedule_watchdog(struct Qdisc *sch)
}

static int
hfsc_init_qdisc(struct Qdisc *sch, struct nlattr *opt)
hfsc_init_qdisc(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct hfsc_sched *q = qdisc_priv(sch);
struct tc_hfsc_qopt *qopt;
Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_hhf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,8 @@ static int hhf_change(struct Qdisc *sch, struct nlattr *opt)
return 0;
}

static int hhf_init(struct Qdisc *sch, struct nlattr *opt)
static int hhf_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct hhf_sched_data *q = qdisc_priv(sch);
int i;
Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_htb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1017,7 +1017,8 @@ static void htb_work_func(struct work_struct *work)
rcu_read_unlock();
}

static int htb_init(struct Qdisc *sch, struct nlattr *opt)
static int htb_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct htb_sched *q = qdisc_priv(sch);
struct nlattr *tb[TCA_HTB_MAX + 1];
Expand Down
6 changes: 4 additions & 2 deletions net/sched/sch_ingress.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ static void clsact_chain_head_change(struct tcf_proto *tp_head, void *priv)
mini_qdisc_pair_swap(miniqp, tp_head);
}

static int ingress_init(struct Qdisc *sch, struct nlattr *opt)
static int ingress_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct ingress_sched_data *q = qdisc_priv(sch);
struct net_device *dev = qdisc_dev(sch);
Expand Down Expand Up @@ -167,7 +168,8 @@ static struct tcf_block *clsact_tcf_block(struct Qdisc *sch, unsigned long cl)
}
}

static int clsact_init(struct Qdisc *sch, struct nlattr *opt)
static int clsact_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct clsact_sched_data *q = qdisc_priv(sch);
struct net_device *dev = qdisc_dev(sch);
Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_mq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ static void mq_destroy(struct Qdisc *sch)
kfree(priv->qdiscs);
}

static int mq_init(struct Qdisc *sch, struct nlattr *opt)
static int mq_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct net_device *dev = qdisc_dev(sch);
struct mq_sched *priv = qdisc_priv(sch);
Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_mqprio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@ static int parse_attr(struct nlattr *tb[], int maxtype, struct nlattr *nla,
return 0;
}

static int mqprio_init(struct Qdisc *sch, struct nlattr *opt)
static int mqprio_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct net_device *dev = qdisc_dev(sch);
struct mqprio_sched *priv = qdisc_priv(sch);
Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_multiq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,8 @@ static int multiq_tune(struct Qdisc *sch, struct nlattr *opt)
return 0;
}

static int multiq_init(struct Qdisc *sch, struct nlattr *opt)
static int multiq_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct multiq_sched_data *q = qdisc_priv(sch);
int i, err;
Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_netem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -984,7 +984,8 @@ static int netem_change(struct Qdisc *sch, struct nlattr *opt)
return ret;
}

static int netem_init(struct Qdisc *sch, struct nlattr *opt)
static int netem_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct netem_sched_data *q = qdisc_priv(sch);
int ret;
Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_pie.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,8 @@ static void pie_timer(struct timer_list *t)

}

static int pie_init(struct Qdisc *sch, struct nlattr *opt)
static int pie_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct pie_sched_data *q = qdisc_priv(sch);

Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_plug.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ static struct sk_buff *plug_dequeue(struct Qdisc *sch)
return qdisc_dequeue_head(sch);
}

static int plug_init(struct Qdisc *sch, struct nlattr *opt)
static int plug_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct plug_sched_data *q = qdisc_priv(sch);

Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_prio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,8 @@ static int prio_tune(struct Qdisc *sch, struct nlattr *opt)
return 0;
}

static int prio_init(struct Qdisc *sch, struct nlattr *opt)
static int prio_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct prio_sched_data *q = qdisc_priv(sch);
int err;
Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_qfq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1413,7 +1413,8 @@ static void qfq_qlen_notify(struct Qdisc *sch, unsigned long arg)
qfq_deactivate_class(q, cl);
}

static int qfq_init_qdisc(struct Qdisc *sch, struct nlattr *opt)
static int qfq_init_qdisc(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct qfq_sched *q = qdisc_priv(sch);
struct qfq_group *grp;
Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_red.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,8 @@ static inline void red_adaptative_timer(struct timer_list *t)
spin_unlock(root_lock);
}

static int red_init(struct Qdisc *sch, struct nlattr *opt)
static int red_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct red_sched_data *q = qdisc_priv(sch);

Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_sfb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,8 @@ static int sfb_change(struct Qdisc *sch, struct nlattr *opt)
return 0;
}

static int sfb_init(struct Qdisc *sch, struct nlattr *opt)
static int sfb_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct sfb_sched_data *q = qdisc_priv(sch);
int err;
Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_sfq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,8 @@ static void sfq_destroy(struct Qdisc *sch)
kfree(q->red_parms);
}

static int sfq_init(struct Qdisc *sch, struct nlattr *opt)
static int sfq_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct sfq_sched_data *q = qdisc_priv(sch);
int i;
Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_tbf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,8 @@ static int tbf_change(struct Qdisc *sch, struct nlattr *opt)
return err;
}

static int tbf_init(struct Qdisc *sch, struct nlattr *opt)
static int tbf_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct tbf_sched_data *q = qdisc_priv(sch);

Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_teql.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ teql_destroy(struct Qdisc *sch)
}
}

static int teql_qdisc_init(struct Qdisc *sch, struct nlattr *opt)
static int teql_qdisc_init(struct Qdisc *sch, struct nlattr *opt,
struct netlink_ext_ack *extack)
{
struct net_device *dev = qdisc_dev(sch);
struct teql_master *m = (struct teql_master *)sch->ops;
Expand Down

0 comments on commit e63d7df

Please sign in to comment.