Mercurial > hg > nginx
changeset 8475:b276833111cf quic
QUIC: implemented probe timeout (PTO) calculation.
author | Vladimir Homutov <vl@nginx.com> |
---|---|
date | Thu, 16 Jul 2020 16:05:44 +0300 |
parents | 909b989ec088 |
children | f9fbeb4ee0de |
files | src/event/ngx_event_quic.c src/event/ngx_event_quic.h |
diffstat | 2 files changed, 60 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/event/ngx_event_quic.c Mon Jul 13 17:31:29 2020 +0300 +++ b/src/event/ngx_event_quic.c Thu Jul 16 16:05:44 2020 +0300 @@ -104,6 +104,8 @@ ngx_msec_t min_rtt; ngx_msec_t rttvar; + ngx_msec_t pto_count; + #if (NGX_DEBUG) ngx_uint_t nframes; #endif @@ -200,6 +202,8 @@ ngx_msec_t *send_time); static void ngx_quic_rtt_sample(ngx_connection_t *c, ngx_quic_ack_frame_t *ack, enum ssl_encryption_level_t level, ngx_msec_t send_time); +static ngx_inline ngx_msec_t ngx_quic_pto(ngx_connection_t *c, + ngx_quic_send_ctx_t *ctx); static void ngx_quic_handle_stream_ack(ngx_connection_t *c, ngx_quic_frame_t *f); @@ -1322,6 +1326,9 @@ * to terminate the connection immediately. */ + qc->error_level = c->ssl ? SSL_quic_read_level(c->ssl->connection) + : ssl_encryption_initial; + if (rc == NGX_OK) { ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "quic immediate close, drain = %d", @@ -1332,7 +1339,9 @@ qc->close.handler = ngx_quic_close_timer_handler; qc->close.cancelable = 1; - ngx_add_timer(&qc->close, 3 * NGX_QUIC_HARDCODED_PTO); + ctx = ngx_quic_get_send_ctx(qc, qc->error_level); + + ngx_add_timer(&qc->close, 3 * ngx_quic_pto(c, ctx)); qc->error = NGX_QUIC_ERR_NO_ERROR; @@ -1347,9 +1356,6 @@ qc->error_reason ? qc->error_reason : ""); } - qc->error_level = c->ssl ? SSL_quic_read_level(c->ssl->connection) - : ssl_encryption_initial; - (void) ngx_quic_send_cc(c); if (qc->error_level == ssl_encryption_handshake) { @@ -1751,6 +1757,8 @@ ctx = ngx_quic_get_send_ctx(c->quic, ssl_encryption_initial); ngx_quic_free_frames(c, &ctx->sent); + qc->pto_count = 0; + return ngx_quic_payload_handler(c, pkt); } @@ -2404,6 +2412,8 @@ ngx_post_event(&qc->push, &ngx_posted_events); } + qc->pto_count = 0; + return NGX_OK; } @@ -2454,6 +2464,34 @@ } +static ngx_inline ngx_msec_t +ngx_quic_pto(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx) +{ + ngx_msec_t duration; + ngx_quic_connection_t *qc; + + qc = c->quic; + + /* PTO calculation: quic-recovery, Appendix 8 */ + duration = qc->avg_rtt; + + duration += ngx_max(4 * qc->rttvar, NGX_QUIC_TIME_GRANULARITY); + duration <<= qc->pto_count; + + if (qc->congestion.in_flight == 0) { /* no in-flight packets */ + return duration; + } + + if (ctx == &qc->send_ctx[2] && c->ssl->handshaked) { + /* application send space */ + + duration += qc->tp.max_ack_delay << qc->pto_count; + } + + return duration; +} + + static void ngx_quic_handle_stream_ack(ngx_connection_t *c, ngx_quic_frame_t *f) { @@ -2766,6 +2804,8 @@ ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "quic handshake completed successfully"); + c->ssl->handshaked = 1; + frame = ngx_quic_alloc_frame(c, 0); if (frame == NULL) { return NGX_ERROR; @@ -2799,6 +2839,8 @@ */ ctx = ngx_quic_get_send_ctx(c->quic, ssl_encryption_handshake); ngx_quic_free_frames(c, &ctx->sent); + + c->quic->pto_count = 0; } ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0, @@ -3484,7 +3526,10 @@ } else { ngx_queue_add(&ctx->sent, frames); - ngx_add_timer(&qc->pto, NGX_QUIC_HARDCODED_PTO); + if (qc->pto.timer_set) { + ngx_del_timer(&qc->pto); + } + ngx_add_timer(&qc->pto, ngx_quic_pto(c, ctx)); } qc->congestion.in_flight += out.len; @@ -3544,6 +3589,8 @@ ngx_quic_close_connection(c, NGX_ERROR); return; } + + c->quic->pto_count++; } @@ -3579,12 +3626,13 @@ min_wait = 0; +#if (NGX_SUPPRESS_WARN) + thr = 0; +#endif + if (ack) { thr = NGX_QUIC_TIME_THR * ngx_max(qc->latest_rtt, qc->avg_rtt); thr = ngx_max(thr, NGX_QUIC_TIME_GRANULARITY); - - } else { - thr = NGX_QUIC_HARDCODED_PTO; } for (i = 0; i < NGX_QUIC_SEND_CTX_LAST; i++) { @@ -3595,6 +3643,10 @@ continue; } + if (!ack) { + thr = ngx_quic_pto(c, ctx); + } + q = ngx_queue_head(&ctx->sent); do {
--- a/src/event/ngx_event_quic.h Mon Jul 13 17:31:29 2020 +0300 +++ b/src/event/ngx_event_quic.h Thu Jul 16 16:05:44 2020 +0300 @@ -44,7 +44,6 @@ /* quic-recovery, section 6.2.2, kInitialRtt */ #define NGX_QUIC_INITIAL_RTT 333 /* ms */ -#define NGX_QUIC_HARDCODED_PTO 1000 /* 1s, TODO: collect */ /* quic-recovery, section 6.1.1, Packet Threshold */ #define NGX_QUIC_PKT_THR 3 /* packets */ /* quic-recovery, section 6.1.2, Time Threshold */