From 8ba41320c3a256a3bb71b6bca641237168b5b303 Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" Date: Fri, 2 Oct 2026 18:39:25 +0200 Subject: tcp_splice: avoid delay on certain transfers without this patch, sending buffers of certain sizes caused a delay of 200ms because tcp_splice_forward() passes SPLICE_F_MORE to the writer when a read filled at least 90% of the pipe. This is easy to hit when pipes are small: once a user exceeds fs.pipe-user-pages-soft (64 MiB by default, which a few long-running pasta instances with large pipes reach on their own), tcp_set_pipe_size() settles on the 8 KiB minimum, and every message whose length is 7372 to 8192 bytes (90% of the pipe and more) past a multiple of 8 KiB stalls. This change leaves bulk throughput unchanged. Assisted-by: Claude:claude-opus-5-5 Signed-off-by: Bernhard M. Wiedemann Signed-off-by: Stefano Brivio --- tcp_splice.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tcp_splice.c b/tcp_splice.c index 4b01f1a..f7a3913 100644 --- a/tcp_splice.c +++ b/tcp_splice.c @@ -488,6 +488,7 @@ static int tcp_splice_forward(struct ctx *c, { uint8_t lowat_set_flag = RCVLOWAT_SET(fromsidei); uint8_t lowat_act_flag = RCVLOWAT_ACT(fromsidei); + bool corked = false; while (1) { ssize_t readlen, written; @@ -517,8 +518,17 @@ static int tcp_splice_forward(struct ctx *c, * there's nothing in the pipe so there's nothing to do * write side either. */ - if (!conn->pending[fromsidei]) + if (!conn->pending[fromsidei]) { + /* Setting TCP_NODELAY again flushes data held + * back by SPLICE_F_MORE + */ + if (corked && + setsockopt(conn->s[!fromsidei], SOL_TCP, + TCP_NODELAY, &((int){ 1 }), + sizeof(int))) + flow_trace(conn, "failed to push data"); break; + } } else { conn->pending[fromsidei] += readlen; @@ -549,6 +559,9 @@ static int tcp_splice_forward(struct ctx *c, if (written < 0) break; + if (written > 0) + corked = more; + conn->pending[fromsidei] -= written; if (!conn->pending[fromsidei] && readlen <= 0) { -- cgit v1.2.3