From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (mail.openvz.org [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id D9E03803BB for ; Mon, 16 Nov 2026 03:53:39 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AG3qSvZ019285; Mon, 16 Nov 2026 06:52:29 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AG3qSvZ019285 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="pCLceFdT" Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AG3qBMw019226 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 06:52:12 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AG3qBMw019226 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-4915ba023d4so1258526f8f.0 for ; Sun, 15 Nov 2026 19:52:12 -0800 (PST) X-Gm-Message-State: APuU4Z/c7B6h6ptYjZ87ol8dqQ5oH8OMgYDWxa5c7qHatJP2UDy2kDVr ldkR9xPvvtiqZG7/yFwB9v+fhlZ4RU3tBFjD8KcUSb6T9xsODWhHrH8IoQVs7p/2pbcpl0vjKq7 xM0RTCsUUj9wR3YNhWTqoJLIx4L+LOr05dbf0h03t0s/zjOQ8wdwzkw== X-Gm-Gg: AYBFou3LLQVc8xsEiqEjPZrD3+7869tTBqrMNO0EQul6T01cLvVl1m5DTkNCawa6PsE Or6FPmKmncLqoY/RRByoOe97419xDf9sUxrfG+wCcJG0ByrGIuDTKYIHoz6GyhBE4GazHmFqp0N T4B6BzTFrAoxA5J0vf6uKWP3hUyYYvKIo5CFyWXazsxWaQvHP12x7ReW5uTtqKx4/zo/xesH89J N0OIaNiGGByeXmYi3w1gby4N0DJPHU/RfwZOsbcEg5QSI2k+pYgCem0lkWoo0+JyOpf3vaDJW48 TLBxkrt+292nXxX2Ji2EOJ7DK/DulhGSRUweu/vgvBJ2zkABwzjn7z4eUNFq3HGypdbqUJxwmEN tr66fPGS+FwcIDbi7WxmGqAxTzQ== X-Received: by 2002:a05:600c:628c:b0:4bb:5345:606b with SMTP id 5b1f17b1804b1-4bb55a7f885mr183689495e9.31.1794801131724; Sun, 15 Nov 2026 19:52:11 -0800 (PST) X-Received: by 2002:a05:600c:628c:b0:4bb:5345:606b with SMTP id 5b1f17b1804b1-4bb55a7f885mr183689365e9.31.1794801131276; Sun, 15 Nov 2026 19:52:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794801131; cv=none; d=google.com; s=arc-20260327; b=PEGAJoHCFa3vnFsYUe3n6NS56pamExuD0MaPC31CDKnSYgIRO7HtKkyMKuMUGPjq1M 0PhJeTirL44ajWJKX+89w1WpCdSbi7FetlBNIo3TZZBaO2dFLBMvFXu8pXQeGfUau9NB Ef6PNsqBD02bCNvzUFGEHIIpWNb2L/ui4JKo95yA62DLsAeqJenhcxCPiHfwLK+wQnJi uCDHz5gg49ikr94Cwj7GPlaIE696I99SQWlG6Xd3P1Y3AERIbCp6z+/FMaL/gwWWUq8k AcczVUtSaAWK1P3zQmYH0RuCfosjOXDDB9HBXVcMYPc/Ope1wtldJ/Ssdd2n8yPk1QXK eiAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=6WbU2TgWQs6lZpVDDi8HOPFeE6tq9W3eacwdWAXZwbI=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=HsumPFEYigEyBR924XhjyytSm1xFZGR70pk66hPAxQnRe4/mtIwxJhtvq8/atYgbbx 8sLjFsBwnJG9WAzmmCF2I7lETPA3l9eznMN9yWPcLDPGxyr36S9wod1G+aVceYBMtDLN leAlzQv8ZtOaqhqOLMisgJ+yW72bXW3R0wQyvyJUKlZ00CesPITVLsFLAegogGss64Lb C6lejrwl69S9RRZS9p8gIlCY7Uab9kkXuqS+OakOdLbPMr+0mZaxAgPcQfmyz+FZouIs MjOp3y/XjWX6EHJSnbwZIfxDuv+gAcqTsypJTs+/rFw+/vmvXnWJI0s4yeeySHxKwM7K HCww==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=pCLceFdT; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from relay.virtuozzo.com (relay.virtuozzo.com. [130.117.225.111]) by mx.google.com with ESMTPS id ffacd0b85a97d-49c89627737si18108009f8f.18.2026.11.15.19.52.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2026 19:52:11 -0800 (PST) Received-SPF: pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) client-ip=130.117.225.111; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=pCLceFdT; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=6WbU2TgWQs6lZpVDDi8HOPFeE6tq9W3eacwdWAXZwbI=; b=pCLceFdT2Hxu exWlQjaZ0CAwuetK+Rx6S3x0ILKENhI/z+/2Qozbgp3nhCndyH0STKrQxxMvwkuFjNHjk8kBsUJtX 76DpuPUoSY+3TqnWboN4XZ6R+3/TpSHE3/S0bN/9uvAwB2226ebdBksd2uN3Pv7+76a9nXcbDBV6m 6NeWnYB4s+z/i43lz9pfRi/7EQc2p+DY/I6tCU+SMEwzO6tl65o1Pq7N7utuexbD2WGKHsY6eu3bE Tl8R2zBsi5/AtjXUsVo1xW0EFmLZpaB1yDxJXVcDTFNFqB6IzZ/E4l56uqJVu0ZIW+lcWMCHZ8OV0 ieZu1N3aGdv1UZpyfiCVLQ==; Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=LekKit-T14) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1xSnh6-00A3ol-1w; Mon, 16 Nov 2026 04:52:03 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 05:49:13 +0200 Message-ID: <20261116035204.564416-7-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261116035204.564416-1-eva.kurchatova@virtuozzo.com> References: <20261116035204.564416-1-eva.kurchatova@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v2 06/10] ms/mptcp: allow subflow rcv wnd to shrink X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org From: Paolo Abeni In MPTCP connection, the `window` field in the TCP header refers to the MPTCP-level rcv_nxt and it's right edge should not move backward. Such constraint is enforced at DSS option generation time. At the same time, the TCP stack ensures independently that the TCP-level rcv wnd right's edge does not move backward. That in turn causes artificial inflating of the MPTCP rcv window when the incoming data is acked at the TCP level and is OoO in the MPTCP sequence space (or lands in the backlog). As a consequence, the incoming traffic can exceed the receiver rcvbuf size even when the sender is not misbehaving. Prevent such scenario forcibly allowing the TCP subflow to shrink the TCP-level rcv wnd regardless of the current netns setting. Fixes: f3589be0c420 ("mptcp: never shrink offered window") Cc: stable@vger.kernel.org Signed-off-by: Paolo Abeni Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260602-net-mptcp-misc-fixes-7-1-rc7-v2-4-856831229976@kernel.org Signed-off-by: Jakub Kicinski (cherry picked from commit da23be77e1292cd611e736c3aa17da633d7ddce7) https://virtuozzo.atlassian.net/browse/VSTOR-153491 Feature: fix ms/net Signed-off-by: Eva Kurchatova --- net/mptcp/options.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 420fb529391d..f045b7d22317 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -567,6 +567,7 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb, { struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk); struct mptcp_sock *msk = mptcp_sk(subflow->conn); + struct tcp_sock *tp = tcp_sk(sk); unsigned int dss_size = 0; struct mptcp_ext *mpext; unsigned int ack_size; @@ -615,6 +616,12 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb, if (dss_size == 0) ack_size += TCPOLEN_MPTCP_DSS_BASE; + /* The caller is __tcp_transmit_skb(), and will compute the new rcv + * wnd soon: ensure that the window can shrink. + */ + if (skb) + tp->rcv_wnd = tp->rcv_nxt - tp->rcv_wup; + dss_size += ack_size; *size = ALIGN(dss_size, 4); -- 2.56.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel