Skip to content

Commit 51eb3b6

Browse files
congwangPaolo Abeni
authored andcommitted
sch_hfsc: make hfsc_qlen_notify() idempotent
hfsc_qlen_notify() is not idempotent either and not friendly to its callers, like fq_codel_dequeue(). Let's make it idempotent to ease qdisc_tree_reduce_backlog() callers' life: 1. update_vf() decreases cl->cl_nactive, so we can check whether it is non-zero before calling it. 2. eltree_remove() always removes RB node cl->el_node, but we can use RB_EMPTY_NODE() + RB_CLEAR_NODE() to make it safe. Reported-by: Gerrard Tai <[email protected]> Signed-off-by: Cong Wang <[email protected]> Reviewed-by: Simon Horman <[email protected]> Link: https://patch.msgid.link/[email protected] Acked-by: Jamal Hadi Salim <[email protected]> Signed-off-by: Paolo Abeni <[email protected]>
1 parent df00859 commit 51eb3b6

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

net/sched/sch_hfsc.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,10 @@ eltree_insert(struct hfsc_class *cl)
203203
static inline void
204204
eltree_remove(struct hfsc_class *cl)
205205
{
206-
rb_erase(&cl->el_node, &cl->sched->eligible);
206+
if (!RB_EMPTY_NODE(&cl->el_node)) {
207+
rb_erase(&cl->el_node, &cl->sched->eligible);
208+
RB_CLEAR_NODE(&cl->el_node);
209+
}
207210
}
208211

209212
static inline void
@@ -1220,7 +1223,8 @@ hfsc_qlen_notify(struct Qdisc *sch, unsigned long arg)
12201223
/* vttree is now handled in update_vf() so that update_vf(cl, 0, 0)
12211224
* needs to be called explicitly to remove a class from vttree.
12221225
*/
1223-
update_vf(cl, 0, 0);
1226+
if (cl->cl_nactive)
1227+
update_vf(cl, 0, 0);
12241228
if (cl->cl_flags & HFSC_RSC)
12251229
eltree_remove(cl);
12261230
}

0 commit comments

Comments
 (0)