]> www.infradead.org Git - users/jedix/linux-maple.git/commit
net/sched: Make cake_enqueue return NET_XMIT_CN when past buffer_limit
authorWilliam Liu <will@willsroot.io>
Tue, 19 Aug 2025 03:36:28 +0000 (03:36 +0000)
committerJakub Kicinski <kuba@kernel.org>
Thu, 21 Aug 2025 02:27:08 +0000 (19:27 -0700)
commit15de71d06a400f7fdc15bf377a2552b0ec437cf5
treeb52b78dc2aaacb0c5245fb41206f68706739607a
parente318cd6714592fb762fcab59c5684a442243a12f
net/sched: Make cake_enqueue return NET_XMIT_CN when past buffer_limit

The following setup can trigger a WARNING in htb_activate due to
the condition: !cl->leaf.q->q.qlen

tc qdisc del dev lo root
tc qdisc add dev lo root handle 1: htb default 1
tc class add dev lo parent 1: classid 1:1 \
       htb rate 64bit
tc qdisc add dev lo parent 1:1 handle f: \
       cake memlimit 1b
ping -I lo -f -c1 -s64 -W0.001 127.0.0.1

This is because the low memlimit leads to a low buffer_limit, which
causes packet dropping. However, cake_enqueue still returns
NET_XMIT_SUCCESS, causing htb_enqueue to call htb_activate with an
empty child qdisc. We should return NET_XMIT_CN when packets are
dropped from the same tin and flow.

I do not believe return value of NET_XMIT_CN is necessary for packet
drops in the case of ack filtering, as that is meant to optimize
performance, not to signal congestion.

Fixes: 046f6fd5daef ("sched: Add Common Applications Kept Enhanced (cake) qdisc")
Signed-off-by: William Liu <will@willsroot.io>
Reviewed-by: Savino Dicanosa <savy@syst3mfailure.io>
Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>
Reviewed-by: Jamal Hadi Salim <jhs@mojatatu.com>
Link: https://patch.msgid.link/20250819033601.579821-1-will@willsroot.io
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/sched/sch_cake.c