net_sched: sch_fq: fix off-by-one error in fq_dequeue()
authorEric Dumazet <edumazet@google.com>
Fri, 20 Oct 2023 20:00:53 +0000 (20:00 +0000)
committerJakub Kicinski <kuba@kernel.org>
Mon, 23 Oct 2023 22:48:27 +0000 (15:48 -0700)
A last minute change went wrong.

We need to look for a packet in all 3 bands, not only two.

Fixes: 29f834aa326e ("net_sched: sch_fq: add 3 bands and WRR scheduling")
Reported-by: kernel test robot <oliver.sang@intel.com>
Closes: https://lore.kernel.org/oe-lkp/202310201422.a22b0999-oliver.sang@intel.com
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Soheil Hassas Yeganeh <soheil@google.com>
Cc: Dave Taht <dave.taht@gmail.com>
Cc: Toke Høiland-Jørgensen <toke@redhat.com>
Tested-by: Willem de Bruijn <willemb@google.com>
Link: https://lore.kernel.org/r/20231020200053.675951-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/sched/sch_fq.c

index 8eacdb5..f6fd0de 100644 (file)
@@ -651,7 +651,7 @@ static struct sk_buff *fq_dequeue(struct Qdisc *sch)
 begin:
        head = fq_pband_head_select(pband);
        if (!head) {
-               while (++retry < FQ_BANDS) {
+               while (++retry <= FQ_BANDS) {
                        if (++q->band_nr == FQ_BANDS)
                                q->band_nr = 0;
                        pband = &q->band_flows[q->band_nr];