Refine BBRv3 patches

nicholas-opensource · nicholas-opensource · commit 296e33242dfa · 2023-09-02T22:19:42.000+08:00
Signed-off-by: Nicholas Sun &lt;nicholas-sun@outlook.com&gt;
diff --git a/PATCH/BBRv3/kernel/010-bbr3-0001-net-tcp_bbr-broaden-app-limited-rate-sample-detectio.patch b/PATCH/BBRv3/kernel/010-bbr3-0001-net-tcp_bbr-broaden-app-limited-rate-sample-detectio.patch
@@ -1,7 +1,7 @@
-From 8f02746d442e04734984510d49cb703b4af8a91b Mon Sep 17 00:00:00 2001
+From ee5316263c5ba74198729ad83aeef714a11b767b Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Tue, 11 Jun 2019 12:26:55 -0400
-Subject: [PATCH 01/23] net-tcp_bbr: broaden app-limited rate sample detection
+Subject: [PATCH 01/21] net-tcp_bbr: broaden app-limited rate sample detection
 
 This commit is a bug fix for the Linux TCP app-limited
 (application-limited) logic that is used for collecting rate
diff --git a/PATCH/BBRv3/kernel/010-bbr3-0002-net-tcp_bbr-v2-shrink-delivered_mstamp-first_tx_msta.patch b/PATCH/BBRv3/kernel/010-bbr3-0002-net-tcp_bbr-v2-shrink-delivered_mstamp-first_tx_msta.patch
@@ -1,7 +1,7 @@
-From 955df87f53c7b4519534d795fc47389df11813a7 Mon Sep 17 00:00:00 2001
+From 6c3b493c130425c182198467e1b53df3e3fcf6cb Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Sun, 24 Jun 2018 21:55:59 -0400
-Subject: [PATCH 02/23] net-tcp_bbr: v2: shrink delivered_mstamp,
+Subject: [PATCH 02/21] net-tcp_bbr: v2: shrink delivered_mstamp,
  first_tx_mstamp to u32 to free up 8 bytes
 
 Free up some space for tracking inflight and losses for each
diff --git a/PATCH/BBRv3/kernel/010-bbr3-0003-net-tcp_bbr-v2-snapshot-packets-in-flight-at-transmi.patch b/PATCH/BBRv3/kernel/010-bbr3-0003-net-tcp_bbr-v2-snapshot-packets-in-flight-at-transmi.patch
@@ -1,7 +1,7 @@
-From 85a795dfc3c36ee86a7db11b16e5a9bee49a9c94 Mon Sep 17 00:00:00 2001
+From 6c8b2fee61ff1cfe0c6d58bee1167263adfaa147 Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Sat, 5 Aug 2017 11:49:50 -0400
-Subject: [PATCH 03/23] net-tcp_bbr: v2: snapshot packets in flight at transmit
+Subject: [PATCH 03/21] net-tcp_bbr: v2: snapshot packets in flight at transmit
  time and pass in rate_sample
 
 CC algorithms may want to snapshot the number of packets in flight at
diff --git a/PATCH/BBRv3/kernel/010-bbr3-0004-net-tcp_bbr-v2-count-packets-lost-over-TCP-rate-samp.patch b/PATCH/BBRv3/kernel/010-bbr3-0004-net-tcp_bbr-v2-count-packets-lost-over-TCP-rate-samp.patch
@@ -1,7 +1,7 @@
-From 2065525b978247b5bf7cd5086856196e6ec49d8d Mon Sep 17 00:00:00 2001
+From 279e65d7ed83383ff3b129e7f418a46e93637e25 Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Thu, 12 Oct 2017 23:44:27 -0400
-Subject: [PATCH 04/23] net-tcp_bbr: v2: count packets lost over TCP rate
+Subject: [PATCH 04/21] net-tcp_bbr: v2: count packets lost over TCP rate
  sampling interval
 
 For understanding the relationship between inflight and packet loss
