try putting the random delay here instead

brucespang · Jun 3, 2019 · 433cea3 · 433cea3
1 parent 5ce8f58
commit 433cea3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/include/net/tcp.h b/include/net/tcp.h
@@ -30,7 +30,6 @@
 #include <linux/cryptohash.h>
 #include <linux/kref.h>
 #include <linux/ktime.h>
-#include <linux/random.h>
 
 #include <net/inet_connection_sock.h>
 #include <net/inet_timewait_sock.h>
@@ -1255,8 +1254,6 @@ static inline unsigned long tcp_pacing_delay(const struct sock *sk,
 	pacing_delay -= tcp_sk(sk)->tcp_clock_cache;
 
   if (pacing_delay > 0) {
-    pacing_delay = (s64)((((u64)prandom_u32() << 32) | prandom_u32()) % (2*(u64)pacing_delay));
-
     return nsecs_to_jiffies(pacing_delay);
   } else {
     return 0;

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
@@ -42,6 +42,7 @@
 #include <linux/gfp.h>
 #include <linux/module.h>
 #include <linux/static_key.h>
+#include <linux/random.h>
 
 #include <trace/events/tcp.h>
 
@@ -992,6 +993,9 @@ static void tcp_update_skb_after_send(struct sock *sk, struct sk_buff *skb,
 		 */
 		if (rate != ~0UL && rate && tp->data_segs_out >= 10) {
 			u64 len_ns = div64_ul((u64)skb->len * NSEC_PER_SEC, rate);
+
+      len_ns = (u64)((((u64)prandom_u32() << 32) | prandom_u32()) % (2*(u64)len_ns));
+
 			u64 credit = tp->tcp_wstamp_ns - prior_wstamp;
 
 			/* take into account OS jitter */