From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B404129B22F for ; Mon, 16 Mar 2026 11:31:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773660685; cv=none; b=mBQI3SQfw9Ht/SfIIah58K2XktglrJU2LguCm5FZltzRK8lhgmmG0v7HhLaY7luaBL66aypX0O5gGjehYJcdAdT7rMeijjQVrpx1Ys+xGYFwvfW9J0UPUO5DbLoCYeo3NBom8N2P9OHmzqw13JRIAPgywt687LIjXBNDwY0ok1o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773660685; c=relaxed/simple; bh=RnzcoqiCgiO1PMBkGL95IiCkLD+8z6QAFA5shSuEMyY=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=iKCDgIcGMFA+3zDKxKr5SnLAsA3Ou/YvVh+OTa5g/+e6ao89s+fF8OFXs/FhbCtkeebIeBEaEkWP1htJD1x2v/DhzJgiy9cWoFglTp56NXhg+b82VOy78hNdpi69CMsshCJugR9ptzHwwAjHNu+qMxczLOFPaumWn2gAU4fyktw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=d/yymGbn; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="d/yymGbn" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773660682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WoMK2QRfTtUly3K0u8u4VXZMMCNoL+hLg9jh7niAtnw=; b=d/yymGbnR6Zo4Cp56EDz80mzlMy73/hUUT/ZOtUs3LWua/Nq+o1rsGONOBkzMkgAdn+rY6 GVD5Ei4bDiHg0biABtDnPnmVWTC0PDUTLQ9q0teeZLXYoprPVZMrl6D77bBIo6Du8+uIsQ 57JpZ/JmDN59mc/Zwze0R8yPmGkLerc= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-29-tOUKP0l9PCSoFEFHOa9XFg-1; Mon, 16 Mar 2026 07:31:21 -0400 X-MC-Unique: tOUKP0l9PCSoFEFHOa9XFg-1 X-Mimecast-MFC-AGG-ID: tOUKP0l9PCSoFEFHOa9XFg_1773660680 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-439ca4b3d0bso3807702f8f.3 for ; Mon, 16 Mar 2026 04:31:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773660680; x=1774265480; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=WoMK2QRfTtUly3K0u8u4VXZMMCNoL+hLg9jh7niAtnw=; b=TqRC6+KxesiWykDy/FxtmNQXp/qC8Ygzk9LRqHKUpo6q58MdxsnYNCWkjmTBWutoFU 1TVQHPGrYQi/H2p1DcJ5olyvvC6uL/6t9WtTXzfvAi3d7DPZUeO9IT3zEHAYrBq2nntf HdaVnZ4vTKHnNVxreTf5nBEHCUylxY5K4NJ7sQXgWWq1kWUDMsMWj3ZaofcmxHAeYiPD iC1bubcXIPWmqMNPLseorZIWXegsgVzLExEY04GlbjfXwhSM7WlU8pKLl/3YQ+aoOEkp ZdG6O7D9zKAGVHTfK+wtUisFOaqI0mcIbhdHWdq77K9A3szzZuUfJ0FBtNfJstEPj/2k YuKQ== X-Forwarded-Encrypted: i=1; AJvYcCUuC4PH+s7UikZsnY0SIvFhplxB6DVlVVcrJ5AwI9c8Vit4DvbhF5muTBvDBu+e19wOhIUWGEARbl/w1JitnwYns48=@vger.kernel.org X-Gm-Message-State: AOJu0YzlsictSYTkHv7b7UWDQKnuRLUEI4VUXkdsyW/qSZ76v0kePIkp oP5Khe3rGi0ktR4x3GamokUsb9Er+tL3uWhuIBtcdtFrCj2jI5aq0PWaLi8zwxDnpaVP5Q5NW7J f61zWd7SX3Ny4Cfsrgy2kgCIGVt/Dfj9tyegoB3rIEqP1sN4KIJqG8uOuIt/GfuMrbWjTCrlyEQ == X-Gm-Gg: ATEYQzxysdfJ7pYk/tYIRGuCLj32tDVVsN8DFJYAmeTe7+s2Sjpdg1NSFM/LE7KZjfu T25pHFQgoMyBKbXB7BOqwjZdC4jqQW1CVDycAeY8FAN+/dGvSqyCMJ16cD9yTX9HlziiLgf9mgy 81qMjvjYM/JAdreAaQtDuWky3n3/XdULhNrea7WbRcG+LWg6V4pJaT0zOvCLC5OCF0DAl3EggU1 ceMUDCRfzBUYM2J+MKl9kv7dzwHVS2ADqXo2EKQH6Rz0X4Dl2Yj1sjoosMpdFIsHYhvk6cabYlI zwUCcX6Ds3i1rxSW1KnjlNJsT+JlPn4IMnrSjitLR7xlTxeKCYXe3FpMNzA2mrzcwFhKQuu07bW 68laj9NlUjtwGUFV03jsFzLgaMpWSVkSYaetFkmcgR5QP5C2oINhOlYg= X-Received: by 2002:a05:6000:1887:b0:439:fe98:20f9 with SMTP id ffacd0b85a97d-43a04daf124mr23932764f8f.27.1773660680221; Mon, 16 Mar 2026 04:31:20 -0700 (PDT) X-Received: by 2002:a05:6000:1887:b0:439:fe98:20f9 with SMTP id ffacd0b85a97d-43a04daf124mr23932679f8f.27.1773660679649; Mon, 16 Mar 2026 04:31:19 -0700 (PDT) Received: from [192.168.88.32] ([216.128.11.95]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43a0b2e2c71sm28145619f8f.22.2026.03.16.04.31.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 16 Mar 2026 04:31:19 -0700 (PDT) Message-ID: <95ecd36e-e32f-4ca2-ba35-6d251a64ad30@redhat.com> Date: Mon, 16 Mar 2026 12:31:17 +0100 Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH net-next v2 05/14] tcp: grow rcvbuf to back scaled-window quantization slack To: atwellwea@gmail.com, netdev@vger.kernel.org, davem@davemloft.net, kuba@kernel.org, edumazet@google.com, ncardwell@google.com Cc: linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-trace-kernel@vger.kernel.org, mptcp@lists.linux.dev, dsahern@kernel.org, horms@kernel.org, kuniyu@google.com, andrew+netdev@lunn.ch, willemdebruijn.kernel@gmail.com, jasowang@redhat.com, skhan@linuxfoundation.org, corbet@lwn.net, matttbe@kernel.org, martineau@kernel.org, geliang@kernel.org, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, 0x7f454c46@gmail.com References: <20260314201348.1786972-1-atwellwea@gmail.com> <20260314201348.1786972-6-atwellwea@gmail.com> From: Paolo Abeni In-Reply-To: <20260314201348.1786972-6-atwellwea@gmail.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Ko2x4Qyiow8DvcnzSvAGgwnQdaQFsjoBPR9k8qlpZBs_1773660680 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 3/14/26 9:13 PM, atwellwea@gmail.com wrote: > diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c > index 57a2a6daaad3..53781cf591d2 100644 > --- a/net/ipv4/tcp_output.c > +++ b/net/ipv4/tcp_output.c > @@ -3375,13 +3375,24 @@ u32 __tcp_select_window(struct sock *sk) > * scaled window will not line up with the MSS boundary anyway. > */ > if (tp->rx_opt.rcv_wscale) { > + int rcv_wscale = 1 << tp->rx_opt.rcv_wscale; > + > window = free_space; > > /* Advertise enough space so that it won't get scaled away. > - * Import case: prevent zero window announcement if > + * Important case: prevent zero-window announcement if > * 1< mss. > */ > - window = ALIGN(window, (1 << tp->rx_opt.rcv_wscale)); > + window = ALIGN(window, rcv_wscale); > + > + /* Back any scale-quantization slack before we expose it. > + * Otherwise tcp_can_ingest() can reject data which is still > + * within the sender-visible window. > + */ > + if (window > free_space && > + (!tcp_rcvbuf_grow_allowed(sk) || > + !tcp_try_grow_rcvbuf(sk, tcp_space_from_win(sk, window)))) > + window = round_down(free_space, rcv_wscale); It looks like this can cause the advertised window to shrink even if we are in the 'do not allow window to shrink' branch. Also why the other branch (shrinking allowed) is not touched? /P