diff --git a/PATCH/BBRv3/kernel/010-bbr3-0005-net-tcp_bbr-v2-export-FLAG_ECE-in-rate_sample.is_ece.patch b/PATCH/BBRv3/kernel/010-bbr3-0005-net-tcp_bbr-v2-export-FLAG_ECE-in-rate_sample.is_ece.patch
@@ -1,7 +1,7 @@
-From 4b14c2af997dbd6f246ed2f1eb72d889e8a22c53 Mon Sep 17 00:00:00 2001
+From 1c819004ff8e2470bd599304a22deb4e8e7da789 Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Mon, 19 Nov 2018 13:48:36 -0500
-Subject: [PATCH 05/23] net-tcp_bbr: v2: export FLAG_ECE in rate_sample.is_ece
+Subject: [PATCH 05/21] net-tcp_bbr: v2: export FLAG_ECE in rate_sample.is_ece
 
 For understanding the relationship between inflight and ECN signals,
 to try to find the highest inflight value that has acceptable levels
diff --git a/PATCH/BBRv3/kernel/010-bbr3-0006-net-tcp_bbr-v2-introduce-ca_ops-skb_marked_lost-CC-m.patch b/PATCH/BBRv3/kernel/010-bbr3-0006-net-tcp_bbr-v2-introduce-ca_ops-skb_marked_lost-CC-m.patch
@@ -1,7 +1,7 @@
-From 2f6b483516731a24a1153bc2a9cbf126cbea65dc Mon Sep 17 00:00:00 2001
+From 92cc6148b75351640fa820dedf61dfef59d7b9f0 Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Tue, 7 Aug 2018 21:52:06 -0400
-Subject: [PATCH 06/23] net-tcp_bbr: v2: introduce ca_ops->skb_marked_lost() CC
+Subject: [PATCH 06/21] net-tcp_bbr: v2: introduce ca_ops->skb_marked_lost() CC
  module callback API
 
 For connections experiencing reordering, RACK can mark packets lost
diff --git a/PATCH/BBRv3/kernel/010-bbr3-0007-net-tcp_bbr-v2-adjust-skb-tx.in_flight-upon-merge-in.patch b/PATCH/BBRv3/kernel/010-bbr3-0007-net-tcp_bbr-v2-adjust-skb-tx.in_flight-upon-merge-in.patch
@@ -1,7 +1,7 @@
-From c1de461232f438ca59e66173c4f0a111b26a1eab Mon Sep 17 00:00:00 2001
+From af3ff4671302c4a1eb90bb31611879bb6072e49d Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Wed, 1 May 2019 20:16:33 -0400
-Subject: [PATCH 07/23] net-tcp_bbr: v2: adjust skb tx.in_flight upon merge in
+Subject: [PATCH 07/21] net-tcp_bbr: v2: adjust skb tx.in_flight upon merge in
  tcp_shifted_skb()
 
 When tcp_shifted_skb() updates state as adjacent SACKed skbs are
diff --git a/PATCH/BBRv3/kernel/010-bbr3-0008-net-tcp_bbr-v2-adjust-skb-tx.in_flight-upon-split-in.patch b/PATCH/BBRv3/kernel/010-bbr3-0008-net-tcp_bbr-v2-adjust-skb-tx.in_flight-upon-split-in.patch
@@ -1,7 +1,7 @@
-From 386d4b3fc1fbe32b534117d0d339d0411d45828a Mon Sep 17 00:00:00 2001
+From 2db599c7a175276638aa9179ff7ce0de8610e096 Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Wed, 1 May 2019 20:16:25 -0400
-Subject: [PATCH 08/23] net-tcp_bbr: v2: adjust skb tx.in_flight upon split in
+Subject: [PATCH 08/21] net-tcp_bbr: v2: adjust skb tx.in_flight upon split in
  tcp_fragment()
 
 When we fragment an skb that has already been sent, we need to update
diff --git a/PATCH/BBRv3/kernel/010-bbr3-0009-net-tcp-add-new-ca-opts-flag-TCP_CONG_WANTS_CE_EVENT.patch b/PATCH/BBRv3/kernel/010-bbr3-0009-net-tcp-add-new-ca-opts-flag-TCP_CONG_WANTS_CE_EVENT.patch
@@ -1,7 +1,7 @@
-From 86e3732c0ec7939ab5500270885308ceb238a27a Mon Sep 17 00:00:00 2001
+From d89ac2278c715f20378c8b22c707f4a768f86d13 Mon Sep 17 00:00:00 2001
 From: Yousuk Seung <ysseung@google.com>
 Date: Wed, 23 May 2018 17:55:54 -0700
