From: Cong Wang <xiyou.wangcong@gmail.com>
To: netdev@vger.kernel.org
Cc: jhs@mojatatu.com, jiri@resnulli.us, victor@mojatatu.com,
Cong Wang <xiyou.wangcong@gmail.com>,
Gerrard Tai <gerrard.tai@starlabs.sg>
Subject: [Patch net v2 02/11] sch_drr: make drr_qlen_notify() idempotent
Date: Thu, 3 Apr 2025 14:10:24 -0700 [thread overview]
Message-ID: <20250403211033.166059-3-xiyou.wangcong@gmail.com> (raw)
In-Reply-To: <20250403211033.166059-1-xiyou.wangcong@gmail.com>
drr_qlen_notify() always deletes the DRR class from its active list
with list_del(), 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. Also change other list_del()'s to list_del_init() just to be
extra safe.
Reported-by: Gerrard Tai <gerrard.tai@starlabs.sg>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
---
net/sched/sch_drr.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/net/sched/sch_drr.c b/net/sched/sch_drr.c
index c69b999fae17..e0a81d313aa7 100644
--- a/net/sched/sch_drr.c
+++ b/net/sched/sch_drr.c
@@ -105,6 +105,7 @@ static int drr_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
return -ENOBUFS;
gnet_stats_basic_sync_init(&cl->bstats);
+ INIT_LIST_HEAD(&cl->alist);
cl->common.classid = classid;
cl->quantum = quantum;
cl->qdisc = qdisc_create_dflt(sch->dev_queue,
@@ -229,7 +230,7 @@ static void drr_qlen_notify(struct Qdisc *csh, unsigned long arg)
{
struct drr_class *cl = (struct drr_class *)arg;
- list_del(&cl->alist);
+ list_del_init(&cl->alist);
}
static int drr_dump_class(struct Qdisc *sch, unsigned long arg,
@@ -390,7 +391,7 @@ static struct sk_buff *drr_dequeue(struct Qdisc *sch)
if (unlikely(skb == NULL))
goto out;
if (cl->qdisc->q.qlen == 0)
- list_del(&cl->alist);
+ list_del_init(&cl->alist);
bstats_update(&cl->bstats, skb);
qdisc_bstats_update(sch, skb);
@@ -431,7 +432,7 @@ static void drr_reset_qdisc(struct Qdisc *sch)
for (i = 0; i < q->clhash.hashsize; i++) {
hlist_for_each_entry(cl, &q->clhash.hash[i], common.hnode) {
if (cl->qdisc->q.qlen)
- list_del(&cl->alist);
+ list_del_init(&cl->alist);
qdisc_reset(cl->qdisc);
}
}
--
2.34.1
next prev parent reply other threads:[~2025-04-03 21:10 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-03 21:10 [Patch net v2 00/11] net_sched: make ->qlen_notify() idempotent Cong Wang
2025-04-03 21:10 ` [Patch net v2 01/11] sch_htb: make htb_qlen_notify() idempotent Cong Wang
2025-04-07 12:14 ` Simon Horman
2025-04-03 21:10 ` Cong Wang [this message]
2025-04-07 12:15 ` [Patch net v2 02/11] sch_drr: make drr_qlen_notify() idempotent Simon Horman
2025-04-03 21:10 ` [Patch net v2 03/11] sch_hfsc: make hfsc_qlen_notify() idempotent Cong Wang
2025-04-07 12:15 ` Simon Horman
2025-04-03 21:10 ` [Patch net v2 04/11] sch_qfq: make qfq_qlen_notify() idempotent Cong Wang
2025-04-07 12:15 ` Simon Horman
2025-04-03 21:10 ` [Patch net v2 05/11] sch_ets: make est_qlen_notify() idempotent Cong Wang
2025-04-07 12:14 ` Simon Horman
2025-04-03 21:16 ` [Patch net v2 06/11] codel: remove sch->q.qlen check before qdisc_tree_reduce_backlog() Cong Wang
2025-04-03 21:16 ` [Patch net v2 07/11] selftests/tc-testing: Add a test case for FQ_CODEL with HTB parent Cong Wang
2025-04-04 16:57 ` Victor Nogueira
2025-04-03 21:16 ` [Patch net v2 08/11] selftests/tc-testing: Add a test case for FQ_CODEL with QFQ parent Cong Wang
2025-04-04 16:58 ` Victor Nogueira
2025-04-03 21:16 ` [Patch net v2 09/11] selftests/tc-testing: Add a test case for FQ_CODEL with HFSC parent Cong Wang
2025-04-04 16:58 ` Victor Nogueira
2025-04-03 21:16 ` [Patch net v2 10/11] selftests/tc-testing: Add a test case for FQ_CODEL with DRR parent Cong Wang
2025-04-04 16:59 ` Victor Nogueira
2025-04-03 21:16 ` [Patch net v2 11/11] selftests/tc-testing: Add a test case for FQ_CODEL with ETS parent Cong Wang
2025-04-04 16:59 ` Victor Nogueira
2025-04-04 18:41 ` Jakub Kicinski
2025-04-04 19:03 ` Victor Nogueira
2025-04-07 20:09 ` Jakub Kicinski
2025-04-07 20:20 ` Victor Nogueira
2025-04-07 12:16 ` [Patch net v2 06/11] codel: remove sch->q.qlen check before qdisc_tree_reduce_backlog() Simon Horman
2025-04-07 20:35 ` [Patch net v2 00/11] net_sched: make ->qlen_notify() idempotent Jamal Hadi Salim
2025-04-08 9:01 ` Paolo Abeni
2025-04-08 9:10 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250403211033.166059-3-xiyou.wangcong@gmail.com \
--to=xiyou.wangcong@gmail.com \
--cc=gerrard.tai@starlabs.sg \
--cc=jhs@mojatatu.com \
--cc=jiri@resnulli.us \
--cc=netdev@vger.kernel.org \
--cc=victor@mojatatu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.