Skip to content

Commit 15de71d

Browse files
BitsByWillkuba-moo
authored andcommitted
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: 046f6fd ("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>
1 parent e318cd6 commit 15de71d

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

net/sched/sch_cake.c

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1750,7 +1750,7 @@ static s32 cake_enqueue(struct sk_buff *skb, struct Qdisc *sch,
17501750
ktime_t now = ktime_get();
17511751
struct cake_tin_data *b;
17521752
struct cake_flow *flow;
1753-
u32 idx;
1753+
u32 idx, tin;
17541754

17551755
/* choose flow to insert into */
17561756
idx = cake_classify(sch, &b, skb, q->flow_mode, &ret);
@@ -1760,6 +1760,7 @@ static s32 cake_enqueue(struct sk_buff *skb, struct Qdisc *sch,
17601760
__qdisc_drop(skb, to_free);
17611761
return ret;
17621762
}
1763+
tin = (u32)(b - q->tins);
17631764
idx--;
17641765
flow = &b->flows[idx];
17651766

@@ -1927,13 +1928,22 @@ static s32 cake_enqueue(struct sk_buff *skb, struct Qdisc *sch,
19271928
q->buffer_max_used = q->buffer_used;
19281929

19291930
if (q->buffer_used > q->buffer_limit) {
1931+
bool same_flow = false;
19301932
u32 dropped = 0;
1933+
u32 drop_id;
19311934

19321935
while (q->buffer_used > q->buffer_limit) {
19331936
dropped++;
1934-
cake_drop(sch, to_free);
1937+
drop_id = cake_drop(sch, to_free);
1938+
1939+
if ((drop_id >> 16) == tin &&
1940+
(drop_id & 0xFFFF) == idx)
1941+
same_flow = true;
19351942
}
19361943
b->drop_overlimit += dropped;
1944+
1945+
if (same_flow)
1946+
return NET_XMIT_CN;
19371947
}
19381948
return NET_XMIT_SUCCESS;
19391949
}

0 commit comments

Comments
 (0)