-Subject: [PATCH 09/23] net-tcp: add new ca opts flag TCP_CONG_WANTS_CE_EVENTS
+Subject: [PATCH 09/21] net-tcp: add new ca opts flag TCP_CONG_WANTS_CE_EVENTS
 
 Add a a new ca opts flag TCP_CONG_WANTS_CE_EVENTS that allows a
 congestion control module to receive CE events.
diff --git a/PATCH/BBRv3/kernel/010-bbr3-0010-net-tcp-re-generalize-TSO-sizing-in-TCP-CC-module-AP.patch b/PATCH/BBRv3/kernel/010-bbr3-0010-net-tcp-re-generalize-TSO-sizing-in-TCP-CC-module-AP.patch
@@ -1,7 +1,7 @@
-From 120a19c6ce514c4c889763b1603e1727619785ff Mon Sep 17 00:00:00 2001
+From c54e85537abd076d1c87a49323a65a1c2980748d Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Fri, 27 Sep 2019 17:10:26 -0400
-Subject: [PATCH 10/23] net-tcp: re-generalize TSO sizing in TCP CC module API
+Subject: [PATCH 10/21] net-tcp: re-generalize TSO sizing in TCP CC module API
 
 Reorganize the API for CC modules so that the CC module once again
 gets complete control of the TSO sizing decision. This is how the API
@@ -19,10 +19,10 @@ large cwnd, and thus large pacing rate and large TSO burst size.
 
 Change-Id: Ic8ccfdbe4010ee8d4bf6a6334c48a2fceb2171ea
 ---
- include/net/tcp.h     |  4 ++--
+ include/net/tcp.h     |  3 +++
  net/ipv4/tcp_bbr.c    | 37 ++++++++++++++++++++++++++-----------
  net/ipv4/tcp_output.c | 11 +++++------
- 3 files changed, 33 insertions(+), 19 deletions(-)
+ 3 files changed, 34 insertions(+), 17 deletions(-)
 
 diff --git a/include/net/tcp.h b/include/net/tcp.h
 index 2a7632c87..484e3bcfc 100644
diff --git a/PATCH/BBRv3/kernel/010-bbr3-0011-net-tcp-add-fast_ack_mode-1-skip-rwin-check-in-tcp_f.patch b/PATCH/BBRv3/kernel/010-bbr3-0011-net-tcp-add-fast_ack_mode-1-skip-rwin-check-in-tcp_f.patch
@@ -1,7 +1,7 @@
-From 3c0330134029303b67eb49730508b706d8e661ac Mon Sep 17 00:00:00 2001
+From 8c21eb6f85f3a59479338943f1b6a0a60898329a Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Sat, 16 Nov 2019 13:16:25 -0500
-Subject: [PATCH 11/23] net-tcp: add fast_ack_mode=1: skip rwin check in
+Subject: [PATCH 11/21] net-tcp: add fast_ack_mode=1: skip rwin check in
  tcp_fast_ack_mode__tcp_ack_snd_check()
 
 Add logic for an experimental TCP connection behavior, enabled with
diff --git a/PATCH/BBRv3/kernel/010-bbr3-0012-net-tcp_bbr-v2-record-app-limited-status-of-TLP-repa.patch b/PATCH/BBRv3/kernel/010-bbr3-0012-net-tcp_bbr-v2-record-app-limited-status-of-TLP-repa.patch
@@ -1,7 +1,7 @@
-From 996bca0c6d8518a02e6dba80d107337f3bc41fe1 Mon Sep 17 00:00:00 2001
+From b3cbcc29ea192bfc6174e92eb833d999551608f8 Mon Sep 17 00:00:00 2001
 From: Jianfeng Wang <jfwang@google.com>
 Date: Fri, 19 Jun 2020 17:33:45 +0000
-Subject: [PATCH 12/23] net-tcp_bbr: v2: record app-limited status of
+Subject: [PATCH 12/21] net-tcp_bbr: v2: record app-limited status of
  TLP-repaired flight
 
 When sending a TLP retransmit, record whether the outstanding flight
