From: Eric Dumazet <edumazet@google.com>
Date: Sun, 3 May 2020 02:54:22 +0000 (-0700)
Subject: net_sched: sch_fq: perform a prefetch() earlier
X-Git-Tag: v5.8-rc1~165^2~338^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=348e289b0f23451d1c47b940e759f0f3a0c5756e;p=linux-block.git

net_sched: sch_fq: perform a prefetch() earlier

The prefetch() done in fq_dequeue() can be done a bit earlier
after the refactoring of the code done in the prior patch.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/sched/sch_fq.c b/net/sched/sch_fq.c
index 567df8fcaf70..4f0104243cc2 100644
--- a/net/sched/sch_fq.c
+++ b/net/sched/sch_fq.c
@@ -546,6 +546,7 @@ begin:
 			fq_flow_set_throttled(q, f);
 			goto begin;
 		}
+		prefetch(&skb->end);
 		if ((s64)(now - time_next_packet - q->ce_threshold) > 0) {
 			INET_ECN_set_ce(skb);
 			q->stat_ce_mark++;
@@ -562,7 +563,6 @@ begin:
 		}
 		goto begin;
 	}
-	prefetch(&skb->end);
 	plen = qdisc_pkt_len(skb);
 	f->credit -= plen;