Merge branch 'tc-bind_class-hook'

davem330 · davem330 · commit 9d43507319cc · 2022-10-02T16:07:17.000+01:00
Zhengchao Shao says:

====================
refactor duplicate codes in bind_class hook function

All the bind_class callback duplicate the same logic, so we can refactor
them. First, ensure n arg not empty before call bind_class hook function.
Then, add tc_cls_bind_class() helper. Last, use tc_cls_bind_class() in
filter.
====================

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
@@ -210,6 +210,18 @@ tcf_unbind_filter(struct tcf_proto *tp, struct tcf_result *r)
 	__tcf_unbind_filter(q, r);
 }
 
+static inline void tc_cls_bind_class(u32 classid, unsigned long cl,
+				     void *q, struct tcf_result *res,
+				     unsigned long base)
+{
+	if (res->classid == classid) {
+		if (cl)
+			__tcf_bind_filter(q, res, base);
+		else
+			__tcf_unbind_filter(q, res);
+	}
+}
+
 struct tcf_exts {
 #ifdef CONFIG_NET_CLS_ACT
 	__u32	type; /* for backward compat(TCA_OLD_COMPAT) */
diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c
@@ -261,12 +261,7 @@ static void basic_bind_class(void *fh, u32 classid, unsigned long cl, void *q,
 {
 	struct basic_filter *f = fh;
 
-	if (f && f->res.classid == classid) {
-		if (cl)
-			__tcf_bind_filter(q, &f->res, base);
-		else
-			__tcf_unbind_filter(q, &f->res);
-	}
+	tc_cls_bind_class(classid, cl, q, &f->res, base);
 }
 
 static int basic_dump(struct net *net, struct tcf_proto *tp, void *fh,
diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c
@@ -635,12 +635,7 @@ static void cls_bpf_bind_class(void *fh, u32 classid, unsigned long cl,
 {
 	struct cls_bpf_prog *prog = fh;
 
-	if (prog && prog->res.classid == classid) {
-		if (cl)
-			__tcf_bind_filter(q, &prog->res, base);
-		else
-			__tcf_unbind_filter(q, &prog->res);
-	}
+	tc_cls_bind_class(classid, cl, q, &prog->res, base);
 }
 
 static void cls_bpf_walk(struct tcf_proto *tp, struct tcf_walker *arg,
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
@@ -3405,12 +3405,7 @@ static void fl_bind_class(void *fh, u32 classid, unsigned long cl, void *q,
 {
 	struct cls_fl_filter *f = fh;
 
-	if (f && f->res.classid == classid) {
-		if (cl)
-			__tcf_bind_filter(q, &f->res, base);
-		else
-			__tcf_unbind_filter(q, &f->res);
-	}
+	tc_cls_bind_class(classid, cl, q, &f->res, base);
 }
 
 static bool fl_delete_empty(struct tcf_proto *tp)
diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c
@@ -416,12 +416,7 @@ static void fw_bind_class(void *fh, u32 classid, unsigned long cl, void *q,
 {
 	struct fw_filter *f = fh;
 
-	if (f && f->res.classid == classid) {
-		if (cl)
-			__tcf_bind_filter(q, &f->res, base);
-		else
-			__tcf_unbind_filter(q, &f->res);
-	}
+	tc_cls_bind_class(classid, cl, q, &f->res, base);
 }
 
 static struct tcf_proto_ops cls_fw_ops __read_mostly = {
diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c
@@ -394,12 +394,7 @@ static void mall_bind_class(void *fh, u32 classid, unsigned long cl, void *q,
 {
 	struct cls_mall_head *head = fh;
 
-	if (head && head->res.classid == classid) {
-		if (cl)
-			__tcf_bind_filter(q, &head->res, base);
-		else
-			__tcf_unbind_filter(q, &head->res);
-	}
+	tc_cls_bind_class(classid, cl, q, &head->res, base);
 }
 
 static struct tcf_proto_ops cls_mall_ops __read_mostly = {
diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c
@@ -649,12 +649,7 @@ static void route4_bind_class(void *fh, u32 classid, unsigned long cl, void *q,
 {
 	struct route4_filter *f = fh;
 
-	if (f && f->res.classid == classid) {
-		if (cl)
-			__tcf_bind_filter(q, &f->res, base);
-		else
-			__tcf_unbind_filter(q, &f->res);
-	}
+	tc_cls_bind_class(classid, cl, q, &f->res, base);
 }
 
 static struct tcf_proto_ops cls_route4_ops __read_mostly = {
diff --git a/net/sched/cls_rsvp.h b/net/sched/cls_rsvp.h
@@ -733,12 +733,7 @@ static void rsvp_bind_class(void *fh, u32 classid, unsigned long cl, void *q,
 {
 	struct rsvp_filter *f = fh;
 
-	if (f && f->res.classid == classid) {
-		if (cl)
-			__tcf_bind_filter(q, &f->res, base);
-		else
-			__tcf_unbind_filter(q, &f->res);
-	}
+	tc_cls_bind_class(classid, cl, q, &f->res, base);
 }
 
 static struct tcf_proto_ops RSVP_OPS __read_mostly = {
diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c
@@ -691,12 +691,7 @@ static void tcindex_bind_class(void *fh, u32 classid, unsigned long cl,
 {
 	struct tcindex_filter_result *r = fh;
 
-	if (r && r->res.classid == classid) {
-		if (cl)
-			__tcf_bind_filter(q, &r->res, base);
-		else
-			__tcf_unbind_filter(q, &r->res);
-	}
+	tc_cls_bind_class(classid, cl, q, &r->res, base);
 }
 
 static struct tcf_proto_ops cls_tcindex_ops __read_mostly = {
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
@@ -1250,12 +1250,7 @@ static void u32_bind_class(void *fh, u32 classid, unsigned long cl, void *q,
 {
 	struct tc_u_knode *n = fh;
 
-	if (n && n->res.classid == classid) {
-		if (cl)
-			__tcf_bind_filter(q, &n->res, base);
-		else
-			__tcf_unbind_filter(q, &n->res);
-	}
+	tc_cls_bind_class(classid, cl, q, &n->res, base);
 }
 
 static int u32_dump(struct net *net, struct tcf_proto *tp, void *fh,
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
@@ -1915,7 +1915,7 @@ static int tcf_node_bind(struct tcf_proto *tp, void *n, struct tcf_walker *arg)
 {
 	struct tcf_bind_args *a = (void *)arg;
 
-	if (tp->ops->bind_class) {
+	if (n && tp->ops->bind_class) {
 		struct Qdisc *q = tcf_block_q(tp->chain->block);
 
 		sch_tree_lock(q);

Original file line number	Diff line number	Diff line change
`@@ -261,12 +261,7 @@ static void basic_bind_class(void fh, u32 classid, unsigned long cl, void q,`
`261`	`261`	`{`
`262`	`262`	`struct basic_filter *f = fh;`
`263`	`263`
`264`		`- if (f && f->res.classid == classid) {`
`265`		`- if (cl)`
`266`		`- __tcf_bind_filter(q, &f->res, base);`
`267`		`- else`
`268`		`- __tcf_unbind_filter(q, &f->res);`
`269`		`- }`
	`264`	`+ tc_cls_bind_class(classid, cl, q, &f->res, base);`
`270`	`265`	`}`
`271`	`266`
`272`	`267`	`static int basic_dump(struct net net, struct tcf_proto tp, void *fh,`
Original file line number	Diff line number	Diff line change
`@@ -635,12 +635,7 @@ static void cls_bpf_bind_class(void *fh, u32 classid, unsigned long cl,`
`635`	`635`	`{`
`636`	`636`	`struct cls_bpf_prog *prog = fh;`
`637`	`637`
`638`		`- if (prog && prog->res.classid == classid) {`
`639`		`- if (cl)`
`640`		`- __tcf_bind_filter(q, &prog->res, base);`
`641`		`- else`
`642`		`- __tcf_unbind_filter(q, &prog->res);`
`643`		`- }`
	`638`	`+ tc_cls_bind_class(classid, cl, q, &prog->res, base);`
`644`	`639`	`}`
`645`	`640`
`646`	`641`	`static void cls_bpf_walk(struct tcf_proto tp, struct tcf_walker arg,`
Original file line number	Diff line number	Diff line change
`@@ -3405,12 +3405,7 @@ static void fl_bind_class(void fh, u32 classid, unsigned long cl, void q,`
`3405`	`3405`	`{`
`3406`	`3406`	`struct cls_fl_filter *f = fh;`
`3407`	`3407`
`3408`		`- if (f && f->res.classid == classid) {`
`3409`		`- if (cl)`
`3410`		`- __tcf_bind_filter(q, &f->res, base);`
`3411`		`- else`
`3412`		`- __tcf_unbind_filter(q, &f->res);`
`3413`		`- }`
	`3408`	`+ tc_cls_bind_class(classid, cl, q, &f->res, base);`
`3414`	`3409`	`}`
`3415`	`3410`
`3416`	`3411`	`static bool fl_delete_empty(struct tcf_proto *tp)`
Original file line number	Diff line number	Diff line change
`@@ -416,12 +416,7 @@ static void fw_bind_class(void fh, u32 classid, unsigned long cl, void q,`
`416`	`416`	`{`
`417`	`417`	`struct fw_filter *f = fh;`
`418`	`418`
`419`		`- if (f && f->res.classid == classid) {`
`420`		`- if (cl)`
`421`		`- __tcf_bind_filter(q, &f->res, base);`
`422`		`- else`
`423`		`- __tcf_unbind_filter(q, &f->res);`
`424`		`- }`
	`419`	`+ tc_cls_bind_class(classid, cl, q, &f->res, base);`
`425`	`420`	`}`
`426`	`421`
`427`	`422`	`static struct tcf_proto_ops cls_fw_ops __read_mostly = {`
Original file line number	Diff line number	Diff line change
`@@ -394,12 +394,7 @@ static void mall_bind_class(void fh, u32 classid, unsigned long cl, void q,`
`394`	`394`	`{`
`395`	`395`	`struct cls_mall_head *head = fh;`
`396`	`396`
`397`		`- if (head && head->res.classid == classid) {`
`398`		`- if (cl)`
`399`		`- __tcf_bind_filter(q, &head->res, base);`
`400`		`- else`
`401`		`- __tcf_unbind_filter(q, &head->res);`
`402`		`- }`
	`397`	`+ tc_cls_bind_class(classid, cl, q, &head->res, base);`
`403`	`398`	`}`
`404`	`399`
`405`	`400`	`static struct tcf_proto_ops cls_mall_ops __read_mostly = {`
Original file line number	Diff line number	Diff line change
`@@ -649,12 +649,7 @@ static void route4_bind_class(void fh, u32 classid, unsigned long cl, void q,`
`649`	`649`	`{`
`650`	`650`	`struct route4_filter *f = fh;`
`651`	`651`
`652`		`- if (f && f->res.classid == classid) {`
`653`		`- if (cl)`
`654`		`- __tcf_bind_filter(q, &f->res, base);`
`655`		`- else`
`656`		`- __tcf_unbind_filter(q, &f->res);`
`657`		`- }`
	`652`	`+ tc_cls_bind_class(classid, cl, q, &f->res, base);`
`658`	`653`	`}`
`659`	`654`
`660`	`655`	`static struct tcf_proto_ops cls_route4_ops __read_mostly = {`
Original file line number	Diff line number	Diff line change
`@@ -733,12 +733,7 @@ static void rsvp_bind_class(void fh, u32 classid, unsigned long cl, void q,`
`733`	`733`	`{`
`734`	`734`	`struct rsvp_filter *f = fh;`
`735`	`735`
`736`		`- if (f && f->res.classid == classid) {`
`737`		`- if (cl)`
`738`		`- __tcf_bind_filter(q, &f->res, base);`
`739`		`- else`
`740`		`- __tcf_unbind_filter(q, &f->res);`
`741`		`- }`
	`736`	`+ tc_cls_bind_class(classid, cl, q, &f->res, base);`
`742`	`737`	`}`
`743`	`738`
`744`	`739`	`static struct tcf_proto_ops RSVP_OPS __read_mostly = {`
Original file line number	Diff line number	Diff line change
`@@ -691,12 +691,7 @@ static void tcindex_bind_class(void *fh, u32 classid, unsigned long cl,`
`691`	`691`	`{`
`692`	`692`	`struct tcindex_filter_result *r = fh;`
`693`	`693`
`694`		`- if (r && r->res.classid == classid) {`
`695`		`- if (cl)`
`696`		`- __tcf_bind_filter(q, &r->res, base);`
`697`		`- else`
`698`		`- __tcf_unbind_filter(q, &r->res);`
`699`		`- }`
	`694`	`+ tc_cls_bind_class(classid, cl, q, &r->res, base);`
`700`	`695`	`}`
`701`	`696`
`702`	`697`	`static struct tcf_proto_ops cls_tcindex_ops __read_mostly = {`
Original file line number	Diff line number	Diff line change
`@@ -1250,12 +1250,7 @@ static void u32_bind_class(void fh, u32 classid, unsigned long cl, void q,`
`1250`	`1250`	`{`
`1251`	`1251`	`struct tc_u_knode *n = fh;`
`1252`	`1252`
`1253`		`- if (n && n->res.classid == classid) {`
`1254`		`- if (cl)`
`1255`		`- __tcf_bind_filter(q, &n->res, base);`
`1256`		`- else`
`1257`		`- __tcf_unbind_filter(q, &n->res);`
`1258`		`- }`
	`1253`	`+ tc_cls_bind_class(classid, cl, q, &n->res, base);`
`1259`	`1254`	`}`
`1260`	`1255`
`1261`	`1256`	`static int u32_dump(struct net net, struct tcf_proto tp, void *fh,`