diff --git a/PATCH/BBRv3/kernel/010-bbr3-0013-net-tcp_bbr-v2-inform-CC-module-of-losses-repaired-b.patch b/PATCH/BBRv3/kernel/010-bbr3-0013-net-tcp_bbr-v2-inform-CC-module-of-losses-repaired-b.patch
@@ -1,7 +1,7 @@
-From 7bd9e5381421c89d15fee7789626e82e43a585ce Mon Sep 17 00:00:00 2001
+From 056449511b1f5c6a2b9758655f01f2dd8e135fa0 Mon Sep 17 00:00:00 2001
 From: Jianfeng Wang <jfwang@google.com>
 Date: Tue, 16 Jun 2020 17:41:19 +0000
-Subject: [PATCH 13/23] net-tcp_bbr: v2: inform CC module of losses repaired by
+Subject: [PATCH 13/21] net-tcp_bbr: v2: inform CC module of losses repaired by
  TLP probe
 
 Before this commit, when there is a packet loss that creates a sequence
@@ -23,7 +23,7 @@ Change-Id: Ieba72332b401b329bff5a641d2b2043a3fb8f632
  2 files changed, 2 insertions(+)
 
 diff --git a/include/net/tcp.h b/include/net/tcp.h
-index 2d5a5eec7..545f83812 100644
+index 484e3bcfc..eb895a286 100644
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
 @@ -988,6 +988,7 @@ enum tcp_ca_event {
diff --git a/PATCH/BBRv3/kernel/010-bbr3-0014-net-tcp_bbr-v2-introduce-is_acking_tlp_retrans_seq-i.patch b/PATCH/BBRv3/kernel/010-bbr3-0014-net-tcp_bbr-v2-introduce-is_acking_tlp_retrans_seq-i.patch
@@ -1,7 +1,7 @@
-From 871f6e51279da945b01e989f27ea1e34efa1f469 Mon Sep 17 00:00:00 2001
+From 75174504fa6181dbea412b841f3804c19a1599ec Mon Sep 17 00:00:00 2001
 From: Neal Cardwell <ncardwell@google.com>
 Date: Mon, 21 Sep 2020 14:46:26 -0400
-Subject: [PATCH 14/23] net-tcp_bbr: v2: introduce is_acking_tlp_retrans_seq
+Subject: [PATCH 14/21] net-tcp_bbr: v2: introduce is_acking_tlp_retrans_seq
  into rate_sample
 
 Introduce is_acking_tlp_retrans_seq into rate_sample. This bool will
@@ -19,7 +19,7 @@ Change-Id: I2e6494332167e75efcbdc99bd5c119034e9c39b4
  2 files changed, 10 insertions(+), 3 deletions(-)
 
 diff --git a/include/net/tcp.h b/include/net/tcp.h
-index 545f83812..ed2352c0f 100644
+index eb895a286..4ca98c13e 100644
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
 @@ -1051,6 +1051,7 @@ struct rate_sample {
diff --git a/PATCH/BBRv3/kernel/010-bbr3-0015-tcp-introduce-per-route-feature-RTAX_FEATURE_ECN_LOW.patch b/PATCH/BBRv3/kernel/010-bbr3-0015-tcp-introduce-per-route-feature-RTAX_FEATURE_ECN_LOW.patch
@@ -1,7 +1,7 @@
-From 290fa4557da7eda259dee30952b32e421a1ff475 Mon Sep 17 00:00:00 2001
+From f461af1920b21e171e0fa300811e3950f4d16f38 Mon Sep 17 00:00:00 2001
 From: David Morley <morleyd@google.com>
 Date: Fri, 14 Jul 2023 11:07:56 -0400
-Subject: [PATCH 15/23] tcp: introduce per-route feature RTAX_FEATURE_ECN_LOW
+Subject: [PATCH 15/21] tcp: introduce per-route feature RTAX_FEATURE_ECN_LOW
 
 Define and implement a new per-route feature, RTAX_FEATURE_ECN_LOW.
 
@@ -31,7 +31,7 @@ Change-Id: I6bc06e9c6cb426fbae7243fc71c9a8c18175f5d3
  4 files changed, 19 insertions(+), 3 deletions(-)
 
 diff --git a/include/net/tcp.h b/include/net/tcp.h
-index ed2352c0f..8777165ba 100644
+index 4ca98c13e..8ea77d0b8 100644
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
 @@ -360,6 +360,7 @@ static inline void tcp_dec_quickack_mode(struct sock *sk,
diff --git a/PATCH/BBRv3/kernel/010-bbr3-0016-net-allow-gso_max_size-to-exceed-65536.patch b/PATCH/BBRv3/kernel/010-bbr3-0016-net-allow-gso_max_size-to-exceed-65536.patch
@@ -1,7 +1,7 @@
-From 2630ebb33e34348c0efe943d2cd6b746b7880165 Mon Sep 17 00:00:00 2001
+From 9fffe7e05bb0da5aef700cc246a71fc33672c81e Mon Sep 17 00:00:00 2001
 From: Alexander Duyck <alexanderduyck@fb.com>
 Date: Fri, 13 May 2022 11:33:57 -0700
-Subject: [PATCH 18/23] net: allow gso_max_size to exceed 65536
+Subject: [PATCH 16/21] net: allow gso_max_size to exceed 65536
 
 The code for gso_max_size was added originally to allow for debugging and
 workaround of buggy devices that couldn't support TSO with blocks 64K in
@@ -163,10 +163,10 @@ index 4d698ccf4..3725ccecd 100644
  	dev->upper_level = 1;
  	dev->lower_level = 1;
 diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
-index ee4fe5874..98b0332c9 100644
+index a01888029..bdb7e4ef3 100644
 --- a/net/ipv4/tcp_output.c
 +++ b/net/ipv4/tcp_output.c
-@@ -1557,7 +1557,7 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue,
+@@ -1553,7 +1553,7 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue,
  	 * SO_SNDBUF values.
  	 * Also allow first and last skb in retransmit queue to be split.
  	 */
diff --git a/PATCH/BBRv3/kernel/010-bbr3-0016-tcp-Add-a-sysctl-to-skip-tcp-collapse-processing-whe.patch b/PATCH/BBRv3/kernel/010-bbr3-0016-tcp-Add-a-sysctl-to-skip-tcp-collapse-processing-whe.patch
diff --git a/PATCH/BBRv3/kernel/010-bbr3-0017-tcp-Add-a-sysctl-to-allow-TCP-window-shrinking-in-or.patch b/PATCH/BBRv3/kernel/010-bbr3-0017-tcp-Add-a-sysctl-to-allow-TCP-window-shrinking-in-or.patch
diff --git a/PATCH/BBRv3/kernel/010-bbr3-0017-tcp-add-sysctls-for-TCP-PLB-parameters.patch b/PATCH/BBRv3/kernel/010-bbr3-0017-tcp-add-sysctls-for-TCP-PLB-parameters.patch
diff --git a/PATCH/BBRv3/kernel/010-bbr3-0018-tcp-add-PLB-functionality-for-TCP.patch b/PATCH/BBRv3/kernel/010-bbr3-0018-tcp-add-PLB-functionality-for-TCP.patch
diff --git a/PATCH/BBRv3/kernel/010-bbr3-0019-net-tcp_bbr-v3-update-TCP-bbr-congestion-control-mod.patch b/PATCH/BBRv3/kernel/010-bbr3-0019-net-tcp_bbr-v3-update-TCP-bbr-congestion-control-mod.patch
diff --git a/PATCH/BBRv3/kernel/010-bbr3-0020-net-tcp_bbr-v3-ensure-ECN-enabled-BBR-flows-set-ECT-.patch b/PATCH/BBRv3/kernel/010-bbr3-0020-net-tcp_bbr-v3-ensure-ECN-enabled-BBR-flows-set-ECT-.patch
diff --git a/PATCH/BBRv3/kernel/010-bbr3-0021-tcp-export-TCPI_OPT_ECN_LOW-in-tcp_info-tcpi_options.patch b/PATCH/BBRv3/kernel/010-bbr3-0021-tcp-export-TCPI_OPT_ECN_LOW-in-tcp_info-tcpi_options.patch
diff --git a/SCRIPTS/switch b/SCRIPTS/switch
