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 A5909803F6 for ; Mon, 16 Nov 2026 14:58:15 +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 6AGEv1ma026817; Mon, 16 Nov 2026 17:57:02 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGEv1ma026817 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="XkGMvrfn" Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AGEuuuA026799 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 17:56:56 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGEuuuA026799 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4a204f135ffso16566665e9.1 for ; Mon, 16 Nov 2026 06:56:56 -0800 (PST) X-Gm-Message-State: APuU4Z/CDEwntI0D0WqmrVYntQXy5aqpzF1NrozS8Vs6dJ6GwHoY0hOD 82vuhCvixr8aC5wW2M6DQHEM7y3h53BJHyfw21BOYR1ZRR9IDsuv1dCVCqqpolMREkT1y/Ev6gi uo3CfhtCX921vsRLuFrMdzjKiVm/0LIpcxfGfypKxxDIKyQmYyDtQvw== X-Gm-Gg: AYBFou1KF+VresyjrlAVl+ztXYNgh+eEcS6tO23jsvLCJhM/igTe+aR95gZlHhqcAQN RFLd+6EFaVi1kj4kM37V2mNszltUJdvP/n/nGglEVF/8DeHgCMHf1lU1HfrbLQLAEZWIdhIHs3D NqZCiDWqmui6Y0FatK/ladSgmgT/p8cMw+0uA+G03ao5SqodjauUmR9YJSzRO/jMgOWhNO3wlal yWuwwvi0GF3HI2SsjYxxol9TJYyMCsqo3r2p9Jj6ABotwG4h+vgGW8ExCl9MlJt5lELfbqN8/tN bwIZ9ii5VKNN3K9EMx/3zO/QBjbrCQTLNHED30a5EfC8SjHdeAOrjk54kVXegFOZrV5003de3dK z/YKLAsmHjzRWQ585J4+owH+U1Q== X-Received: by 2002:a05:600c:4e01:b0:4bb:71c1:3ca6 with SMTP id 5b1f17b1804b1-4bb71c13d09mr69830455e9.21.1794841016464; Mon, 16 Nov 2026 06:56:56 -0800 (PST) X-Received: by 2002:a05:600c:4e01:b0:4bb:71c1:3ca6 with SMTP id 5b1f17b1804b1-4bb71c13d09mr69829765e9.21.1794841015863; Mon, 16 Nov 2026 06:56:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794841015; cv=none; d=google.com; s=arc-20260327; b=C7az/JZhWcpeeDvps2+7XbLAWD8HfjFzkBQqAv3UXwLyRxri8Z+mVGKi9enYWIlHER dDInZi9THrJwzrIoLpS+9WcQdAgozXExnai0iXgYupKcaHO4Ni2Qpg/2ET/YorxXOldg FRXvdC6MKr05l3VfJC7g2DP5isTFdcoXF/BgGA4R857VYfG0f7NJSuZtcOAtnnzsFaze V28RTHhi3Q8XmPDsPQus117Tg05wxVwc+6FFwjyPPehqM2kQrQpFjGoxleBo76lkbupv ABAynsKhamHEp6vLwVzLh5lFUa+8F31KTjdY1lbUKP41/wDI3dH16rZdQSoCw2n/PB5J Wd6g== 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=baJ8oK1T9mekDke0OVb2OxmLW69jAjn3WmAydZguJk0=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=aKjPENYVjIAH11A2JkY2H0YuAjlLEmcHUrIrZMFythuVrbdvZHgOORHHNbAr7Pj5Lh Twrbyo/Kb6gvcoc6TbYXrO3Yxojq0lmSVj3IQ9WY6gRPtIyd2m5DS5N3MwodGZjvSYdh ODlKdngLmOdsL7tDfQYwpSxsFBhQxLSn0jg8GlHhQGoPYmjUJ0jM+LnhlXVkxARIrlfQ AWkvkJYEfUIeDUEQqwfjen619cx4adTWEN5FdB6UTF9nxcEyCpecIAh66ZxvGP34Xurd dupHb1yqp1r4G0MaRHA4I6Nu8dXYgAP+nNqcGmtT2lYvaDWkNpEk+AVA/BWkY1xaIu/w oHqg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=XkGMvrfn; 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 5b1f17b1804b1-4bb6caa4d85si83615865e9.4.2026.11.16.06.56.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 06:56:55 -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=XkGMvrfn; 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=baJ8oK1T9mekDke0OVb2OxmLW69jAjn3WmAydZguJk0=; b=XkGMvrfn7Rw9 5fdRRerTZJ33EUr2zkS+ov7jt7aVOIpjP2HWKcNcT0J2sLq394wQjnqjq4LTVDp92dNv6aQfWWejl ndx4oo4VxfZ0qegK3E2NEdhJjpPddGLb7YEBHkSslhgSGbx/R7nFhm6BScop8TpVrSah7f5No70Lk 5z+UWIq0FSzFqTpkawZ+MmHjxAU70GBLzCvzcES2lf8dcYF3zcc7arPtlDJ1xHEEsPj0r8wUyPE3O Tj6CP2PeKiSwyREo/FzLk9W0lqK6/kWCrhRxZAL+x7So7Qpt76Jw6R07O4N+vPFy82L95tnYO2TJ8 QojJeBhy0a8aT14dihrweg==; 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 1xSy4O-0053d2-11; Mon, 16 Nov 2026 15:56:47 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 16:43:02 +0200 Message-ID: <20261116145652.625598-2-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261116145652.625598-1-eva.kurchatova@virtuozzo.com> References: <20261116145652.625598-1-eva.kurchatova@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 1/2] ms/mptcp: do not reschedule the RTX timer for fallback sockets 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 On fallback socket the retrans timer is a quite convoluted no-op, but currently nothing prevents the MPTCP core to keep rescheduling it. Additionally gate RTX timer reset to the msk not being fallen back to TCP yet. To avoid adding multiple tests in fast-path, use a new flags bit for such condition. The RTX enable bit is clear at close time and set before the msk could start retransmitting, with a couple of caveats: - passive sockets inherit the bit from the listener msk; set the bit on such socket to avoid flipping it in the fast-path, even if the listener will obviously never retransmit. - while fastopening (MPTFO), mptcp_sendmsg_fastopen still ends-up calling mptcp_connect via tcp_sendmsg_fastopen -> __inet_stream_connect(ssk->sk_socket), and the first subflow's sk_socket points to the msk one. Fixes: b51f9b80c032 ("mptcp: introduce MPTCP retransmission timer") 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/20260908-net-mptcp-misc-fixes-7-3-rc1-v2-1-df1de70348b6@kernel.org Signed-off-by: Jakub Kicinski (cherry picked from commit e2ab913f68c7d11e2561b8a8ad0b87ffefcad667) Rebase note: this tree lacks commit c65c2e3bae69 ("mptcp: track fallbacks accurately via mibs"), so __mptcp_try_fallback() is still the inline in protocol.h and clears the bit there. It also lacks commit 9a5e5334adc0 ("tcp: remove icsk->icsk_retransmit_timer"), so mptcp_reset_rtx_timer() keeps rearming icsk_retransmit_timer. https://virtuozzo.atlassian.net/browse/VSTOR-154928 Feature: fix ms/net Signed-off-by: Eva Kurchatova --- net/mptcp/protocol.c | 12 +++++++++--- net/mptcp/protocol.h | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index e526648a583e..384ad1a8b5c0 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -860,13 +860,14 @@ static bool mptcp_rtx_timer_pending(struct sock *sk) static void mptcp_reset_rtx_timer(struct sock *sk) { struct inet_connection_sock *icsk = inet_csk(sk); + struct mptcp_sock *msk = mptcp_sk(sk); unsigned long tout; - /* prevent rescheduling on close */ - if (unlikely(inet_sk_state_load(sk) == TCP_CLOSE)) + /* Prevent rescheduling on close and in case of fallback. */ + if (!test_bit(MPTCP_RTX_ENABLED, &msk->flags)) return; - tout = mptcp_sk(sk)->timer_ival; + tout = msk->timer_ival; sk_reset_timer(sk, &icsk->icsk_retransmit_timer, jiffies + tout); } @@ -2951,6 +2952,9 @@ void mptcp_set_state(struct sock *sk, int state) * transition from TCP_SYN_RECV to TCP_CLOSE_WAIT. */ break; + case TCP_CLOSE: + clear_bit(MPTCP_RTX_ENABLED, &mptcp_sk(sk)->flags); + fallthrough; default: if (oldstate == TCP_ESTABLISHED || oldstate == TCP_CLOSE_WAIT) MPTCP_DEC_STATS(sock_net(sk), MPTCP_MIB_CURRESTAB); @@ -3747,6 +3751,7 @@ static int mptcp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) if (IS_ERR(ssk)) return PTR_ERR(ssk); + set_bit(MPTCP_RTX_ENABLED, &msk->flags); mptcp_set_state(sk, TCP_SYN_SENT); subflow = mptcp_subflow_ctx(ssk); #ifdef CONFIG_TCP_MD5SIG @@ -3895,6 +3900,7 @@ static int mptcp_listen(struct socket *sock, int backlog) goto unlock; } + set_bit(MPTCP_RTX_ENABLED, &msk->flags); mptcp_set_state(sk, TCP_LISTEN); sock_set_flag(sk, SOCK_RCU_FREE); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 22804ae2e85a..baec108dd7e5 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -115,6 +115,7 @@ #define MPTCP_WORK_RTX 1 #define MPTCP_FALLBACK_DONE 2 #define MPTCP_WORK_CLOSE_SUBFLOW 3 +#define MPTCP_RTX_ENABLED 4 /* MPTCP socket release cb flags */ #define MPTCP_PUSH_PENDING 1 @@ -1231,6 +1232,7 @@ static inline bool __mptcp_try_fallback(struct mptcp_sock *msk) msk->allow_subflows = false; set_bit(MPTCP_FALLBACK_DONE, &msk->flags); + clear_bit(MPTCP_RTX_ENABLED, &msk->flags); spin_unlock_bh(&msk->fallback_lock); return true; } -- 2.56.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel