details:
https://github.com/nginx/nginx/commit/53e7e9eb542fb1d3d885bbca03ed1d704aa08f31
branches: master
commit: 53e7e9eb542fb1d3d885bbca03ed1d704aa08f31
user: Roman Arutyunyan <a...@nginx.com>
date: Fri, 3 Jan 2025 11:17:07 +0400
description:
QUIC: use path MTU in congestion window computations.
As per RFC 9002, Section B.2, max_datagram_size used in congestion window
computations should be based on path MTU.
---
src/event/quic/ngx_event_quic.c | 4 ++--
src/event/quic/ngx_event_quic_ack.c | 8 ++++----
src/event/quic/ngx_event_quic_migration.c | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/event/quic/ngx_event_quic.c b/src/event/quic/ngx_event_quic.c
index 308597e27..70d9748bd 100644
--- a/src/event/quic/ngx_event_quic.c
+++ b/src/event/quic/ngx_event_quic.c
@@ -308,8 +308,8 @@ ngx_quic_new_connection(ngx_connection_t *c,
ngx_quic_conf_t *conf,
qc->streams.client_max_streams_uni = qc->tp.initial_max_streams_uni;
qc->streams.client_max_streams_bidi = qc->tp.initial_max_streams_bidi;
- qc->congestion.window = ngx_min(10 * qc->tp.max_udp_payload_size,
- ngx_max(2 * qc->tp.max_udp_payload_size,
+ qc->congestion.window = ngx_min(10 * NGX_QUIC_MIN_INITIAL_SIZE,
+ ngx_max(2 * NGX_QUIC_MIN_INITIAL_SIZE,
14720));
qc->congestion.ssthresh = (size_t) -1;
qc->congestion.recovery_start = ngx_current_msec;
diff --git a/src/event/quic/ngx_event_quic_ack.c
b/src/event/quic/ngx_event_quic_ack.c
index 2487ea60d..4616e7053 100644
--- a/src/event/quic/ngx_event_quic_ack.c
+++ b/src/event/quic/ngx_event_quic_ack.c
@@ -353,7 +353,7 @@ ngx_quic_congestion_ack(ngx_connection_t *c,
ngx_quic_frame_t *f)
now, cg->window, cg->ssthresh, cg->in_flight);
} else {
- cg->window += qc->tp.max_udp_payload_size * f->plen / cg->window;
+ cg->window += (uint64_t) qc->path->mtu * f->plen / cg->window;
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
"quic congestion ack reno t:%M win:%uz if:%uz",
@@ -552,7 +552,7 @@ ngx_quic_persistent_congestion(ngx_connection_t *c)
now = ngx_current_msec;
cg->recovery_start = now;
- cg->window = qc->tp.max_udp_payload_size * 2;
+ cg->window = qc->path->mtu * 2;
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
"quic congestion persistent t:%M win:%uz", now, cg->window);
@@ -698,8 +698,8 @@ ngx_quic_congestion_lost(ngx_connection_t *c,
ngx_quic_frame_t *f)
cg->recovery_start = now;
cg->window /= 2;
- if (cg->window < qc->tp.max_udp_payload_size * 2) {
- cg->window = qc->tp.max_udp_payload_size * 2;
+ if (cg->window < qc->path->mtu * 2) {
+ cg->window = qc->path->mtu * 2;
}
cg->ssthresh = cg->window;
diff --git a/src/event/quic/ngx_event_quic_migration.c
b/src/event/quic/ngx_event_quic_migration.c
index 2d1467e14..ac22b1327 100644
--- a/src/event/quic/ngx_event_quic_migration.c
+++ b/src/event/quic/ngx_event_quic_migration.c
@@ -182,8 +182,8 @@ valid:
ngx_memzero(&qc->congestion, sizeof(ngx_quic_congestion_t));
- qc->congestion.window = ngx_min(10 * qc->tp.max_udp_payload_size,
- ngx_max(2 * qc->tp.max_udp_payload_size,
+ qc->congestion.window = ngx_min(10 * NGX_QUIC_MIN_INITIAL_SIZE,
+ ngx_max(2 * NGX_QUIC_MIN_INITIAL_SIZE,
14720));
qc->congestion.ssthresh = (size_t) -1;
qc->congestion.recovery_start = ngx_current_msec;
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
https://mailman.nginx.org/mailman/listinfo/nginx-devel
