From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 5005D3F1AB8; Wed, 20 May 2026 17:47:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779299280; cv=none; b=aHZxoGY+CFIJiO79jzDltqpuCFDkW3LQIlpxs+Br/IQs5cCXBlTDLw0R1LRFmUHXMw3fcjso8byRuWhmmwVYdAxal4Hfl6XXrTPKX3TppdaRjSxvYFQMCyBb09lhw3xxYJMSE17iaM/eMXAYr8dw52KcKypL6QisJsoeiaJ5xhU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779299280; c=relaxed/simple; bh=UhZ97qSAs+0ZA56NT4EK0T1FsgeeMebLTckcZX+ET6k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=paqKZ7FzVwuXrHvCYAVPf+E0hqCgtLuIUCNXUSaqVMQzTfHCxEoq1Mv5Th2Mf5bUHOIxZs16BwrglRRfS8BiPtiGtGTLaKlQFs5dZOvSVg0/Qp2mxG63zRzCifAwQgKpaX0jSCpjXMhk5U/9Iuehhvc+lAqGoh/x3yzlcBUl8S8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=XtMCNZ7L; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="XtMCNZ7L" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 59F611F00893; Wed, 20 May 2026 17:47:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779299278; bh=uMBYgTjBMCongEHtHq/B6MZ0fBkAV8K7+fXi4qfW/sE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XtMCNZ7LkPnGehHve8gBmC57vMF+HYMyq8HxqU7bDR15bv2SllXYJzkgHPTBTLchs pZAOvMSeT4t+2gcPICMw5jNwzbhzJA+wbZFSL+4paTK3sxKJOJaWZdTtIpVWZu/45R 0cEpCkrT025IeePKglWI5Bi1cso2KgWUDEP26Uv0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mat Martineau , "Matthieu Baerts (NGI0)" , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6 508/508] mptcp: pm: ADD_ADDR rtx: resched blocked ADD_ADDR quicker Date: Wed, 20 May 2026 18:25:31 +0200 Message-ID: <20260520162109.610335165@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162058.573354582@linuxfoundation.org> References: <20260520162058.573354582@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: "Matthieu Baerts (NGI0)" [ Upstream commit 3cf12492891c4b5ff54dda404a2de4ec54c9e1b5 ] 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 [ replaced `TCP_RTO_MAX / 8` with `HZ` ] Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- net/mptcp/pm_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -316,7 +316,7 @@ static void mptcp_pm_add_timer(struct ti } if (mptcp_pm_should_add_signal_addr(msk)) { - sk_reset_timer(sk, timer, jiffies + TCP_RTO_MAX / 8); + sk_reset_timer(sk, timer, jiffies + HZ); goto out; }