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 5653D2DF153 for ; Tue, 19 May 2026 16:18:06 +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=1779207487; cv=none; b=I3L4sWCrqz8UGFvE51UzbIbG8l0CBPNiup9Cio8sZ8JXcaoAKwM74jbjCWr2ZO14lio2unGQ5qkFv/zJCDgKrmQgQcoqw0QvB8f22KXhCe4K/EIRMudQ1QODeUGEwnPEKQK66LALUT/WlC7UrmYBwOFDVU1kGcxayko54dn7jMg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779207487; c=relaxed/simple; bh=UUgEgdUf1RF3uDD1vHHFC0lscEIFdEbZVrEia622mv4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gz2S20dISXnTw8eXlePD6Trb9+l1A8ZXMDuf+3rPuOU56SDOa00sGERt7qFdm7dnyyo0n8NDUArWk34aA4ua+x3eWc9E21M4LGgcCmywiA5TKk629bXxoxx3TAZ7gyZ8Judxh2G1zmAm6dRoyQEYK5Rr/UUxxdeGJNB+dLTeIXI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mBtnbLvW; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mBtnbLvW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 428AFC2BCB3; Tue, 19 May 2026 16:18:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779207486; bh=UUgEgdUf1RF3uDD1vHHFC0lscEIFdEbZVrEia622mv4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mBtnbLvWYuR2UgfAUkwsW1yvJo81IbIrdNelq3Rju2kfu3vuV8zr++42k7CWEypkt CC3dXCO+sWgd9kSqswONFw9HDln+sLE6spV4e1MzLlVHkTAlSf5tT6fZh+3CIWdmNe Zc2Ikr/oUdV3t12W0FrJPgZTPHHKJk9yHkXQEkH0xTQTCkUYFEPrL5OraD6lhLZvPf oDAX4/qfZZvSXFufHURmH/MvTAoYutcAup31sjX4I2/LYbI+v6qW+9ynDN+ocj9JLi bIPZ6N5x8BA4w07cG4stO8m3TIVFc76wOCl7UHCf0ouqj4C1hv1OG6N7xC1GTfexHe 9+gSsNtegS8jA== From: Sasha Levin To: stable@vger.kernel.org Cc: "Matthieu Baerts (NGI0)" , Mat Martineau , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15.y] mptcp: pm: ADD_ADDR rtx: resched blocked ADD_ADDR quicker Date: Tue, 19 May 2026 12:18:04 -0400 Message-ID: <20260519161804.2778143-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051254-repackage-dropper-5c90@gregkh> References: <2026051254-repackage-dropper-5c90@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- net/mptcp/pm_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 6fb14148a96e0..3a35f51b32ed8 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -331,7 +331,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer) return; 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; } -- 2.53.0