From: Greg Kroah-Hartman Date: Thu, 1 May 2025 08:06:49 +0000 (+0200) Subject: drop codel-remove-sch-q.qlen-check-before-qdisc_tree_redu.patch from all queues X-Git-Tag: v5.4.293~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b4b7c511ce3b823c9144f5068b11069aa1f5974;p=thirdparty%2Fkernel%2Fstable-queue.git drop codel-remove-sch-q.qlen-check-before-qdisc_tree_redu.patch from all queues --- diff --git a/queue-5.10/codel-remove-sch-q.qlen-check-before-qdisc_tree_redu.patch b/queue-5.10/codel-remove-sch-q.qlen-check-before-qdisc_tree_redu.patch deleted file mode 100644 index 343227d50c..0000000000 --- a/queue-5.10/codel-remove-sch-q.qlen-check-before-qdisc_tree_redu.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 53e24d1b4bd0fdc61e2206dc0bb116b09c8dd473 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 3 Apr 2025 14:16:31 -0700 -Subject: codel: remove sch->q.qlen check before qdisc_tree_reduce_backlog() - -From: Cong Wang - -[ Upstream commit 342debc12183b51773b3345ba267e9263bdfaaef ] - -After making all ->qlen_notify() callbacks idempotent, now it is safe to -remove the check of qlen!=0 from both fq_codel_dequeue() and -codel_qdisc_dequeue(). - -Reported-by: Gerrard Tai -Fixes: 4b549a2ef4be ("fq_codel: Fair Queue Codel AQM") -Fixes: 76e3cc126bb2 ("codel: Controlled Delay AQM") -Signed-off-by: Cong Wang -Reviewed-by: Simon Horman -Link: https://patch.msgid.link/20250403211636.166257-1-xiyou.wangcong@gmail.com -Acked-by: Jamal Hadi Salim -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - net/sched/sch_codel.c | 5 +---- - net/sched/sch_fq_codel.c | 6 ++---- - 2 files changed, 3 insertions(+), 8 deletions(-) - -diff --git a/net/sched/sch_codel.c b/net/sched/sch_codel.c -index 30169b3adbbb0..d9eff03deada4 100644 ---- a/net/sched/sch_codel.c -+++ b/net/sched/sch_codel.c -@@ -95,10 +95,7 @@ static struct sk_buff *codel_qdisc_dequeue(struct Qdisc *sch) - &q->stats, qdisc_pkt_len, codel_get_enqueue_time, - drop_func, dequeue_func); - -- /* We cant call qdisc_tree_reduce_backlog() if our qlen is 0, -- * or HTB crashes. Defer it for next round. -- */ -- if (q->stats.drop_count && sch->q.qlen) { -+ if (q->stats.drop_count) { - qdisc_tree_reduce_backlog(sch, q->stats.drop_count, q->stats.drop_len); - q->stats.drop_count = 0; - q->stats.drop_len = 0; -diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c -index 01d6eea5b0ce9..6adea8e7f1531 100644 ---- a/net/sched/sch_fq_codel.c -+++ b/net/sched/sch_fq_codel.c -@@ -314,10 +314,8 @@ static struct sk_buff *fq_codel_dequeue(struct Qdisc *sch) - } - qdisc_bstats_update(sch, skb); - flow->deficit -= qdisc_pkt_len(skb); -- /* We cant call qdisc_tree_reduce_backlog() if our qlen is 0, -- * or HTB crashes. Defer it for next round. -- */ -- if (q->cstats.drop_count && sch->q.qlen) { -+ -+ if (q->cstats.drop_count) { - qdisc_tree_reduce_backlog(sch, q->cstats.drop_count, - q->cstats.drop_len); - q->cstats.drop_count = 0; --- -2.39.5 - diff --git a/queue-5.10/series b/queue-5.10/series index 9fd43ed90e..03fdb1c51a 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -1,6 +1,5 @@ ata-pata_pxa-fix-potential-null-pointer-dereference-.patch tipc-fix-memory-leak-in-tipc_link_xmit.patch -codel-remove-sch-q.qlen-check-before-qdisc_tree_redu.patch net-tls-explicitly-disallow-disconnect.patch ata-sata_sx4-drop-pointless-vprintk-calls-and-conver.patch ata-sata_sx4-add-error-handling-in-pdc20621_i2c_read.patch diff --git a/queue-5.15/codel-remove-sch-q.qlen-check-before-qdisc_tree_redu.patch b/queue-5.15/codel-remove-sch-q.qlen-check-before-qdisc_tree_redu.patch deleted file mode 100644 index ace8ca20fa..0000000000 --- a/queue-5.15/codel-remove-sch-q.qlen-check-before-qdisc_tree_redu.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 8b18b6cf40e25b8c55333077a46775b2ff9959a6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 3 Apr 2025 14:16:31 -0700 -Subject: codel: remove sch->q.qlen check before qdisc_tree_reduce_backlog() - -From: Cong Wang - -[ Upstream commit 342debc12183b51773b3345ba267e9263bdfaaef ] - -After making all ->qlen_notify() callbacks idempotent, now it is safe to -remove the check of qlen!=0 from both fq_codel_dequeue() and -codel_qdisc_dequeue(). - -Reported-by: Gerrard Tai -Fixes: 4b549a2ef4be ("fq_codel: Fair Queue Codel AQM") -Fixes: 76e3cc126bb2 ("codel: Controlled Delay AQM") -Signed-off-by: Cong Wang -Reviewed-by: Simon Horman -Link: https://patch.msgid.link/20250403211636.166257-1-xiyou.wangcong@gmail.com -Acked-by: Jamal Hadi Salim -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - net/sched/sch_codel.c | 5 +---- - net/sched/sch_fq_codel.c | 6 ++---- - 2 files changed, 3 insertions(+), 8 deletions(-) - -diff --git a/net/sched/sch_codel.c b/net/sched/sch_codel.c -index 30169b3adbbb0..d9eff03deada4 100644 ---- a/net/sched/sch_codel.c -+++ b/net/sched/sch_codel.c -@@ -95,10 +95,7 @@ static struct sk_buff *codel_qdisc_dequeue(struct Qdisc *sch) - &q->stats, qdisc_pkt_len, codel_get_enqueue_time, - drop_func, dequeue_func); - -- /* We cant call qdisc_tree_reduce_backlog() if our qlen is 0, -- * or HTB crashes. Defer it for next round. -- */ -- if (q->stats.drop_count && sch->q.qlen) { -+ if (q->stats.drop_count) { - qdisc_tree_reduce_backlog(sch, q->stats.drop_count, q->stats.drop_len); - q->stats.drop_count = 0; - q->stats.drop_len = 0; -diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c -index efda894bbb78b..9a3df6884c5cd 100644 ---- a/net/sched/sch_fq_codel.c -+++ b/net/sched/sch_fq_codel.c -@@ -314,10 +314,8 @@ static struct sk_buff *fq_codel_dequeue(struct Qdisc *sch) - } - qdisc_bstats_update(sch, skb); - flow->deficit -= qdisc_pkt_len(skb); -- /* We cant call qdisc_tree_reduce_backlog() if our qlen is 0, -- * or HTB crashes. Defer it for next round. -- */ -- if (q->cstats.drop_count && sch->q.qlen) { -+ -+ if (q->cstats.drop_count) { - qdisc_tree_reduce_backlog(sch, q->cstats.drop_count, - q->cstats.drop_len); - q->cstats.drop_count = 0; --- -2.39.5 - diff --git a/queue-5.15/series b/queue-5.15/series index 7fc1d20589..117842a690 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -1,6 +1,5 @@ ata-pata_pxa-fix-potential-null-pointer-dereference-.patch tipc-fix-memory-leak-in-tipc_link_xmit.patch -codel-remove-sch-q.qlen-check-before-qdisc_tree_redu.patch net-tls-explicitly-disallow-disconnect.patch net-ethtool-don-t-call-.cleanup_data-when-prepare_da.patch ata-sata_sx4-drop-pointless-vprintk-calls-and-conver.patch diff --git a/queue-5.4/codel-remove-sch-q.qlen-check-before-qdisc_tree_redu.patch b/queue-5.4/codel-remove-sch-q.qlen-check-before-qdisc_tree_redu.patch deleted file mode 100644 index 80892beca1..0000000000 --- a/queue-5.4/codel-remove-sch-q.qlen-check-before-qdisc_tree_redu.patch +++ /dev/null @@ -1,63 +0,0 @@ -From d9304506c396345874629c6184b3dccb61a68e3f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 3 Apr 2025 14:16:31 -0700 -Subject: codel: remove sch->q.qlen check before qdisc_tree_reduce_backlog() - -From: Cong Wang - -[ Upstream commit 342debc12183b51773b3345ba267e9263bdfaaef ] - -After making all ->qlen_notify() callbacks idempotent, now it is safe to -remove the check of qlen!=0 from both fq_codel_dequeue() and -codel_qdisc_dequeue(). - -Reported-by: Gerrard Tai -Fixes: 4b549a2ef4be ("fq_codel: Fair Queue Codel AQM") -Fixes: 76e3cc126bb2 ("codel: Controlled Delay AQM") -Signed-off-by: Cong Wang -Reviewed-by: Simon Horman -Link: https://patch.msgid.link/20250403211636.166257-1-xiyou.wangcong@gmail.com -Acked-by: Jamal Hadi Salim -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - net/sched/sch_codel.c | 5 +---- - net/sched/sch_fq_codel.c | 6 ++---- - 2 files changed, 3 insertions(+), 8 deletions(-) - -diff --git a/net/sched/sch_codel.c b/net/sched/sch_codel.c -index 30169b3adbbb0..d9eff03deada4 100644 ---- a/net/sched/sch_codel.c -+++ b/net/sched/sch_codel.c -@@ -95,10 +95,7 @@ static struct sk_buff *codel_qdisc_dequeue(struct Qdisc *sch) - &q->stats, qdisc_pkt_len, codel_get_enqueue_time, - drop_func, dequeue_func); - -- /* We cant call qdisc_tree_reduce_backlog() if our qlen is 0, -- * or HTB crashes. Defer it for next round. -- */ -- if (q->stats.drop_count && sch->q.qlen) { -+ if (q->stats.drop_count) { - qdisc_tree_reduce_backlog(sch, q->stats.drop_count, q->stats.drop_len); - q->stats.drop_count = 0; - q->stats.drop_len = 0; -diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c -index 30796bb549728..eb380b43d52cc 100644 ---- a/net/sched/sch_fq_codel.c -+++ b/net/sched/sch_fq_codel.c -@@ -315,10 +315,8 @@ static struct sk_buff *fq_codel_dequeue(struct Qdisc *sch) - } - qdisc_bstats_update(sch, skb); - flow->deficit -= qdisc_pkt_len(skb); -- /* We cant call qdisc_tree_reduce_backlog() if our qlen is 0, -- * or HTB crashes. Defer it for next round. -- */ -- if (q->cstats.drop_count && sch->q.qlen) { -+ -+ if (q->cstats.drop_count) { - qdisc_tree_reduce_backlog(sch, q->cstats.drop_count, - q->cstats.drop_len); - q->cstats.drop_count = 0; --- -2.39.5 - diff --git a/queue-5.4/series b/queue-5.4/series index e4faf17fc1..7a0f374ad2 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -1,6 +1,5 @@ ata-pata_pxa-fix-potential-null-pointer-dereference-.patch tipc-fix-memory-leak-in-tipc_link_xmit.patch -codel-remove-sch-q.qlen-check-before-qdisc_tree_redu.patch ata-sata_sx4-drop-pointless-vprintk-calls-and-conver.patch ata-sata_sx4-add-error-handling-in-pdc20621_i2c_read.patch net-ppp-add-bound-checking-for-skb-data-on-ppp_sync_.patch