nginx-quic: src/event/quic/ngx_event

comparison src/event/quic/ngx_event_quic.c @ 8290:faa3201ff351 quic

QUIC: improved setting the lost timer. Setting the timer is brought into compliance with quic-recovery-34. Now it's set from a single function ngx_quic_set_lost_timer() that takes into account both loss detection and PTO. The following issues are fixed with this change: - when in loss detection mode, discarding a context could turn off the timer forever after switching to the PTO mode - when in loss detection mode, sending a packet resulted in rescheduling the timer as if it's always in the PTO mode

author	Roman Arutyunyan <arut@nginx.com>
date	Fri, 12 Feb 2021 14:40:33 +0300
parents	88c9c868a7c9
children	9ed95726b99b

comparison

equal deleted inserted replaced

-:88c9c868a7c9
+:faa3201ff351
 */
 #define ngx_quic_get_send_ctx(qc, level)                                      \
 ((level) == ssl_encryption_initial) ? &((qc)->send_ctx[0])                \
 : (((level) == ssl_encryption_handshake) ? &((qc)->send_ctx[1])       \
 : &((qc)->send_ctx[2]))
+#define ngx_quic_lost_threshold(qc)                                           \
+ngx_max(NGX_QUIC_TIME_THR * ngx_max((qc)->latest_rtt, (qc)->avg_rtt),     \
+NGX_QUIC_TIME_GRANULARITY)
 #define NGX_QUIC_SEND_CTX_LAST  (NGX_QUIC_ENCRYPTION_LAST - 1)
 /*
 * 7.4.  Cryptographic Message Buffering
 static void ngx_quic_set_packet_number(ngx_quic_header_t *pkt,
 ngx_quic_send_ctx_t *ctx);
 static void ngx_quic_pto_handler(ngx_event_t *ev);
 static void ngx_quic_lost_handler(ngx_event_t *ev);
 static ngx_int_t ngx_quic_detect_lost(ngx_connection_t *c);
+static void ngx_quic_set_lost_timer(ngx_connection_t *c);
 static void ngx_quic_resend_frames(ngx_connection_t *c,
 ngx_quic_send_ctx_t *ctx);
 static void ngx_quic_push_handler(ngx_event_t *ev);
 static void ngx_quic_rbtree_insert_stream(ngx_rbtree_node_t *temp,
 if (level == ssl_encryption_initial) {
 ngx_quic_clear_temp_server_ids(c);
 }
 ctx->send_ack = 0;
+ngx_quic_set_lost_timer(c);
 }
 static ngx_int_t
 ngx_quic_check_csid(ngx_quic_connection_t *qc, ngx_quic_header_t *pkt)
 if (!qc->send_timer_set && !qc->closing) {
 qc->send_timer_set = 1;
 ngx_add_timer(c->read, qc->tp.max_idle_timeout);
 }
 }
+ngx_quic_set_lost_timer(c);
 return NGX_OK;
 }
 do {
 q = ngx_queue_head(&ctx->frames);
 ngx_queue_remove(q);
 ngx_queue_insert_tail(&ctx->sent, q);
 } while (--nframes);
-if (qc->pto.timer_set) {
-ngx_del_timer(&qc->pto);
-}
-ngx_add_timer(&qc->pto, ngx_quic_pto(c, ctx));
 }
 cg->in_flight += res.len;
 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
 static ngx_int_t
 ngx_quic_detect_lost(ngx_connection_t *c)
 {
 ngx_uint_t              i;
-ngx_msec_t              now, wait, min_wait, thr;
+ngx_msec_t              now, wait, thr;
 ngx_queue_t            *q;
 ngx_quic_frame_t       *start;
 ngx_quic_send_ctx_t    *ctx;
 ngx_quic_connection_t  *qc;
 qc = ngx_quic_get_connection(c);
 now = ngx_current_msec;
+thr = ngx_quic_lost_threshold(qc);
-min_wait = 0;
-thr = NGX_QUIC_TIME_THR * ngx_max(qc->latest_rtt, qc->avg_rtt);
-thr = ngx_max(thr, NGX_QUIC_TIME_GRANULARITY);
 for (i = 0; i < NGX_QUIC_SEND_CTX_LAST; i++) {
 ctx = &qc->send_ctx[i];
 start->pnum, thr, (ngx_int_t) wait, start->level);
 if ((ngx_msec_int_t) wait > 0
 && ctx->largest_ack - start->pnum < NGX_QUIC_PKT_THR)
 {
-if (min_wait == 0 || wait < min_wait) {
-min_wait = wait;
-}
 break;
 }
 ngx_quic_resend_frames(c, ctx);
 }
 }
-/* no more preceeding packets */
+ngx_quic_set_lost_timer(c);
-if (min_wait == 0) {
+return NGX_OK;
-qc->pto.handler = ngx_quic_pto_handler;
+}
-return NGX_OK;
-}
+static void
-qc->pto.handler = ngx_quic_lost_handler;
+ngx_quic_set_lost_timer(ngx_connection_t *c)
+{
+ngx_uint_t              i;
+ngx_msec_t              now;
+ngx_queue_t            *q;
+ngx_msec_int_t          lost, pto, w;
+ngx_quic_frame_t       *f;
+ngx_quic_send_ctx_t    *ctx;
+ngx_quic_connection_t  *qc;
+qc = ngx_quic_get_connection(c);
+now = ngx_current_msec;
+lost = -1;
+pto = -1;
+for (i = 0; i < NGX_QUIC_SEND_CTX_LAST; i++) {
+ctx = &qc->send_ctx[i];
+if (ngx_queue_empty(&ctx->sent)) {
+continue;
+}
+if (ctx->largest_ack != NGX_QUIC_UNSET_PN) {
+q = ngx_queue_head(&ctx->sent);
+f = ngx_queue_data(q, ngx_quic_frame_t, queue);
+w = (ngx_msec_int_t) (f->last + ngx_quic_lost_threshold(qc) - now);
+if (f->pnum <= ctx->largest_ack) {
+if (w < 0 || ctx->largest_ack - f->pnum >= NGX_QUIC_PKT_THR) {
+w = 0;
+}
+if (lost == -1 || w < lost) {
+lost = w;
+}
+}
+}
+q = ngx_queue_last(&ctx->sent);
+f = ngx_queue_data(q, ngx_quic_frame_t, queue);
+w = (ngx_msec_int_t) (f->last + ngx_quic_pto(c, ctx) - now);
+if (w < 0) {
+w = 0;
+}
+if (pto == -1 || w < pto) {
+pto = w;
+}
+}
 if (qc->pto.timer_set) {
 ngx_del_timer(&qc->pto);
 }
-ngx_add_timer(&qc->pto, min_wait);
+if (lost != -1) {
+ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
-return NGX_OK;
+"quic lost timer lost:%M", lost);
+qc->pto.handler = ngx_quic_lost_handler;
+ngx_add_timer(&qc->pto, lost);
+return;
+}
+if (pto != -1) {
+ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+"quic lost timer pto:%M", pto);
+qc->pto.handler = ngx_quic_pto_handler;
+ngx_add_timer(&qc->pto, pto);
+return;
+}
+ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "quic lost timer unset");
 }
 static void
 ngx_quic_resend_frames(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx)

Mercurial > hg > nginx-quic

comparison src/event/quic/ngx_event_quic.c @ 8290:faa3201ff351 quic