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 8A3118017D for ; Mon, 16 Nov 2026 20:47:38 +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 6AGKkTKE031658; Mon, 16 Nov 2026 23:46:29 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGKkTKE031658 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="eDU7mfgC" Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AGKkC6J031601 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 23:46:12 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGKkC6J031601 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-49febef74e3so1190835e9.0 for ; Mon, 16 Nov 2026 12:46:12 -0800 (PST) X-Gm-Message-State: APuU4Z/Jo6P/7m9V7sLFV97KjiR5iNt04Fcck3UjL3SSjkIoEj69pQtf tsKRmGZ/ZlaD5w+6jpL9/y2qJMeHSRZLuOWXa3A4woqvjz89ciIYMpgSRbaO+BmA1PjZLgFhDkw uATj07PNzZ1ZbFwKgYXoFS091KATTcsZ5rsQMhLUmQhgo4aSRIlMGug== X-Gm-Gg: AYBFou3NsXlbT6lEtm3geVWT1IDRrLiZs0yZMvo3n25gpC0tPtUWy+5Q9PfQXn4fWNL i8wDawrF1lgNEB2geXQ4AX8UtlrcAgBaUayzidbfteSL0KVZVSi93pqcLlw7JejRuEK+6SkAErq JeNr4WrItZQotybLUP7m357T2Ts3+l2dOIF3uLgeizQNN30yGrOEn61C0laFNUgu8tD1BhWFWLD 0VxxNxSDhwKAL24EykACjooFqrvFWySc8i7bQo5lg5/UKTCY8LrFJ101149pUAff5vsnA2JqmCH Z/PmLu0T/iASWzYLoRWVIxEUIMAkEvDkvJXmJ+gp8fu+UsocfGutKSzOfrFATaaT8H/PhpdX4SR PjaTpf9lGyohtn3RN44NDN9EKyg== X-Received: by 2002:a05:600c:1d8e:b0:4b9:f90b:1c4d with SMTP id 5b1f17b1804b1-4bb783aec42mr16054965e9.5.1794861972342; Mon, 16 Nov 2026 12:46:12 -0800 (PST) X-Received: by 2002:a05:600c:1d8e:b0:4b9:f90b:1c4d with SMTP id 5b1f17b1804b1-4bb783aec42mr16054655e9.5.1794861971920; Mon, 16 Nov 2026 12:46:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794861971; cv=none; d=google.com; s=arc-20260327; b=S9EK4POEAPNUZZSZ0CClzudJY5wU9LSSg3LWMA+sc3m0NCWmIGRt9mpbzwo9biAWfZ Ve2HNW4pSZTnG0EixPYBdQAnd/s1cGCCxLdK8gtPHpyAEzQrE0H5oIAUjeUYJxMXXeRN 32ZmX+Ch2fC00kSASBasY3kkVdY8lD6u0sFR2mvwIkRlwv6BqmfdL3xkAjT+FtNhDjD+ kHOOJNhIkyMia0RRBecSxCBJA4XFeJzJNJnDH9pJA2RA5Sv/0G2zC8+foqowyQHnCsrE n5F3OJmh2gPcfzdEB0n4LDP5lBuhce0n47lLFC5dI7n6o4jsuajvRK/Q+dHO79h/O6Cc YWaw== 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=35Q+fxwaSrFcEM81iLpf7NUApE4OJfgYUanrYQTmHOk=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=sZtyCR2hGAP6i2YCPZnMsWF7Lq16UYJ1UecZUKoRl6JO4Xt9EczKzjBgoQs1AHqxSq td65ZoKi5vES9E6QsQCr5PjvNjuWY//1XO6rcUm369MNfbR8oieGN0wOVDrxqjTFTskt Jzg9Wj6I2SU+cM8yALd5RoRMlu8aUd10RqcgVWPHfviKbV0Jc/4XFf61pEiIxGCLG24H w1V0p6hT+KGK6qnp6GgCRyPGyMmmSLFzZVrcfAYZowm2cF8VykvQu33/ahApuDa9sbpN 85uPxpRdfScQ9JIRfkQ3q8ed/+AoBFkPu3ugsBNWN4mSjDmXRGiTaEj+XjyV71uEi2eM FSVQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=eDU7mfgC; 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-49c64b0a15bsi24739030f8f.384.2026.11.16.12.46.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 12:46: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=eDU7mfgC; 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=35Q+fxwaSrFcEM81iLpf7NUApE4OJfgYUanrYQTmHOk=; b=eDU7mfgCSYaU QY2be4MeG05Hpv2ICEGTa93ImkGxmLV2ZeMfn2uWER4baFxWz4SMiFDwisYcHjCp6AtF2K51RT+Q/ Gaz1C9uxO6+7kJ4e16aHZqFkSLT+JBvyL5ZvpNjovqCEqq4lTwWE+yfov7LVPQYibm38X5KbhNpMB Mo1K5fjyLDJIaq/xmqL2sd3IduhA0pVkt03pbhGVinThdj3UZKd5Zuqru4XsR+n+1kSw5ar8DwV+d N4S6pWl7eZWBtJXLoZLio66lHcsIjz/1HLjfQs6p7z+SgqwrPRQahh9cECP9i5HyfN20qq/0b/1J4 eljvEZd2WWLTREHD8hAyeQ==; 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 1xT3WN-00BfjZ-2s; Mon, 16 Nov 2026 21:46:02 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 22:05:59 +0200 Message-ID: <20261116204557.718500-8-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 07/11] ms/mptcp: cleanup fallback dummy mapping generation 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 MPTCP currently access ack_seq outside the msk socket log scope to generate the dummy mapping for fallback socket. Soon we are going to introduce backlog usage and even for fallback socket the ack_seq value will be significantly off outside of the msk socket lock scope. Avoid relying on ack_seq for dummy mapping generation, using instead the subflow sequence number. Note that in case of disconnect() and (re)connect() we must ensure that any previous state is re-set. Signed-off-by: Paolo Abeni Reviewed-by: Geliang Tang Tested-by: Geliang Tang Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20251121-net-next-mptcp-memcg-backlog-imp-v1-6-1f34b6c1e0b1@kernel.org Signed-off-by: Jakub Kicinski (cherry picked from commit 2834f8edd74d5dda368087a654c0e52b141e9893) https://virtuozzo.atlassian.net/browse/VSTOR-153491 Feature: fix ms/net Signed-off-by: Eva Kurchatova --- net/mptcp/protocol.c | 3 +++ net/mptcp/subflow.c | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 2dcce47a1ef7..e0048bfda370 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3299,6 +3299,9 @@ static int mptcp_disconnect(struct sock *sk, int flags) msk->rcvspace_init = 0; msk->fastclosing = 0; + /* for fallback's sake */ + WRITE_ONCE(msk->ack_seq, 0); + WRITE_ONCE(sk->sk_shutdown, 0); sk_error_report(sk); return 0; diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 040a7f1bdcf0..eeb4c926a66b 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -490,6 +490,9 @@ static void subflow_set_remote_key(struct mptcp_sock *msk, mptcp_crypto_key_sha(subflow->remote_key, NULL, &subflow->iasn); subflow->iasn++; + /* for fallback's sake */ + subflow->map_seq = subflow->iasn; + WRITE_ONCE(msk->remote_key, subflow->remote_key); WRITE_ONCE(msk->ack_seq, subflow->iasn); WRITE_ONCE(msk->can_ack, true); @@ -1432,9 +1435,12 @@ static bool subflow_check_data_avail(struct sock *ssk) skb = skb_peek(&ssk->sk_receive_queue); subflow->map_valid = 1; - subflow->map_seq = READ_ONCE(msk->ack_seq); subflow->map_data_len = skb->len; subflow->map_subflow_seq = tcp_sk(ssk)->copied_seq - subflow->ssn_offset; + subflow->map_seq = __mptcp_expand_seq(subflow->map_seq, + subflow->iasn + + TCP_SKB_CB(skb)->seq - + subflow->ssn_offset - 1); WRITE_ONCE(subflow->data_avail, true); return true; } -- 2.56.1 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel