From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 333F633291D; Tue, 17 Feb 2026 12:28:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771331312; cv=none; b=D7xWXPacbLu/FDhU4eHrEZEz/s+ENZTBvxqYBCRjZQ5JYd9YQewBE6L/pK31F7wIStFDS+AKHhGHzwDwy+n9PG5hQ8izmLeJN45a2IQ/ba837Q5dWkFXnASbLLpzmhAMI6HdmMNVbqdsOZGWa7lMILhBUamzBXVQkX0q40Vwmmc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771331312; c=relaxed/simple; bh=Sj0xaHcATPt4CBXIW8QWA90Ip6cHUFzugQv1/bCAqLA=; h=Subject:To:Cc:From:Date:In-Reply-To:Message-ID:MIME-Version: Content-Type; b=FjgFD/8UJ0UIfJpOVMQXtyoK/IqJNKJofDKa8wPMSJ6FgduN1GGVIuw8pbsFcnCbl4SsPFrmKBm1dLCwyNcbvuFYJ3u81ZRICiiUWrC6FUj3G7x1TYa+u2Wrg9njuxhrDIlrHI+uXdiYbh0hILsBPt1bt9oYrwfkxiahbG+FA0I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=SHMxz75c; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="SHMxz75c" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4FCD5C4CEF7; Tue, 17 Feb 2026 12:28:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1771331311; bh=Sj0xaHcATPt4CBXIW8QWA90Ip6cHUFzugQv1/bCAqLA=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=SHMxz75c+wGJ/xuoHaS0v1Hn+esIY3HBeKJCyGS07oy19L0ol9ckIJDFLR3Cm9VBS AVS0zPK+YQV67m7SS98vxxbComK9ZHHqeLgfTlrPMLPJqQTVN4Y0r7trnKT3lQ2S8y w+f4poEcjL+3ywVPlp7vIoHD7OO+KAyYTi2D+mEI= Subject: Patch "mptcp: schedule rtx timer only after pushing data" has been added to the 6.1-stable tree To: gregkh@linuxfoundation.org,kuba@kernel.org,matttbe@kernel.org,mptcp@lists.linux.dev,pabeni@redhat.com,sashal@kernel.org Cc: From: Date: Tue, 17 Feb 2026 13:28:20 +0100 In-Reply-To: <20260211190617.77192-10-matttbe@kernel.org> Message-ID: <2026021720-lavish-flattop-db78@gregkh> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit X-stable: commit X-Patchwork-Hint: ignore This is a note to let you know that I've just added the patch titled mptcp: schedule rtx timer only after pushing data to the 6.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: mptcp-schedule-rtx-timer-only-after-pushing-data.patch and it can be found in the queue-6.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From matttbe@kernel.org Wed Feb 11 20:06:58 2026 From: "Matthieu Baerts (NGI0)" Date: Wed, 11 Feb 2026 20:06:20 +0100 Subject: mptcp: schedule rtx timer only after pushing data To: mptcp@lists.linux.dev, stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: Paolo Abeni , sashal@kernel.org, "Matthieu Baerts (NGI0)" , Jakub Kicinski Message-ID: <20260211190617.77192-10-matttbe@kernel.org> From: Paolo Abeni commit 2ea6190f42d0416a4310e60a7fcb0b49fcbbd4fb upstream. The MPTCP protocol usually schedule the retransmission timer only when there is some chances for such retransmissions to happen. With a notable exception: __mptcp_push_pending() currently schedule such timer unconditionally, potentially leading to unnecessary rtx timer expiration. The issue is present since the blamed commit below but become easily reproducible after commit 27b0e701d387 ("mptcp: drop bogus optimization in __mptcp_check_push()") Fixes: 33d41c9cd74c ("mptcp: more accurate timeout") 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/20251205-net-mptcp-misc-fixes-6-19-rc1-v1-3-9e4781a6c1b8@kernel.org Signed-off-by: Jakub Kicinski [ Conflicts in protocol.c, because commit 0fa1b3783a17 ("mptcp: use get_send wrapper") is not in this version, and is changing the context. The same modification can still be applied. ] Signed-off-by: Matthieu Baerts (NGI0) Signed-off-by: Greg Kroah-Hartman --- net/mptcp/protocol.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1666,7 +1666,7 @@ void __mptcp_push_pending(struct sock *s struct mptcp_sendmsg_info info = { .flags = flags, }; - bool do_check_data_fin = false; + bool copied = false; struct mptcp_data_frag *dfrag; int len; @@ -1703,7 +1703,7 @@ void __mptcp_push_pending(struct sock *s goto out; } - do_check_data_fin = true; + copied = true; info.sent += ret; len -= ret; @@ -1717,11 +1717,14 @@ void __mptcp_push_pending(struct sock *s mptcp_push_release(ssk, &info); out: - /* ensure the rtx timer is running */ - if (!mptcp_rtx_timer_pending(sk)) - mptcp_reset_rtx_timer(sk); - if (do_check_data_fin) + /* Avoid scheduling the rtx timer if no data has been pushed; the timer + * will be updated on positive acks by __mptcp_cleanup_una(). + */ + if (copied) { + if (!mptcp_rtx_timer_pending(sk)) + mptcp_reset_rtx_timer(sk); mptcp_check_send_data_fin(sk); + } } static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk, bool first) Patches currently in stable-queue which might be from matttbe@kernel.org are queue-6.1/selftests-mptcp-join-fix-local-endp-not-being-tracked.patch queue-6.1/mptcp-schedule-rtx-timer-only-after-pushing-data.patch queue-6.1/mptcp-ensure-context-reset-on-disconnect.patch queue-6.1/selftests-mptcp-pm-ensure-unknown-flags-are-ignored.patch queue-6.1/selftests-mptcp-check-no-dup-close-events-after-error.patch queue-6.1/selftests-mptcp-check-subflow-errors-in-close-events.patch