diff options
| author | Richard Scheffenegger <rscheff@FreeBSD.org> | 2024-01-08 08:28:01 +0000 |
|---|---|---|
| committer | Richard Scheffenegger <rscheff@FreeBSD.org> | 2024-01-08 09:53:04 +0000 |
| commit | 429f14f83ae1f6357a9455d4f075522420b01b03 (patch) | |
| tree | a048693b257e1e6ca289a3c6cd37da6660417e40 | |
| parent | f4574e2dc5a4719379496338257526aba484751b (diff) | |
| download | src-429f14f83ae1f6357a9455d4f075522420b01b03.tar.gz src-429f14f83ae1f6357a9455d4f075522420b01b03.zip | |
tcp: clean PRR state after ECN congestion recovery.
PRR state was not properly reset on subsequent ECN CE
events. Clean up after local transmission failures too.
Reviewed by: tuexen, cc, #transport
MFC after: 3 days
Sponsored by: NetApp, Inc.
Differential Revision: https://reviews.freebsd.org/D43170
| -rw-r--r-- | sys/netinet/tcp_input.c | 1 | ||||
| -rw-r--r-- | sys/netinet/tcp_output.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 0014c11d9daa..ed5f28490852 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -483,6 +483,7 @@ cc_post_recovery(struct tcpcb *tp, struct tcphdr *th) /* XXXLAS: EXIT_RECOVERY ? */ tp->t_bytes_acked = 0; tp->sackhint.delivered_data = 0; + tp->sackhint.prr_delivered = 0; tp->sackhint.prr_out = 0; } diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 8d863ffcf432..1ff6f5bee39a 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1663,6 +1663,8 @@ timer: if (flags & TH_FIN) tp->snd_nxt--; } + if (IN_RECOVERY(tp->t_flags)) + tp->sackhint.prr_out -= len; } SOCKBUF_UNLOCK_ASSERT(&so->so_snd); /* Check gotos. */ switch (error) { |