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 DB776803F6 for ; Mon, 16 Nov 2026 18:06:05 +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 6AGI4nmq030491; Mon, 16 Nov 2026 21:04:49 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGI4nmq030491 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="EwyYq8NR" Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AGI4fB9030467 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 21:04:41 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGI4fB9030467 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-c37b2763f1bso403792466b.1 for ; Mon, 16 Nov 2026 10:04:41 -0800 (PST) X-Gm-Message-State: APuU4Z+FgBIIJO/ZVS+23MZwDpIB01TcA6OPjeEjzv79Tb03Qyx+DY6t PWBK+D4nqBMXSlvjj6eIbl80Cz3gpUleOZlPdjFe7fCaKHZ9Pqcx686Kdd0ennQ3wNxQ3WE3yJX BK3cw0AoxA8t6DeZQKJnUxUY9WdgRphzPsyoA2LZZNs/FE4e6es44yA== X-Gm-Gg: AYBFou31aC0AnYZSIn0PpoPC1vd5X5aOKt4167cM4H/8nPr/AbxFfxXjGRkl0dtKNEi Cw6pcUgkHK7K+Yon4MHXQS/FdC7tIUsSLg6ts1mgOQwWlGEMB95kFBWD4l+CWUTspoRjujT1IW6 cxghAIsIdEkh5Eu+h6UEQ0e5VjZ3VF3V6Hh7I3f/LGyjldyalXdnX1w92jU8IYe61uNp/i1zUg1 NqSpJVuRTU0P9lpVwiEG2DcgH+zG18Q0JX7gJaywdPM04q6EGbtC+wYb8/m0Kqm0GW806op/jSY hgt0dWQnZ/RdSV0NdUxGzMG+KyRxuWb69URbpEo2Gj5W7mJwxkxNeT37hvOyMs3TEpxGZjls9FY LCaAF6IKRY/mmrOwHIWBJgmna X-Received: by 2002:a17:907:6d07:b0:c4c:b4fe:ca01 with SMTP id a640c23a62f3a-c509642cc7bmr892859266b.37.1794852280754; Mon, 16 Nov 2026 10:04:40 -0800 (PST) X-Received: by 2002:a17:907:6d07:b0:c4c:b4fe:ca01 with SMTP id a640c23a62f3a-c509642cc7bmr892854166b.37.1794852280154; Mon, 16 Nov 2026 10:04:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794852280; cv=none; d=google.com; s=arc-20260327; b=NmabqeLMXCimoisyqRpFX/fdGlVVs+BcY0wpD/gKbgTp2Uz9K6o/w3IhzaloiW+BxN eXlcRSj1d2Wyy0O+2vvEjGdW+i6EktQly0pxAwQbERpmKZ27GP7pMKOxCc2ddVAGrF1R jVFotKxlSj3HF3IwAhh52Hh9GLYi90Mdk/IqzutaqQDuxc9f1ImkPv0BzKgi29hAgWkJ tr4M1IlpGf1KIEqygmf+BXgLrAyASwXLceCFwWx/pEq1jF9ponLJNKL8rgwHQz6nnUn5 0HpuxbXkmyp/H3LPftTSDQgx5kDcXu0ie3Q9tbXa0sahMV81IpnuEX74BqzK2P2HK7wz +81w== 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=HCWEHkAJIKjGeAHwrDgGysCex5GcpxCH6ttgQgdPEXE=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=GCnDn6Bamom4ytZ5X/I4uGMjihn0JCNX60sllzVR9ai4LQq8pspfjNPKutuQz07vUf TV6oLzYjc7fioU4hLXjve7ONajAwad/EI48su/THvqE3a4ZFtwJnxL+SMBHuEidvksas vC7DWyrT1lrtHxKsVcwSUug+YGLVbwQ/xGjT7oaNpWX1hwgN3Mar6ci/zaOukI+ARbHM Q1pt3ArtY7J2/OcIZw4m2d90qtmASExaRir7m0QkZ7iT2/c0mppSSc7ikG8Ov4KdmtGD /+JM5ztSMEkpDJMhhx0fw41v/HZiVQML1KvkjhCRZizMdXSpPX0T8zaNZqC7ClbY1eME tGJA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=EwyYq8NR; 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-49c881fee8fsi20624223f8f.45.2026.11.16.10.04.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 10:04:40 -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=EwyYq8NR; 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=HCWEHkAJIKjGeAHwrDgGysCex5GcpxCH6ttgQgdPEXE=; b=EwyYq8NROaJQ yteZ2ezHJoUmLrJ1Fz8QZCKugKs7DJIRkLY0nulL8Cc0MXO8VTJT+PFoEQPksMzUOPAEPSjl+3Uzx y6kHFpGMyTGEvx9hglfRwVpowQ0GAxYI/mbNLQjJwzzTUer00CrLZSZHcZKbRo3A/uOqNRQtsB/Da yZttxnl35NxXk3A9md/x5a4FY03RProgq/jO0Wv7DehzACfY92+E2jgEGXIzUa365iFKhm+WzA941 qgkJ1ZqBV2gdfa2XK7RZM5QFkHf91QtR63vtJka3t7NnaMoTDXZGAmC1ap7YdMKCo5cHLXiqpCNZB uMkBzhZyfQ6ohCANAuwsfw==; 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 1xT104-008bMO-0V; Mon, 16 Nov 2026 19:04:31 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 20:03:02 +0200 Message-ID: <20261116180419.685520-5-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.56.1 In-Reply-To: <20261116180419.685520-3-eva.kurchatova@virtuozzo.com> References: <20261116180419.685520-3-eva.kurchatova@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 2/4] ms/mptcp: prevent race between disconnect() and rtx 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 Sashiko noted that the two event can race, leading to inconsistent status. Prevent the race using the synchronous timer stop operation. Cc: stable@vger.kernel.org Fixes: b29fcfb54cd7 ("mptcp: full disconnect implementation") Signed-off-by: Paolo Abeni Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260908-net-mptcp-misc-fixes-7-3-rc1-v2-6-df1de70348b6@kernel.org Signed-off-by: Jakub Kicinski (cherry picked from commit 85c580b0d8590520ae00a15c29e9fb9c99427a3e) Rebase note: this tree lacks commits 9a5e5334adc0 ("tcp: remove icsk->icsk_retransmit_timer") and e4141ea18a73 ("tcp: introduce icsk->icsk_keepalive_timer"), so the timers stopped are still icsk_retransmit_timer and sk_timer. It also lacks commit ea4eb2adb0d3 ("mptcp: honour configured min/max RTO in retransmit paths"), which initialises icsk_rto_min, so timer_ival is reset to TCP_RTO_MIN, as in __mptcp_init_sock() here and in the 6.12.y backport. https://virtuozzo.atlassian.net/browse/VSTOR-155322 Feature: fix ms/net Signed-off-by: Eva Kurchatova --- net/mptcp/protocol.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 40d78fe6e111..1d4754b20cea 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3188,6 +3188,7 @@ static void mptcp_copy_inaddrs(struct sock *msk, const struct sock *ssk) static int mptcp_disconnect(struct sock *sk, int flags) { + struct inet_connection_sock *icsk = inet_csk(sk); struct mptcp_sock *msk = mptcp_sk(sk); /* We are on the fastopen error path. We can't call straight into the @@ -3200,8 +3201,13 @@ static int mptcp_disconnect(struct sock *sk, int flags) mptcp_check_listen_stop(sk); mptcp_set_state(sk, TCP_CLOSE); - mptcp_stop_rtx_timer(sk); - mptcp_stop_tout_timer(sk); + /* The later subflow close can not kick again the tout timer, + * as the msk is already in closed status. + */ + msk->timer_ival = TCP_RTO_MIN; + sk_stop_timer_sync(sk, &icsk->icsk_retransmit_timer); + icsk->icsk_mtup.probe_timestamp = 0; + sk_stop_timer_sync(sk, &sk->sk_timer); mptcp_pm_connection_closed(msk); -- 2.56.1 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel