net: sched: sch: add extack for block callback

Alexander Aring · davem330 · commit cbaacc4e8a39 · 2017-12-21T12:32:50.000-05:00
This patch adds extack support for block callback to prepare per-qdisc
specific changes for extack.

Cc: David Ahern &lt;dsahern@gmail.com&gt;
Acked-by: Jamal Hadi Salim &lt;jhs@mojatatu.com&gt;
Signed-off-by: Alexander Aring &lt;aring@mojatatu.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
@@ -165,7 +165,8 @@ struct Qdisc_class_ops {
 
 	/* Filter manipulation */
 	struct tcf_block *	(*tcf_block)(struct Qdisc *sch,
-					     unsigned long arg);
+					     unsigned long arg,
+					     struct netlink_ext_ack *extack);
 	unsigned long		(*bind_tcf)(struct Qdisc *, unsigned long,
 					u32 classid);
 	void			(*unbind_tcf)(struct Qdisc *, unsigned long);
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
@@ -793,7 +793,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n,
 	}
 
 	/* And the last stroke */
-	block = cops->tcf_block(q, cl);
+	block = cops->tcf_block(q, cl, extack);
 	if (!block) {
 		err = -EINVAL;
 		goto errout;
@@ -1040,7 +1040,7 @@ static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb)
 		if (cl == 0)
 			goto out;
 	}
-	block = cops->tcf_block(q, cl);
+	block = cops->tcf_block(q, cl, NULL);
 	if (!block)
 		goto out;
 
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
@@ -1760,7 +1760,7 @@ static void tc_bind_tclass(struct Qdisc *q, u32 portid, u32 clid,
 	cl = cops->find(q, portid);
 	if (!cl)
 		return;
-	block = cops->tcf_block(q, cl);
+	block = cops->tcf_block(q, cl, NULL);
 	if (!block)
 		return;
 	list_for_each_entry(chain, &block->chain_list, list) {
diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c
@@ -357,7 +357,8 @@ static void atm_tc_walk(struct Qdisc *sch, struct qdisc_walker *walker)
 	}
 }
 
-static struct tcf_block *atm_tc_tcf_block(struct Qdisc *sch, unsigned long cl)
+static struct tcf_block *atm_tc_tcf_block(struct Qdisc *sch, unsigned long cl,
+					  struct netlink_ext_ack *extack)
 {
 	struct atm_qdisc_data *p = qdisc_priv(sch);
 	struct atm_flow_data *flow = (struct atm_flow_data *)cl;
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
@@ -1679,7 +1679,8 @@ static int cbq_delete(struct Qdisc *sch, unsigned long arg)
 	return 0;
 }
 
-static struct tcf_block *cbq_tcf_block(struct Qdisc *sch, unsigned long arg)
+static struct tcf_block *cbq_tcf_block(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;
diff --git a/net/sched/sch_drr.c b/net/sched/sch_drr.c
@@ -173,7 +173,8 @@ static unsigned long drr_search_class(struct Qdisc *sch, u32 classid)
 	return (unsigned long)drr_find_class(sch, classid);
 }
 
-static struct tcf_block *drr_tcf_block(struct Qdisc *sch, unsigned long cl)
+static struct tcf_block *drr_tcf_block(struct Qdisc *sch, unsigned long cl,
+				       struct netlink_ext_ack *extack)
 {
 	struct drr_sched *q = qdisc_priv(sch);
 
diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c
@@ -185,7 +185,8 @@ static void dsmark_walk(struct Qdisc *sch, struct qdisc_walker *walker)
 	}
 }
 
-static struct tcf_block *dsmark_tcf_block(struct Qdisc *sch, unsigned long cl)
+static struct tcf_block *dsmark_tcf_block(struct Qdisc *sch, unsigned long cl,
+					  struct netlink_ext_ack *extack)
 {
 	struct dsmark_qdisc_data *p = qdisc_priv(sch);
 
diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c
@@ -597,7 +597,8 @@ static void fq_codel_unbind(struct Qdisc *q, unsigned long cl)
 {
 }
 
-static struct tcf_block *fq_codel_tcf_block(struct Qdisc *sch, unsigned long cl)
+static struct tcf_block *fq_codel_tcf_block(struct Qdisc *sch, unsigned long cl,
+					    struct netlink_ext_ack *extack)
 {
 	struct fq_codel_sched_data *q = qdisc_priv(sch);
 
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c
@@ -1247,7 +1247,8 @@ hfsc_unbind_tcf(struct Qdisc *sch, unsigned long arg)
 	cl->filter_cnt--;
 }
 
-static struct tcf_block *hfsc_tcf_block(struct Qdisc *sch, unsigned long arg)
+static struct tcf_block *hfsc_tcf_block(struct Qdisc *sch, unsigned long arg,
+					struct netlink_ext_ack *extack)
 {
 	struct hfsc_sched *q = qdisc_priv(sch);
 	struct hfsc_class *cl = (struct hfsc_class *)arg;
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
@@ -1525,7 +1525,8 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
 	return err;
 }
 
-static struct tcf_block *htb_tcf_block(struct Qdisc *sch, unsigned long arg)
+static struct tcf_block *htb_tcf_block(struct Qdisc *sch, unsigned long arg,
+				       struct netlink_ext_ack *extack)
 {
 	struct htb_sched *q = qdisc_priv(sch);
 	struct htb_class *cl = (struct htb_class *)arg;
diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
@@ -48,7 +48,8 @@ static void ingress_walk(struct Qdisc *sch, struct qdisc_walker *walker)
 {
 }
 
-static struct tcf_block *ingress_tcf_block(struct Qdisc *sch, unsigned long cl)
+static struct tcf_block *ingress_tcf_block(struct Qdisc *sch, unsigned long cl,
+					   struct netlink_ext_ack *extack)
 {
 	struct ingress_sched_data *q = qdisc_priv(sch);
 
@@ -154,7 +155,8 @@ static unsigned long clsact_bind_filter(struct Qdisc *sch,
 	return clsact_find(sch, classid);
 }
 
-static struct tcf_block *clsact_tcf_block(struct Qdisc *sch, unsigned long cl)
+static struct tcf_block *clsact_tcf_block(struct Qdisc *sch, unsigned long cl,
+					  struct netlink_ext_ack *extack)
 {
 	struct clsact_sched_data *q = qdisc_priv(sch);
 
diff --git a/net/sched/sch_multiq.c b/net/sched/sch_multiq.c
@@ -371,7 +371,8 @@ static void multiq_walk(struct Qdisc *sch, struct qdisc_walker *arg)
 	}
 }
 
-static struct tcf_block *multiq_tcf_block(struct Qdisc *sch, unsigned long cl)
+static struct tcf_block *multiq_tcf_block(struct Qdisc *sch, unsigned long cl,
+					  struct netlink_ext_ack *extack)
 {
 	struct multiq_sched_data *q = qdisc_priv(sch);
 
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c
@@ -329,7 +329,8 @@ static void prio_walk(struct Qdisc *sch, struct qdisc_walker *arg)
 	}
 }
 
-static struct tcf_block *prio_tcf_block(struct Qdisc *sch, unsigned long cl)
+static struct tcf_block *prio_tcf_block(struct Qdisc *sch, unsigned long cl,
+					struct netlink_ext_ack *extack)
 {
 	struct prio_sched_data *q = qdisc_priv(sch);
 
diff --git a/net/sched/sch_qfq.c b/net/sched/sch_qfq.c
@@ -565,7 +565,8 @@ static unsigned long qfq_search_class(struct Qdisc *sch, u32 classid)
 	return (unsigned long)qfq_find_class(sch, classid);
 }
 
-static struct tcf_block *qfq_tcf_block(struct Qdisc *sch, unsigned long cl)
+static struct tcf_block *qfq_tcf_block(struct Qdisc *sch, unsigned long cl,
+				       struct netlink_ext_ack *extack)
 {
 	struct qfq_sched *q = qdisc_priv(sch);
 
diff --git a/net/sched/sch_sfb.c b/net/sched/sch_sfb.c
@@ -668,7 +668,8 @@ static void sfb_walk(struct Qdisc *sch, struct qdisc_walker *walker)
 	}
 }
 
-static struct tcf_block *sfb_tcf_block(struct Qdisc *sch, unsigned long cl)
+static struct tcf_block *sfb_tcf_block(struct Qdisc *sch, unsigned long cl,
+				       struct netlink_ext_ack *extack)
 {
 	struct sfb_sched_data *q = qdisc_priv(sch);
 
diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
@@ -837,7 +837,8 @@ static void sfq_unbind(struct Qdisc *q, unsigned long cl)
 {
 }
 
-static struct tcf_block *sfq_tcf_block(struct Qdisc *sch, unsigned long cl)
+static struct tcf_block *sfq_tcf_block(struct Qdisc *sch, unsigned long cl,
+				       struct netlink_ext_ack *extack)
 {
 	struct sfq_sched_data *q = qdisc_priv(sch);
 

Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,8 @@ static void atm_tc_walk(struct Qdisc sch, struct qdisc_walker walker)`
`357`	`357`	`}`
`358`	`358`	`}`
`359`	`359`
`360`		`-static struct tcf_block atm_tc_tcf_block(struct Qdisc sch, unsigned long cl)`
	`360`	`+static struct tcf_block atm_tc_tcf_block(struct Qdisc sch, unsigned long cl,`
	`361`	`+ struct netlink_ext_ack *extack)`
`361`	`362`	`{`
`362`	`363`	`struct atm_qdisc_data *p = qdisc_priv(sch);`
`363`	`364`	`struct atm_flow_data flow = (struct atm_flow_data )cl;`
Original file line number	Diff line number	Diff line change
`@@ -1679,7 +1679,8 @@ static int cbq_delete(struct Qdisc *sch, unsigned long arg)`
`1679`	`1679`	`return 0;`
`1680`	`1680`	`}`
`1681`	`1681`
`1682`		`-static struct tcf_block cbq_tcf_block(struct Qdisc sch, unsigned long arg)`
	`1682`	`+static struct tcf_block cbq_tcf_block(struct Qdisc sch, unsigned long arg,`
	`1683`	`+ struct netlink_ext_ack *extack)`
`1683`	`1684`	`{`
`1684`	`1685`	`struct cbq_sched_data *q = qdisc_priv(sch);`
`1685`	`1686`	`struct cbq_class cl = (struct cbq_class )arg;`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,8 @@ static unsigned long drr_search_class(struct Qdisc *sch, u32 classid)`
`173`	`173`	`return (unsigned long)drr_find_class(sch, classid);`
`174`	`174`	`}`
`175`	`175`
`176`		`-static struct tcf_block drr_tcf_block(struct Qdisc sch, unsigned long cl)`
	`176`	`+static struct tcf_block drr_tcf_block(struct Qdisc sch, unsigned long cl,`
	`177`	`+ struct netlink_ext_ack *extack)`
`177`	`178`	`{`
`178`	`179`	`struct drr_sched *q = qdisc_priv(sch);`
`179`	`180`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,8 @@ static void dsmark_walk(struct Qdisc sch, struct qdisc_walker walker)`
`185`	`185`	`}`
`186`	`186`	`}`
`187`	`187`
`188`		`-static struct tcf_block dsmark_tcf_block(struct Qdisc sch, unsigned long cl)`
	`188`	`+static struct tcf_block dsmark_tcf_block(struct Qdisc sch, unsigned long cl,`
	`189`	`+ struct netlink_ext_ack *extack)`
`189`	`190`	`{`
`190`	`191`	`struct dsmark_qdisc_data *p = qdisc_priv(sch);`
`191`	`192`
Original file line number	Diff line number	Diff line change
`@@ -597,7 +597,8 @@ static void fq_codel_unbind(struct Qdisc *q, unsigned long cl)`
`597`	`597`	`{`
`598`	`598`	`}`
`599`	`599`
`600`		`-static struct tcf_block fq_codel_tcf_block(struct Qdisc sch, unsigned long cl)`
	`600`	`+static struct tcf_block fq_codel_tcf_block(struct Qdisc sch, unsigned long cl,`
	`601`	`+ struct netlink_ext_ack *extack)`
`601`	`602`	`{`
`602`	`603`	`struct fq_codel_sched_data *q = qdisc_priv(sch);`
`603`	`604`
Original file line number	Diff line number	Diff line change
`@@ -1247,7 +1247,8 @@ hfsc_unbind_tcf(struct Qdisc *sch, unsigned long arg)`
`1247`	`1247`	`cl->filter_cnt--;`
`1248`	`1248`	`}`
`1249`	`1249`
`1250`		`-static struct tcf_block hfsc_tcf_block(struct Qdisc sch, unsigned long arg)`
	`1250`	`+static struct tcf_block hfsc_tcf_block(struct Qdisc sch, unsigned long arg,`
	`1251`	`+ struct netlink_ext_ack *extack)`
`1251`	`1252`	`{`
`1252`	`1253`	`struct hfsc_sched *q = qdisc_priv(sch);`
`1253`	`1254`	`struct hfsc_class cl = (struct hfsc_class )arg;`
Original file line number	Diff line number	Diff line change
`@@ -1525,7 +1525,8 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,`
`1525`	`1525`	`return err;`
`1526`	`1526`	`}`
`1527`	`1527`
`1528`		`-static struct tcf_block htb_tcf_block(struct Qdisc sch, unsigned long arg)`
	`1528`	`+static struct tcf_block htb_tcf_block(struct Qdisc sch, unsigned long arg,`
	`1529`	`+ struct netlink_ext_ack *extack)`
`1529`	`1530`	`{`
`1530`	`1531`	`struct htb_sched *q = qdisc_priv(sch);`
`1531`	`1532`	`struct htb_class cl = (struct htb_class )arg;`