Skip to content

Commit cbfc8e0

Browse files
v23.05.3 released
Refresh patches Signed-off-by: Nicholas Sun <nicholas-sun@outlook.com>
1 parent 6eb1a4d commit cbfc8e0

File tree

52 files changed

+116
-105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+116
-105
lines changed

PATCH/BBRv3/kernel/009-0001-net-tcp_rate-consolidate-inflight-tracking-approache.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,23 @@ Change-Id: I1a184aad6d101c981ac7f2f275aa9417ff856910
4242
/* start of send pipeline phase */
4343
--- a/net/ipv4/tcp_input.c
4444
+++ b/net/ipv4/tcp_input.c
45-
@@ -3255,7 +3255,6 @@ static int tcp_clean_rtx_queue(struct so
45+
@@ -3256,7 +3256,6 @@ static int tcp_clean_rtx_queue(struct so
4646
long seq_rtt_us = -1L;
4747
long ca_rtt_us = -1L;
4848
u32 pkts_acked = 0;
4949
- u32 last_in_flight = 0;
5050
bool rtt_update;
5151
int flag = 0;
5252

53-
@@ -3291,7 +3290,6 @@ static int tcp_clean_rtx_queue(struct so
53+
@@ -3292,7 +3291,6 @@ static int tcp_clean_rtx_queue(struct so
5454
if (!first_ackt)
5555
first_ackt = last_ackt;
5656

5757
- last_in_flight = TCP_SKB_CB(skb)->tx.in_flight;
5858
if (before(start_seq, reord))
5959
reord = start_seq;
6060
if (!after(scb->end_seq, tp->high_seq))
61-
@@ -3357,8 +3355,8 @@ static int tcp_clean_rtx_queue(struct so
61+
@@ -3358,8 +3356,8 @@ static int tcp_clean_rtx_queue(struct so
6262
seq_rtt_us = tcp_stamp_us_delta(tp->tcp_mstamp, first_ackt);
6363
ca_rtt_us = tcp_stamp_us_delta(tp->tcp_mstamp, last_ackt);
6464

@@ -69,7 +69,7 @@ Change-Id: I1a184aad6d101c981ac7f2f275aa9417ff856910
6969
sack->rate->prior_delivered + 1 == tp->delivered &&
7070
!(flag & (FLAG_CA_ALERT | FLAG_SYN_ACKED))) {
7171
/* Conservatively mark a delayed ACK. It's typically
72-
@@ -3415,9 +3413,10 @@ static int tcp_clean_rtx_queue(struct so
72+
@@ -3416,9 +3414,10 @@ static int tcp_clean_rtx_queue(struct so
7373

7474
if (icsk->icsk_ca_ops->pkts_acked) {
7575
struct ack_sample sample = { .pkts_acked = pkts_acked,

PATCH/BBRv3/kernel/009-0003-gso-net-allow-gso_max_size-to-exceed-65536.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
5959
}
6060
--- a/net/core/dev.c
6161
+++ b/net/core/dev.c
62-
@@ -10858,7 +10858,7 @@ struct net_device *alloc_netdev_mqs(int
62+
@@ -10861,7 +10861,7 @@ struct net_device *alloc_netdev_mqs(int
6363

6464
dev_net_set(dev, &init_net);
6565

PATCH/BBRv3/kernel/009-plb-0001-tcp-add-sysctls-for-TCP-PLB-parameters.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
188188

189189
--- a/net/ipv4/tcp_ipv4.c
190190
+++ b/net/ipv4/tcp_ipv4.c
191-
@@ -3206,6 +3206,14 @@ static int __net_init tcp_sk_init(struct
191+
@@ -3203,6 +3203,14 @@ static int __net_init tcp_sk_init(struct
192192
net->ipv4.sysctl_tcp_fastopen_blackhole_timeout = 0;
193193
atomic_set(&net->ipv4.tfo_active_disable_times, 0);
194194

PATCH/BBRv3/kernel/009-plb-0002-tcp-add-PLB-functionality-for-TCP.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
8282
inet_fragment.o ping.o ip_tunnel_core.o gre_offload.o \
8383
--- a/net/ipv4/tcp_ipv4.c
8484
+++ b/net/ipv4/tcp_ipv4.c
85-
@@ -3212,7 +3212,7 @@ static int __net_init tcp_sk_init(struct
85+
@@ -3209,7 +3209,7 @@ static int __net_init tcp_sk_init(struct
8686
net->ipv4.sysctl_tcp_plb_rehash_rounds = 12;
8787
net->ipv4.sysctl_tcp_plb_suspend_rto_sec = 60;
8888
/* Default congestion threshold for PLB to mark a round is 50% */

PATCH/BBRv3/kernel/010-bbr3-0001-net-tcp_bbr-broaden-app-limited-rate-sample-detectio.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
3232

3333
--- a/net/ipv4/tcp_input.c
3434
+++ b/net/ipv4/tcp_input.c
35-
@@ -3822,6 +3822,7 @@ static int tcp_ack(struct sock *sk, cons
35+
@@ -3827,6 +3827,7 @@ static int tcp_ack(struct sock *sk, cons
3636

3737
prior_fack = tcp_is_sack(tp) ? tcp_highest_sack_seq(tp) : tp->snd_una;
3838
rs.prior_in_flight = tcp_packets_in_flight(tp);

PATCH/BBRv3/kernel/010-bbr3-0005-net-tcp_bbr-v2-export-FLAG_ECE-in-rate_sample.is_ece.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
2828
struct tcp_congestion_ops {
2929
--- a/net/ipv4/tcp_input.c
3030
+++ b/net/ipv4/tcp_input.c
31-
@@ -3921,6 +3921,7 @@ static int tcp_ack(struct sock *sk, cons
31+
@@ -3926,6 +3926,7 @@ static int tcp_ack(struct sock *sk, cons
3232
delivered = tcp_newly_delivered(sk, delivered, flag);
3333
lost = tp->lost - lost; /* freshly marked lost */
3434
rs.is_ack_delayed = !!(flag & FLAG_ACK_MAYBE_DELAYED);

PATCH/BBRv3/kernel/010-bbr3-0011-net-tcp-add-fast_ack_mode-1-skip-rwin-check-in-tcp_f.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
3333
u8 chrono_type:2, /* current chronograph type */
3434
--- a/net/ipv4/tcp.c
3535
+++ b/net/ipv4/tcp.c
36-
@@ -3087,6 +3087,7 @@ int tcp_disconnect(struct sock *sk, int
36+
@@ -3091,6 +3091,7 @@ int tcp_disconnect(struct sock *sk, int
3737
tp->rx_opt.dsack = 0;
3838
tp->rx_opt.num_sacks = 0;
3939
tp->rcv_ooopack = 0;
@@ -53,7 +53,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
5353
if (tcp_ca_needs_ecn(sk))
5454
--- a/net/ipv4/tcp_input.c
5555
+++ b/net/ipv4/tcp_input.c
56-
@@ -5516,13 +5516,14 @@ static void __tcp_ack_snd_check(struct s
56+
@@ -5521,13 +5521,14 @@ static void __tcp_ack_snd_check(struct s
5757

5858
/* More than one full frame received... */
5959
if (((tp->rcv_nxt - tp->rcv_wup) > inet_csk(sk)->icsk_ack.rcv_mss &&

PATCH/BBRv3/kernel/010-bbr3-0013-net-tcp_bbr-v2-inform-CC-module-of-losses-repaired-b.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
3535
/* Information about inbound ACK, passed to cong_ops->in_ack_event() */
3636
--- a/net/ipv4/tcp_input.c
3737
+++ b/net/ipv4/tcp_input.c
38-
@@ -3724,6 +3724,7 @@ static void tcp_process_tlp_ack(struct s
38+
@@ -3725,6 +3725,7 @@ static void tcp_process_tlp_ack(struct s
3939
/* ACK advances: there was a loss, so reduce cwnd. Reset
4040
* tlp_high_seq in tcp_init_cwnd_reduction()
4141
*/

PATCH/BBRv3/kernel/010-bbr3-0014-net-tcp_bbr-v2-introduce-is_acking_tlp_retrans_seq-i.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
3131
};
3232
--- a/net/ipv4/tcp_input.c
3333
+++ b/net/ipv4/tcp_input.c
34-
@@ -3707,7 +3707,8 @@ static void tcp_replace_ts_recent(struct
34+
@@ -3708,7 +3708,8 @@ static void tcp_replace_ts_recent(struct
3535
/* This routine deals with acks during a TLP episode and ends an episode by
3636
* resetting tlp_high_seq. Ref: TLP algorithm in draft-ietf-tcpm-rack
3737
*/
@@ -41,7 +41,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
4141
{
4242
struct tcp_sock *tp = tcp_sk(sk);
4343

44-
@@ -3735,6 +3736,11 @@ static void tcp_process_tlp_ack(struct s
44+
@@ -3736,6 +3737,11 @@ static void tcp_process_tlp_ack(struct s
4545
FLAG_NOT_DUP | FLAG_DATA_SACKED))) {
4646
/* Pure dupack: original and TLP probe arrived; no loss */
4747
tp->tlp_high_seq = 0;
@@ -53,7 +53,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
5353
}
5454
}
5555

56-
@@ -3914,7 +3920,7 @@ static int tcp_ack(struct sock *sk, cons
56+
@@ -3919,7 +3925,7 @@ static int tcp_ack(struct sock *sk, cons
5757
tcp_rack_update_reo_wnd(sk, &rs);
5858

5959
if (tp->tlp_high_seq)
@@ -62,7 +62,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
6262

6363
if (tcp_ack_is_dubious(sk, flag)) {
6464
if (!(flag & (FLAG_SND_UNA_ADVANCED |
65-
@@ -3958,7 +3964,7 @@ no_queue:
65+
@@ -3963,7 +3969,7 @@ no_queue:
6666
tcp_ack_probe(sk);
6767

6868
if (tp->tlp_high_seq)

PATCH/BBRv3/kernel/010-bbr3-0016-net-tcp_bbr-v3-update-TCP-bbr-congestion-control-mod.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
140140

141141
--- a/include/net/inet_connection_sock.h
142142
+++ b/include/net/inet_connection_sock.h
143-
@@ -134,8 +134,8 @@ struct inet_connection_sock {
143+
@@ -132,8 +132,8 @@ struct inet_connection_sock {
144144
u32 icsk_probes_tstamp;
145145
u32 icsk_user_timeout;
146146

0 commit comments

Comments
 (0)