From: Greg Kroah-Hartman Date: Fri, 22 Aug 2025 13:17:19 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v6.16.3~45 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=12144554c634f0fab23e730885d48c80e4df7d15;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: sch_hfsc-make-hfsc_qlen_notify-idempotent.patch sch_htb-make-htb_qlen_notify-idempotent.patch sch_qfq-make-qfq_qlen_notify-idempotent.patch --- diff --git a/queue-5.15/sch_hfsc-make-hfsc_qlen_notify-idempotent.patch b/queue-5.15/sch_hfsc-make-hfsc_qlen_notify-idempotent.patch new file mode 100644 index 0000000000..e9784e4545 --- /dev/null +++ b/queue-5.15/sch_hfsc-make-hfsc_qlen_notify-idempotent.patch @@ -0,0 +1,54 @@ +From 51eb3b65544c9efd6a1026889ee5fb5aa62da3bb Mon Sep 17 00:00:00 2001 +From: Cong Wang +Date: Thu, 3 Apr 2025 14:10:25 -0700 +Subject: sch_hfsc: make hfsc_qlen_notify() idempotent + +From: Cong Wang + +commit 51eb3b65544c9efd6a1026889ee5fb5aa62da3bb upstream. + +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 +Signed-off-by: Cong Wang +Reviewed-by: Simon Horman +Link: https://patch.msgid.link/20250403211033.166059-4-xiyou.wangcong@gmail.com +Acked-by: Jamal Hadi Salim +Signed-off-by: Paolo Abeni +Signed-off-by: Greg Kroah-Hartman +--- + net/sched/sch_hfsc.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +--- a/net/sched/sch_hfsc.c ++++ b/net/sched/sch_hfsc.c +@@ -209,7 +209,10 @@ eltree_insert(struct hfsc_class *cl) + static inline void + eltree_remove(struct hfsc_class *cl) + { +- rb_erase(&cl->el_node, &cl->sched->eligible); ++ if (!RB_EMPTY_NODE(&cl->el_node)) { ++ rb_erase(&cl->el_node, &cl->sched->eligible); ++ RB_CLEAR_NODE(&cl->el_node); ++ } + } + + static inline void +@@ -1231,7 +1234,8 @@ hfsc_qlen_notify(struct Qdisc *sch, unsi + /* vttree is now handled in update_vf() so that update_vf(cl, 0, 0) + * needs to be called explicitly to remove a class from vttree. + */ +- update_vf(cl, 0, 0); ++ if (cl->cl_nactive) ++ update_vf(cl, 0, 0); + if (cl->cl_flags & HFSC_RSC) + eltree_remove(cl); + } diff --git a/queue-5.15/sch_htb-make-htb_qlen_notify-idempotent.patch b/queue-5.15/sch_htb-make-htb_qlen_notify-idempotent.patch new file mode 100644 index 0000000000..8092c5a8a2 --- /dev/null +++ b/queue-5.15/sch_htb-make-htb_qlen_notify-idempotent.patch @@ -0,0 +1,38 @@ +From 5ba8b837b522d7051ef81bacf3d95383ff8edce5 Mon Sep 17 00:00:00 2001 +From: Cong Wang +Date: Thu, 3 Apr 2025 14:10:23 -0700 +Subject: sch_htb: make htb_qlen_notify() idempotent + +From: Cong Wang + +commit 5ba8b837b522d7051ef81bacf3d95383ff8edce5 upstream. + +htb_qlen_notify() always deactivates the HTB class and in fact could +trigger a warning if it is already deactivated. Therefore, it is not +idempotent and not friendly to its callers, like fq_codel_dequeue(). + +Let's make it idempotent to ease qdisc_tree_reduce_backlog() callers' +life. + +Reported-by: Gerrard Tai +Signed-off-by: Cong Wang +Reviewed-by: Simon Horman +Link: https://patch.msgid.link/20250403211033.166059-2-xiyou.wangcong@gmail.com +Acked-by: Jamal Hadi Salim +Signed-off-by: Paolo Abeni +Signed-off-by: Greg Kroah-Hartman +--- + net/sched/sch_htb.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/net/sched/sch_htb.c ++++ b/net/sched/sch_htb.c +@@ -1506,6 +1506,8 @@ static void htb_qlen_notify(struct Qdisc + { + struct htb_class *cl = (struct htb_class *)arg; + ++ if (!cl->prio_activity) ++ return; + htb_deactivate(qdisc_priv(sch), cl); + } + diff --git a/queue-5.15/sch_qfq-make-qfq_qlen_notify-idempotent.patch b/queue-5.15/sch_qfq-make-qfq_qlen_notify-idempotent.patch new file mode 100644 index 0000000000..50fce9b700 --- /dev/null +++ b/queue-5.15/sch_qfq-make-qfq_qlen_notify-idempotent.patch @@ -0,0 +1,66 @@ +From 55f9eca4bfe30a15d8656f915922e8c98b7f0728 Mon Sep 17 00:00:00 2001 +From: Cong Wang +Date: Thu, 3 Apr 2025 14:10:26 -0700 +Subject: sch_qfq: make qfq_qlen_notify() idempotent + +From: Cong Wang + +commit 55f9eca4bfe30a15d8656f915922e8c98b7f0728 upstream. + +qfq_qlen_notify() always deletes its class from its active list +with list_del_init() _and_ calls qfq_deactivate_agg() when the whole list +becomes empty. + +To make it idempotent, just skip everything when it is not in the active +list. + +Also change other list_del()'s to list_del_init() just to be extra safe. + +Reported-by: Gerrard Tai +Signed-off-by: Cong Wang +Reviewed-by: Simon Horman +Link: https://patch.msgid.link/20250403211033.166059-5-xiyou.wangcong@gmail.com +Acked-by: Jamal Hadi Salim +Signed-off-by: Paolo Abeni +Signed-off-by: Greg Kroah-Hartman +--- + net/sched/sch_qfq.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +--- a/net/sched/sch_qfq.c ++++ b/net/sched/sch_qfq.c +@@ -354,7 +354,7 @@ static void qfq_deactivate_class(struct + struct qfq_aggregate *agg = cl->agg; + + +- list_del(&cl->alist); /* remove from RR queue of the aggregate */ ++ list_del_init(&cl->alist); /* remove from RR queue of the aggregate */ + if (list_empty(&agg->active)) /* agg is now inactive */ + qfq_deactivate_agg(q, agg); + } +@@ -486,6 +486,7 @@ static int qfq_change_class(struct Qdisc + + cl->common.classid = classid; + cl->deficit = lmax; ++ INIT_LIST_HEAD(&cl->alist); + + cl->qdisc = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops, + classid, NULL); +@@ -1006,7 +1007,7 @@ static struct sk_buff *agg_dequeue(struc + cl->deficit -= (int) len; + + if (cl->qdisc->q.qlen == 0) /* no more packets, remove from list */ +- list_del(&cl->alist); ++ list_del_init(&cl->alist); + else if (cl->deficit < qdisc_pkt_len(cl->qdisc->ops->peek(cl->qdisc))) { + cl->deficit += agg->lmax; + list_move_tail(&cl->alist, &agg->active); +@@ -1438,6 +1439,8 @@ static void qfq_qlen_notify(struct Qdisc + struct qfq_sched *q = qdisc_priv(sch); + struct qfq_class *cl = (struct qfq_class *)arg; + ++ if (list_empty(&cl->alist)) ++ return; + qfq_deactivate_class(q, cl); + } + diff --git a/queue-5.15/series b/queue-5.15/series index 81c4d02e32..c4a683fac0 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -500,3 +500,6 @@ net-hsr-reject-hsr-frame-if-skb-can-t-hold-tag.patch ipv6-sr-fix-mac-comparison-to-be-constant-time.patch mptcp-drop-skb-if-mptcp-skb-extension-allocation-fails.patch mptcp-pm-kernel-flush-do-not-reset-add_addr-limit.patch +sch_htb-make-htb_qlen_notify-idempotent.patch +sch_hfsc-make-hfsc_qlen_notify-idempotent.patch +sch_qfq-make-qfq_qlen_notify-idempotent.patch