diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 13:56:35 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 13:56:35 -0400 |
| commit | fe3c76f1c5ba56c1d7786c2b6aaa8409c85785dd (patch) | |
| tree | db02c2134a37e542faf450c9814e2d09957990c4 | |
| parent | 2c0165a034a78921c19aa32a6979fa0eff827f69 (diff) | |
| download | longterm-queue-4.12-fe3c76f1c5ba56c1d7786c2b6aaa8409c85785dd.tar.gz | |
tcp: refresh ctxt
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/tcp_bbr-record-full-bw-reached-decision-in-new-full_.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/queue/tcp_bbr-record-full-bw-reached-decision-in-new-full_.patch b/queue/tcp_bbr-record-full-bw-reached-decision-in-new-full_.patch index e482064..af7a8ca 100644 --- a/queue/tcp_bbr-record-full-bw-reached-decision-in-new-full_.patch +++ b/queue/tcp_bbr-record-full-bw-reached-decision-in-new-full_.patch @@ -1,4 +1,4 @@ -From c589e69b508d29ed8e644dfecda453f71c02ec27 Mon Sep 17 00:00:00 2001 +From e0aa1f5258ebfc66a1367b6fe2254c193ddea1a5 Mon Sep 17 00:00:00 2001 From: Neal Cardwell <ncardwell@google.com> Date: Thu, 7 Dec 2017 12:43:30 -0500 Subject: [PATCH] tcp_bbr: record "full bw reached" decision in new @@ -24,12 +24,13 @@ Signed-off-by: Neal Cardwell <ncardwell@google.com> Reviewed-by: Yuchung Cheng <ycheng@google.com> Acked-by: Soheil Hassas Yeganeh <soheil@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/tcp_bbr.c b/net/ipv4/tcp_bbr.c -index 69ee877574d0..3089c956b9f9 100644 +index 96c95c8d981e..12d361380d32 100644 --- a/net/ipv4/tcp_bbr.c +++ b/net/ipv4/tcp_bbr.c -@@ -110,7 +110,8 @@ struct bbr { +@@ -111,7 +111,8 @@ struct bbr { u32 lt_last_lost; /* LT intvl start: tp->lost */ u32 pacing_gain:10, /* current gain for setting pacing rate */ cwnd_gain:10, /* current gain for setting cwnd */ @@ -39,7 +40,7 @@ index 69ee877574d0..3089c956b9f9 100644 cycle_idx:3, /* current index in pacing_gain cycle array */ has_seen_rtt:1, /* have we seen an RTT sample yet? */ unused_b:5; -@@ -180,7 +181,7 @@ static bool bbr_full_bw_reached(const struct sock *sk) +@@ -181,7 +182,7 @@ static bool bbr_full_bw_reached(const struct sock *sk) { const struct bbr *bbr = inet_csk_ca(sk); @@ -48,7 +49,7 @@ index 69ee877574d0..3089c956b9f9 100644 } /* Return the windowed max recent bandwidth sample, in pkts/uS << BW_SCALE. */ -@@ -717,6 +718,7 @@ static void bbr_check_full_bw_reached(struct sock *sk, +@@ -718,6 +719,7 @@ static void bbr_check_full_bw_reached(struct sock *sk, return; } ++bbr->full_bw_cnt; @@ -56,14 +57,14 @@ index 69ee877574d0..3089c956b9f9 100644 } /* If pipe is probably full, drain the queue and then enter steady-state. */ -@@ -850,6 +852,7 @@ static void bbr_init(struct sock *sk) +@@ -851,6 +853,7 @@ static void bbr_init(struct sock *sk) bbr->restore_cwnd = 0; bbr->round_start = 0; bbr->idle_restart = 0; + bbr->full_bw_reached = 0; bbr->full_bw = 0; bbr->full_bw_cnt = 0; - bbr->cycle_mstamp = 0; + bbr->cycle_mstamp.v64 = 0; -- 2.15.0 |