Thread (3 messages) flat view 3 messages, 2 authors, 2018-12-20
STALE2813d

[PATCH net-next] net: sched: add checks for tbf classid

From: <hidden>
Date: 2018-12-19 07:08:36
Subsystem: networking [general], tc subsystem, the rest · Maintainers: "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Jamal Hadi Salim, Jiri Pirko, Linus Torvalds

From: Tonghao Zhang <redacted>

tbf has only one qdisc class. When adding qdisc for it,
we should check the classid, otherwise the parentid:1
classid is available, no matter what classid tc specified.

$ tc qdisc add dev eth1 handle 10: root tbf rate 0.5mbit burst 5kb latency 70ms
$ tc class show dev eth1
class tbf 10:1 parent 10:

$ tc qdisc add dev eth1 parent 10:2 handle 20: pfifo_fast
or
$ tc qdisc add dev eth1 parent 10:0 handle 20: pfifo_fast
$ tc class show dev eth1
class tbf 10:1 parent 10: leaf 20:

Signed-off-by: Tonghao Zhang <redacted>
---
 net/sched/sch_tbf.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c
index 942dcca..df636b1 100644
--- a/net/sched/sch_tbf.c
+++ b/net/sched/sch_tbf.c
@@ -505,12 +505,18 @@ static int tbf_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new,
 static struct Qdisc *tbf_leaf(struct Qdisc *sch, unsigned long arg)
 {
 	struct tbf_sched_data *q = qdisc_priv(sch);
-	return q->qdisc;
+	if (arg == 1)
+		return q->qdisc;
+
+	return NULL;
 }
 
 static unsigned long tbf_find(struct Qdisc *sch, u32 classid)
 {
-	return 1;
+	if (TC_H_MIN(classid) == 1)
+		return 1;
+
+	return 0;
 }
 
 static void tbf_walk(struct Qdisc *sch, struct qdisc_walker *walker)
-- 
1.8.3.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help