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 EFCFB3AEB4A for ; Tue, 12 May 2026 14:22:04 +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=1778595725; cv=none; b=lCG4YfoqUN74dAyBix70s14Rp/GbhglI7YrwAEbMj3pI5FpnM5suV2GbJshHnfyDJndaeLXB6wT3yR9zhwvp/yQTWVzVImr3q1B1iqe9B6RbPQOly6NqDguOn/Y3Feivi1jW2ukjozhUOmEITo7yx3fQIfHJPEYgISulk0fCdXI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778595725; c=relaxed/simple; bh=wHPOOq5oS7Q8pt0we95CRQGAqPF5JoTYdLt0sSM+6WM=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=PJ9esTL/s5dWIfdkFBoJ//yhhSQ8JHMxFOws06BonD8bYk5yxWg9t4jfHkrngQtJF4UzkwKgzGJb4jIuRsZJ78ZDXdjBCWJEbPiNL9l12jEheDe6S22TjzQW5ZnU8rR99D1OUV6nSNF8Pl+fn0cIro4q/p5MQZDxCORs1xq+To4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=BMa5+LjQ; 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="BMa5+LjQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87123C2BCB0; Tue, 12 May 2026 14:22:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778595724; bh=wHPOOq5oS7Q8pt0we95CRQGAqPF5JoTYdLt0sSM+6WM=; h=Subject:To:Cc:From:Date:From; b=BMa5+LjQ2YS//Dswrl5c3KOFn5mKcsfOxzeqASyGIAbPOVJxoeuvaCI6Q+L/rHpsI RVrPNnsYJ7H9I1J0TjzIB6YLJtsM6qZVnrAMF4R/SvFhDnz1sfF9Vt2hrjsbOaHj83 ffVcHoN3mYoo05mSb+zJGm7/VNWLAFSHDWPUy0+8= Subject: FAILED: patch "[PATCH] mptcp: pm: ADD_ADDR rtx: resched blocked ADD_ADDR quicker" failed to apply to 6.6-stable tree To: matttbe@kernel.org,kuba@kernel.org,martineau@kernel.org Cc: From: Date: Tue, 12 May 2026 16:21:53 +0200 Message-ID: <2026051253-pebble-detergent-76b0@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x 3cf12492891c4b5ff54dda404a2de4ec54c9e1b5 # git commit -s git send-email --to '' --in-reply-to '2026051253-pebble-detergent-76b0@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 3cf12492891c4b5ff54dda404a2de4ec54c9e1b5 Mon Sep 17 00:00:00 2001 From: "Matthieu Baerts (NGI0)" Date: Tue, 5 May 2026 17:00:54 +0200 Subject: [PATCH] mptcp: pm: ADD_ADDR rtx: resched blocked ADD_ADDR quicker When an ADD_ADDR needs to be retransmitted and another one has already been prepared -- e.g. multiple ADD_ADDRs have been sent in a row and need to be retransmitted later -- this additional retransmission will need to wait. In this case, the timer was reset to TCP_RTO_MAX / 8, which is ~15 seconds. This delay is unnecessary long: it should just be rescheduled at the next opportunity, e.g. after the retransmission timeout. Without this modification, some issues can be seen from time to time in the selftests when multiple ADD_ADDRs are sent, and the host takes time to process them, e.g. the "signal addresses, ADD_ADDR timeout" MPTCP Join selftest, especially with a debug kernel config. Note that on older kernels, 'timeout' is not available. It should be enough to replace it by one second (HZ). Fixes: 00cfd77b9063 ("mptcp: retransmit ADD_ADDR when timeout") Cc: stable@vger.kernel.org Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260505-net-mptcp-pm-fixes-7-1-rc3-v1-6-fca8091060a4@kernel.org Signed-off-by: Jakub Kicinski diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 8899327e59a1..29d1bb6a69cf 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -342,13 +342,8 @@ static void mptcp_pm_add_timer(struct timer_list *timer) goto out; } - if (mptcp_pm_should_add_signal_addr(msk)) { - timeout = TCP_RTO_MAX / 8; - goto out; - } - timeout = mptcp_adjust_add_addr_timeout(msk); - if (!timeout) + if (!timeout || mptcp_pm_should_add_signal_addr(msk)) goto out; spin_lock_bh(&msk->pm.lock);