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 (file)
index 343227d..0000000
--- 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 <sashal@kernel.org>
-Date: Thu, 3 Apr 2025 14:16:31 -0700
-Subject: codel: remove sch->q.qlen check before qdisc_tree_reduce_backlog()
-
-From: Cong Wang <xiyou.wangcong@gmail.com>
-
-[ 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 <gerrard.tai@starlabs.sg>
-Fixes: 4b549a2ef4be ("fq_codel: Fair Queue Codel AQM")
-Fixes: 76e3cc126bb2 ("codel: Controlled Delay AQM")
-Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
-Reviewed-by: Simon Horman <horms@kernel.org>
-Link: https://patch.msgid.link/20250403211636.166257-1-xiyou.wangcong@gmail.com
-Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
-Signed-off-by: Paolo Abeni <pabeni@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 9fd43ed90e678c75885ad6af1e471a50933c2568..03fdb1c51a6ce28e21e3dd1595960e1e6bd7467e 100644 (file)
--- 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 (file)
index ace8ca2..0000000
--- 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 <sashal@kernel.org>
-Date: Thu, 3 Apr 2025 14:16:31 -0700
-Subject: codel: remove sch->q.qlen check before qdisc_tree_reduce_backlog()
-
-From: Cong Wang <xiyou.wangcong@gmail.com>
-
-[ 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 <gerrard.tai@starlabs.sg>
-Fixes: 4b549a2ef4be ("fq_codel: Fair Queue Codel AQM")
-Fixes: 76e3cc126bb2 ("codel: Controlled Delay AQM")
-Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
-Reviewed-by: Simon Horman <horms@kernel.org>
-Link: https://patch.msgid.link/20250403211636.166257-1-xiyou.wangcong@gmail.com
-Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
-Signed-off-by: Paolo Abeni <pabeni@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 7fc1d205899dd56ce87000c48304e7430f469303..117842a690cdec9fde10f867c39635b29154bf3a 100644 (file)
--- 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 (file)
index 80892be..0000000
--- 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 <sashal@kernel.org>
-Date: Thu, 3 Apr 2025 14:16:31 -0700
-Subject: codel: remove sch->q.qlen check before qdisc_tree_reduce_backlog()
-
-From: Cong Wang <xiyou.wangcong@gmail.com>
-
-[ 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 <gerrard.tai@starlabs.sg>
-Fixes: 4b549a2ef4be ("fq_codel: Fair Queue Codel AQM")
-Fixes: 76e3cc126bb2 ("codel: Controlled Delay AQM")
-Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
-Reviewed-by: Simon Horman <horms@kernel.org>
-Link: https://patch.msgid.link/20250403211636.166257-1-xiyou.wangcong@gmail.com
-Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
-Signed-off-by: Paolo Abeni <pabeni@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 e4faf17fc1476235da982d3f4e68ba3a7e6ab359..7a0f374ad2527f52662a1fcbf6e7ee7933d77f49 100644 (file)
--- 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