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 8FED441B356 for ; Tue, 19 May 2026 12:41:09 +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=1779194469; cv=none; b=OR9bUO22EnVwY/srYHizE8WYDDf8WxfP7cR+ZTpcULjCsZP8/9A0iH+g7dztmLXiG4NVfoXpF0wXLjv76Y9MHJvxpZ6LO7ps3C+zJSs+py0DnVw0KA/abLUiokq+VLOWc62+leV2ZGvmVL/Ic+dmqyuWF92/3fvI+8F1SVrv7QQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779194469; c=relaxed/simple; bh=B13oVaqXr0AWshUaKQlBmBTOIVcnRTpqkJ/SW6RmqlM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hcnVwz/f42SWy1amZsrhCiq406Lq0TcOvDDEB4M598R3MqhS/odoSeE3l/HzxpY7/Y9OpVYhTl4/UnhIooV/ZZKns4LjgnNICkUNrOq13FA4Jw/tF24KGoA6MKn9Mp25ZPAGCPdSY0ke11SGbG2HicePY4bIuJRylWBfkqAkB5o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=u4/u5i+G; 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="u4/u5i+G" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D456FC2BCB8; Tue, 19 May 2026 12:41:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779194469; bh=B13oVaqXr0AWshUaKQlBmBTOIVcnRTpqkJ/SW6RmqlM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u4/u5i+GxonFEapbj/ctJOogIgVqYrT2S0ZGKE5hVepjVKp+YUpYVseh77K1GplZ3 7wLr7MZtWlNp1GJ1xDYlqB3vkxDjBIYXhgxsncGGzOl0TjzRF6EeisI0J6S/LD7fTx s1EGwjX+RJsRshJdyPSPxGLoLC195DhtcaTNw+Dze0Zzw8+H9m9GcC1DDtcuptxXlo lJSQa7QQMM8HbJx+iNI9OKklBoNTFEwp4k3Dxo51492h4jziPQy9ETAWVrUynsiGoX SM4P1eBFG+HJBgSWRLRvKRv+0Cx9DBUaQDe/nBtzVK4f/tu+LxbeYq8K/pKWCbVhQh d/rERs4ingARQ== From: Sasha Levin To: stable@vger.kernel.org Cc: "Matthieu Baerts (NGI0)" , Mat Martineau , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1.y] mptcp: pm: ADD_ADDR rtx: resched blocked ADD_ADDR quicker Date: Tue, 19 May 2026 08:41:06 -0400 Message-ID: <20260519124106.2431795-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051254-groom-prozac-c661@gregkh> References: <2026051254-groom-prozac-c661@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 a16a7a538c425..2f5f6712ce529 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -319,7 +319,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