* [PATCH net-next] net_sched: sch_fq: fix off-by-one error in fq_dequeue()
@ 2023-10-20 20:00 Eric Dumazet
2023-10-20 20:31 ` Willem de Bruijn
2023-10-23 23:00 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Eric Dumazet @ 2023-10-20 20:00 UTC (permalink / raw)
To: David S . Miller, Jakub Kicinski, Paolo Abeni
Cc: netdev, eric.dumazet, Eric Dumazet, kernel test robot,
Willem de Bruijn, Soheil Hassas Yeganeh, Dave Taht,
Toke Høiland-Jørgensen
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: Willem de Bruijn <willemb@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>
---
net/sched/sch_fq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/sched/sch_fq.c b/net/sched/sch_fq.c
index 8eacdb54e72f4412af1834bfdb2c387d41516349..f6fd0de293e583ad6ba505060ce12c74f349a1a2 100644
--- a/net/sched/sch_fq.c
+++ b/net/sched/sch_fq.c
@@ -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];
--
2.42.0.655.g421f12c284-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net-next] net_sched: sch_fq: fix off-by-one error in fq_dequeue()
2023-10-20 20:00 [PATCH net-next] net_sched: sch_fq: fix off-by-one error in fq_dequeue() Eric Dumazet
@ 2023-10-20 20:31 ` Willem de Bruijn
2023-10-23 23:00 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Willem de Bruijn @ 2023-10-20 20:31 UTC (permalink / raw)
To: Eric Dumazet, David S . Miller, Jakub Kicinski, Paolo Abeni
Cc: netdev, eric.dumazet, Eric Dumazet, kernel test robot,
Willem de Bruijn, Soheil Hassas Yeganeh, Dave Taht,
Toke Høiland-Jørgensen
Eric Dumazet wrote:
> 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: Willem de Bruijn <willemb@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>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net-next] net_sched: sch_fq: fix off-by-one error in fq_dequeue()
2023-10-20 20:00 [PATCH net-next] net_sched: sch_fq: fix off-by-one error in fq_dequeue() Eric Dumazet
2023-10-20 20:31 ` Willem de Bruijn
@ 2023-10-23 23:00 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-10-23 23:00 UTC (permalink / raw)
To: Eric Dumazet
Cc: davem, kuba, pabeni, netdev, eric.dumazet, oliver.sang, willemb,
soheil, dave.taht, toke
Hello:
This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Fri, 20 Oct 2023 20:00:53 +0000 you wrote:
> 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: Willem de Bruijn <willemb@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>
>
> [...]
Here is the summary with links:
- [net-next] net_sched: sch_fq: fix off-by-one error in fq_dequeue()
https://git.kernel.org/netdev/net-next/c/06e4dd18f868
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-23 23:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-20 20:00 [PATCH net-next] net_sched: sch_fq: fix off-by-one error in fq_dequeue() Eric Dumazet
2023-10-20 20:31 ` Willem de Bruijn
2023-10-23 23:00 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).