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 370598017D for ; Mon, 16 Nov 2026 20:47:36 +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 6AGKkP4h031645; Mon, 16 Nov 2026 23:46:26 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGKkP4h031645 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="XL9P819P" Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AGKkBkn031593 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 23:46:11 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGKkBkn031593 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-4916bd6e3baso3192646f8f.0 for ; Mon, 16 Nov 2026 12:46:11 -0800 (PST) X-Gm-Message-State: APuU4Z8A5JTFNA9i1pVgG4jPZ5/A+WgSiDSQtxEpLaXX66e703K0OJVS hDjYnePoGQ7jW5llB8TJaAo70ngSyFOXC6whNhl0wndzMKxejPDgRVjfFe//EoZ2IUpuDR9HOxT c4iA+69BLj0Mh4YOA4Lp9wPAItc+dniTBsZ8gHMzp2hwZNdyHbcUuGw== X-Gm-Gg: AZFdTZeEf2i1tKg1dd7hurU9eA2DCXnU5mkOYhnZkQAYGb3iMx9FYJEFkKdWjWhxkD+ nCUnmX0FFgVer8reGoU3G/W7PyMyHwblhq/oXWKecp62uuBpCBPeP+3zjc7YxLOrQNW7SVum5J1 lvzJJojyzgomM/0xrEIQ26qS6nkdhizyoL/F8laHHJmpzg+mOU60Vawq4WR1ijdmeTG7hKQAKBr CFAO/pDYwdBjUCNBAcOZNGrKo5jeRo+tld76IzBX2P2KpxoCnIrW/4PedoEcfwTX+8NrxusyYtn tF96O3YbGFX+f6K7bjmstw5STHgXWfP7ISynggXzNT79PgADCSiCRxR6gyLWgeBC5wxt6AMtCNz 3UJRzgiNtrHKKksnt9/FCQf5/ X-Received: by 2002:a05:6000:290b:b0:499:9ffc:59bd with SMTP id ffacd0b85a97d-49c70a0ee43mr24783036f8f.30.1794861971502; Mon, 16 Nov 2026 12:46:11 -0800 (PST) X-Received: by 2002:a05:6000:290b:b0:499:9ffc:59bd with SMTP id ffacd0b85a97d-49c70a0ee43mr24783002f8f.30.1794861970885; Mon, 16 Nov 2026 12:46:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794861970; cv=none; d=google.com; s=arc-20260327; b=XfJUuQQmle03+vQ4S6H7dGG0jmTniCtAO71oqw3wbWSuKoCECiTFJX+uQxyVZHPlBA pbUuMe+LZvRMa6bMEP88QIjswv03HE221zJKjENQyy6Nx8lW2TkOyjF5uYw8VbOEAM+o lrh82lD+tvweRuKrTWGlVsoH9/zlttDLvJsvqlIh+4oJ5e+NFlXUXeWUsmPOE1dMfrkW gU7IHigjHHCX0WGszMHNWUykRLmYUUE2Lhnugvvny5BNIwMff0OQLHOyZ596zbzuQAgj gY5ZQODZjzUj5Pi7oFcmqgQRwuSIsDgyLtG+7sSq77cYygUxlkCbrpM+P7IRl6+RQNtg ETnQ== 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=Llkn4WMJGSFW8GZ2slD8pBDN90M/XFZRnm1VgrxY/gE=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=mJiYmW11qeHIPm0ic/odcm9NG8ONUUpK9l9U7IEDZoW6FnykBpJGTE8ucerOESxzul KS9RFIUS9fV3UCjXilonBSFZUVexrW3f1rdVgyOixpO3FIKtKaM9sfmT5HHW4bMK4nMr S+woXch1HYhBK7dAyfWf3oG5foYSwo/rG2FKT/0fO/WOdLBfuVJ93S/bi6JjLh2UaDCd N0gTk3uEKkqHPBEkuIO01Aa5VsF7D8WpKps9UDGpr2sMeW4pQ90j6oQRAXfBjfyMcPg0 VllHVRUteVPUTthxc6s5GjgUOisoeFLFKnAlHrBmPZGD4uAyXi+flOMscLNNW+kOAEj9 QXpw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=XL9P819P; 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-4a34705dea5si1421950f8f.498.2026.11.16.12.46.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 12:46:10 -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=XL9P819P; 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=Llkn4WMJGSFW8GZ2slD8pBDN90M/XFZRnm1VgrxY/gE=; b=XL9P819PobOB alfskg3tRuw7RWZgSVrBbn6c8quiWQZF3fG12WEhjNtlPxiHgMnNaGkF/5syEJTMcZ17qs8mmMxAe AaC/5IiTDbcT3kqb+nP68TVokbu7vixz/0jsOzqkrqzHZXFOTRDGJYiCbpzlLiCfLBXtII5INodJk WLFsVmowUEAIZVTNt4j8OVD24IZrstxniZQ+d7UoRZQs2swvRN5EwvLk+j5t042/d9Ro1ucsOuWPw vO6OLTsE/F3sG9XkqvNABChzLSIVmE5EtphLbsgRyjXsJIrCFCKtMEvFAuRaawM9zI31YHdV+v6AX jLuzHwBeVEovSr72pwmhZg==; 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 1xT3WM-00BfjZ-1J; Mon, 16 Nov 2026 21:46:01 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 22:05:58 +0200 Message-ID: <20261116204557.718500-7-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.56.1 In-Reply-To: <20261116204557.718500-1-eva.kurchatova@virtuozzo.com> References: <20261116204557.718500-1-eva.kurchatova@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v3 06/11] 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) Rebase note: mainline 0e24d17bd966 ("tcp: implement RFC 7323 window retraction receiver requirements"), which this commit sits on in mainline, is not taken, as in 6.12.y. So tcp_sequence() checks the shrunk window here, and a segment the peer sent before the shrink and past the new edge is dropped and retransmitted by TCP. 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 51978cf24f23..51cb4ed3f7ce 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -573,6 +573,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; @@ -621,6 +622,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.1 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel