Commit bc21000e authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

net_sched: sch_fq: fix incorrect behavior for small weights 



fq_dequeue() has a complex logic to find packets in one of the 3 bands.

As Neal found out, it is possible that one band has a deficit smaller
than its weight. fq_dequeue() can return NULL while some packets are
elligible for immediate transmit.

In this case, more than one iteration is needed to refill pband->credit.

With default parameters (weights 589824 196608 65536) bug can trigger
if large BIG TCP packets are sent to the lowest priority band.

Bisected-by: default avatarJohn Sperbeck <jsperbeck@google.com>
Diagnosed-by: default avatarNeal Cardwell <ncardwell@google.com>
Fixes: 29f834aa ("net_sched: sch_fq: add 3 bands and WRR scheduling")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarNeal Cardwell <ncardwell@google.com>
Link: https://patch.msgid.link/20240824181901.953776-1-edumazet@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 4786fe29

net/sched/sch_fq.c

+3 −1
Original line number Diff line number Diff line
@@ -663,7 +663,9 @@ static struct sk_buff *fq_dequeue(struct Qdisc *sch) 
			pband = &q->band_flows[q->band_nr];

			pband->credit = min(pband->credit + pband->quantum,

					    pband->quantum);

			if (pband->credit > 0)

				goto begin;

			retry = 0;

		}

		if (q->time_next_delayed_flow != ~0ULL)

			qdisc_watchdog_schedule_range_ns(&q->watchdog,