← Commit list

02f5a598bb

Stefan Eissing
Stefan Eissing
2026-09-22
SUCCESS Duration: 395s

Subject

cf-ngtcp2-proxy: fix rx flow control

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

lib/vquic/cf-ngtcp2-cmn.c +0 -1lib/vquic/cf-ngtcp2-cmn.h +0 -1lib/vquic/cf-ngtcp2-proxy.c +25 -39tests/http/test_60_h3_proxy.py +2 -1
lib/vquic/cf-ngtcp2-cmn.c+0 -1
@@ -1897,7 +1897,6 @@ CURLcode Curl_cf_ngtcp2_h3_stream_setup(struct Curl_cfilter *cf,
Curl_bufq_initp(&stream->sendbuf, &ctx->stream_bufcp,
H3_STREAM_SEND_CHUNKS, BUFQ_OPT_NONE);
stream->tx_in_flight_size = 0;
- stream->window_size_max = H3_STREAM_WINDOW_SIZE_INITIAL;
Curl_h1_req_parse_init(&stream->h1, H1_PARSE_DEFAULT_MAX_LINE_LEN);
if(Curl_u32_ptrset_set(&ctx->streams, data->mid, stream)) {
lib/vquic/cf-ngtcp2-cmn.h+0 -1
@@ -172,7 +172,6 @@ struct h3_stream_ctx {
curl_off_t rx_total; /* total number of bytes received */
uint64_t rx_offset; /* current receive offset */
uint64_t rx_offset_max; /* allowed receive offset */
- uint64_t window_size_max; /* max flow control window set for stream */
size_t tx_in_flight_size; /* sendbuf data "in flight" */
size_t tx_in_flight_ideal; /* ideal amount of un-acked send data */
int status_code; /* HTTP status code */
lib/vquic/cf-ngtcp2-proxy.c+25 -39
@@ -46,7 +46,9 @@
* each active transfer. We use HTTP/3 flow control and only ACK
* when we take things out of the buffer.
* Chunk size is large enough to take a full DATA frame */
-#define PROXY_H3_STREAM_RECV_CHUNKS ((512 * 1024) / H3_STREAM_CHUNK_SIZE)
+#define PROXY_H3_TUNNEL_RX_WIN (512 * 1024)
+#define PROXY_H3_TUNNEL_RECV_CHUNKS \
+ (PROXY_H3_TUNNEL_RX_WIN / H3_STREAM_CHUNK_SIZE)
typedef enum {
H3_TUNNEL_INIT, /* init/default/no tunnel state */
@@ -75,7 +77,7 @@ static CURLcode h3_tunnel_stream_init(struct h3_tunnel_stream *ts,
ts->state = H3_TUNNEL_INIT;
Curl_peer_link(&ts->dest, dest);
Curl_bufq_init2(&ts->recvbuf, H3_STREAM_CHUNK_SIZE,
- PROXY_H3_STREAM_RECV_CHUNKS, BUFQ_OPT_SOFT_LIMIT);
+ PROXY_H3_TUNNEL_RECV_CHUNKS, BUFQ_OPT_SOFT_LIMIT);
ts->udp = udp;
/* host:port with IPv6 support */
ts->authority = curl_maprintf("%s%s%s:%u", dest->ipv6 ? "[" : "",
@@ -271,47 +273,31 @@ static void cf_h3_proxy_upd_rx_win(struct Curl_cfilter *cf,
{
struct cf_h3_proxy_ctx *pctx = cf->ctx;
struct cf_ngtcp2_ctx *ctx = &pctx->ngtcp2_ctx;
- uint64_t cur_win, wanted_win = H3_STREAM_WINDOW_SIZE_MAX;
-
- /* how much does rate limiting allow us to acknowledge? */
- if(Curl_rlimit_active(&data->progress.dl.rlimit)) {
- int64_t avail;
-
- /* start rate limit updates only after first bytes arrived */
- if(!stream->rx_offset)
- return;
-
- avail = Curl_rlimit_avail(&data->progress.dl.rlimit, NULL);
- if(avail <= 0) {
- /* nothing available, do not extend the rx offset */
- CURL_TRC_CF(data, cf, "[%" PRId64 "] dl rate limit exhausted (%" PRId64
- " tokens)", stream->id, avail);
- return;
- }
- wanted_win = CURLMIN((uint64_t)avail, H3_STREAM_WINDOW_SIZE_MAX);
- }
+ uint64_t cur_win, wanted_win = 0;
+ size_t rx_buffered;
if(stream->rx_offset_max < stream->rx_offset) {
DEBUGASSERT(0);
return;
}
+
+ rx_buffered = Curl_bufq_len(&pctx->tunnel.recvbuf);
+ wanted_win = (rx_buffered < PROXY_H3_TUNNEL_RX_WIN) ?
+ (PROXY_H3_TUNNEL_RX_WIN - rx_buffered) : 0;
cur_win = stream->rx_offset_max - stream->rx_offset;
- if(cur_win < wanted_win) {
- /* We have exhausted the credit we gave the QUIC peer for DATA.
- * We extend it with the amount we can give (rate limit) */
- uint64_t ext = wanted_win - cur_win;
-
- ngtcp2_conn_extend_max_stream_offset(ctx->qconn, stream->id, ext);
- ngtcp2_conn_extend_max_offset(ctx->qconn, ext);
- stream->rx_offset_max += ext;
- if(stream->rx_offset_max > stream->window_size_max) {
- stream->window_size_max = stream->rx_offset_max;
- CURL_TRC_CF(data, cf, "[%" PRId64 "] max window now -> %" PRIu64,
- stream->id, stream->window_size_max);
+ if(wanted_win > cur_win) {
+ uint64_t delta = wanted_win - cur_win;
+
+ if(UINT64_MAX - delta < stream->rx_offset_max)
+ delta = UINT64_MAX - stream->rx_offset_max;
+ if(delta) {
+ CURL_TRC_CF(data, cf, "[%" PRId64 "] rx window, extend %" PRIu64
+ " (buffered %zu) by %" PRIu64 " bytes",
+ stream->id, cur_win, rx_buffered, delta);
+ stream->rx_offset_max += delta;
+ ngtcp2_conn_extend_max_stream_offset(ctx->qconn, stream->id, delta);
+ ngtcp2_conn_extend_max_offset(ctx->qconn, delta);
}
- CURL_TRC_CF(data, cf, "[%" PRId64 "] rx_offset_max -> %" PRIu64
- " (ext %" PRIu64 ", win %" PRIu64 ")",
- stream->id, stream->rx_offset_max, ext, wanted_win);
}
}
@@ -344,9 +330,7 @@ static int cb_h3_proxy_recv_data(nghttp3_conn *conn, int64_t stream3_id,
return NGHTTP3_ERR_CALLBACK_FAILURE;
}
- /* DATA has been moved into our local recv buffer. Update stream offsets
- * and give QUIC read credit back so long transfers over proxy tunnels
- * do not stall on stream/connection flow-control limits. */
+ /* DATA has been moved into our local recv buffer. Update stream offsets. */
stream->rx_offset += buflen;
if(stream->rx_offset_max < stream->rx_offset)
stream->rx_offset_max = stream->rx_offset;
@@ -845,6 +829,7 @@ static CURLcode cf_h3_proxy_recv(struct Curl_cfilter *cf,
result = Curl_bufq_cread(&pctx->tunnel.recvbuf, buf, len, pnread);
if(result)
goto out;
+ cf_h3_proxy_upd_rx_win(cf, data, pctx->tunnel.stream);
}
result = Curl_cf_ngtcp2_progress_ingress(cf, data, &pktx);
@@ -859,6 +844,7 @@ static CURLcode cf_h3_proxy_recv(struct Curl_cfilter *cf,
stream->id, len, *pnread, (int)result);
goto out;
}
+ cf_h3_proxy_upd_rx_win(cf, data, pctx->tunnel.stream);
}
if(*pnread) {
tests/http/test_60_h3_proxy.py+2 -1
@@ -428,6 +428,7 @@ class TestH3Proxy:
@MARK_NEEDS_PROXY_HTTP3
@MARK_NEEDS_H2O
+ @pytest.mark.skipif(condition=not Env.have_h2_curl(), reason="curl without h2")
def test_60_09_parallel_downloads(self, env: Env, h2o_server, h2o_proxy):
_require_available(h2o_server=h2o_server, h2o_proxy=h2o_proxy)
env.make_data_file(indir=h2o_server.docs_dir, fname="download-1m", fsize=1 * 1024 * 1024)
@@ -437,7 +438,7 @@ class TestH3Proxy:
proxy_args = _h2o_proxy_args(env, h2o_proxy, "h3", tunnel=True)
proxy_args.extend(["--parallel", "--parallel-max", f"{count}"])
r = curl.http_download(
- urls=[urln], alpn_proto="http/1.1", with_stats=True, extra_args=proxy_args
+ urls=[urln], alpn_proto="h2", with_stats=True, extra_args=proxy_args
)
r.check_response(count=count, http_status=200)