From nobody Wed Sep 17 18:05:38 2025 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 9A13930F524; Fri, 15 Aug 2025 17:28:50 +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=1755278930; cv=none; b=BOhg25iK5/LG5D2jubn+ybUXAsm29QDfSJIZDpd9cWXHZ4FVSdJVO49s84uUDGA6wMje3FPqCW/MP7Xp0EMCHKbkYB9u1DWh4QzEf0Rr4imgRNwx/0HSXqbfhzwryijZxZnobiGRDIb2opFybaN4fYLkJhYuFem26zuCODR2yHs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755278930; c=relaxed/simple; bh=alzUII3HCcV/PNy9aZJrnaMvWFFEiAxn9OrGN59/B+I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=psDqXXkH/mJl82U0zaoM/Jvq9Roy1FMBoR/e8e9OA/pWwiDYxOQPCI45/jMskGjiR6ABF7mBm8SLtU8KzWx8lsJhtXBoh0+ildKkfopx0Wh5A/Z90iIGn5rB9z+E4vS835CWPXcmTHwxCNqrDnSR0oy+Nye11zQlLnOhSjYjMbs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EDHHL2MY; 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="EDHHL2MY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF34DC4CEF8; Fri, 15 Aug 2025 17:28:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1755278930; bh=alzUII3HCcV/PNy9aZJrnaMvWFFEiAxn9OrGN59/B+I=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=EDHHL2MYImyfQUWxHtTDmITADnFutyeb9Rqj/o0rLgGvvgXpmkiqfD113rfwU+pbv nFsSpNi1vXPpWOEwd4VIze3mBhJeCLEmN8v9DFETfHFkf74apL/gnt6MWSC74lqy9l 7ZYYkWS5HUVAhf+GDLMILF5AGQJ2VD6XeJt0hsl/mvEQUAbggAFx7RYVLNfVYv/FhB mTU2Bv7WaL5tK8gfSubYz/cHLnblSnrJJiPEYPbMlYMmHkgAHRE2Jc5W5xXMEZQ4fl +pxE3MPOSv9H9fQ57yB1HXnHqntHYBkb5xgyzJ3kza8cBBS/NaEmDEFzJFzku+FZ0l AeuPplDBs0pmw== From: "Matthieu Baerts (NGI0)" Date: Fri, 15 Aug 2025 19:28:19 +0200 Subject: [PATCH net 1/8] mptcp: drop skb if MPTCP skb extension allocation fails Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-1-521fe9957892@kernel.org> References: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-0-521fe9957892@kernel.org> In-Reply-To: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-0-521fe9957892@kernel.org> To: mptcp@lists.linux.dev, Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Jianguo Wu , Shuah Khan , Jonathan Corbet , zhenwei pi Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, "Matthieu Baerts (NGI0)" , Christoph Paasch , stable@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2133; i=matttbe@kernel.org; h=from:subject:message-id; bh=ZiXTrfWywLXu8XVmrQdOFUX//1vIF1rJYp1AiLk8nPw=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDLm5zm8vG93Zt8SlsYZa+LZZ554naK+w3LfhqUFi2Xvr N5b9ftgdkcpC4MYF4OsmCKLdFtk/sznVbwlXn4WMHNYmUCGMHBxCsBEfIoYGTZx7n7aZmV2ufha /yIGG+Mldl4nn6XM+rmVSzmVd8n/F7yMDG2zp2w1ddriuXeRxJRe/RunFiRw7m1Yzu67cutevlr GpcwA X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: Christoph Paasch When skb_ext_add(skb, SKB_EXT_MPTCP) fails in mptcp_incoming_options(), we used to return true, letting the segment proceed through the TCP receive path without a DSS mapping. Such segments can leave inconsistent mapping state and trigger a mid-stream fallback to TCP, which in testing collapsed (by artificially forcing failures in skb_ext_add) throughput to zero. Return false instead so the TCP input path drops the skb (see tcp_data_queue() and step-7 processing). This is the safer choice under memory pressure: it preserves MPTCP correctness and provides backpressure to the sender. Control packets remain unaffected: ACK updates and DATA_FIN handling happen before attempting the extension allocation, and tcp_reset() continues to ignore the return value. With this change, MPTCP continues to work at high throughput if we artificially inject failures into skb_ext_add. Fixes: 6787b7e350d3 ("mptcp: avoid processing packet if a subflow reset") Cc: stable@vger.kernel.org Signed-off-by: Christoph Paasch Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/options.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 70c0ab0ecf905d282e5dc6c1b21ffc6476c8d71b..2a8ea28442b271675411d190604= 073f779bee7fa 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -1118,7 +1118,9 @@ static bool add_addr_hmac_valid(struct mptcp_sock *ms= k, return hmac =3D=3D mp_opt->ahmac; } =20 -/* Return false if a subflow has been reset, else return true */ +/* Return false in case of error (or subflow has been reset), + * else return true. + */ bool mptcp_incoming_options(struct sock *sk, struct sk_buff *skb) { struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(sk); @@ -1222,7 +1224,7 @@ bool mptcp_incoming_options(struct sock *sk, struct s= k_buff *skb) =20 mpext =3D skb_ext_add(skb, SKB_EXT_MPTCP); if (!mpext) - return true; + return false; =20 memset(mpext, 0, sizeof(*mpext)); =20 --=20 2.50.0 From nobody Wed Sep 17 18:05:38 2025 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 73C3130F530; Fri, 15 Aug 2025 17:28:53 +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=1755278934; cv=none; b=GRCZMNKZdzm8n1ZvLdw6LJE8aT/BI7khzuMEgdDaNowngQGd6UTQxXPqkVGPkWSZ8ebqBIxhsctc4re5uvJ5j7XdE3lKYsVVz2Ep7qT5yDjEWi+mq2hzTC68Im4VV5lKTQZ3+Yc17L8p6zR0mP5lKZV6y30/SYCWipNecwF7QnU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755278934; c=relaxed/simple; bh=ztDCln7jBtzQR3343136FV3STkEDzGIsbFAfGPVrCzw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cNkAelSITUjMfFbJxJxDeC+qCUQytqkhpo4mXPDxatZNi2uAhvY+cr7jkHmwpbkGvAo1DIyl57OkBFgVpDpH0U2lMygXYBJleFJArSunkMSh47ZlMJTODOdalJjmJMIs7+ChtjnDAQEkxgK8ZyhyPKce9Vte/5f5Q1DR52tbxoM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YPaO5xtn; 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="YPaO5xtn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 913A2C4CEEB; Fri, 15 Aug 2025 17:28:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1755278933; bh=ztDCln7jBtzQR3343136FV3STkEDzGIsbFAfGPVrCzw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=YPaO5xtn4cciDNTvb3yUUs2ApkXwHVxq4P8GQVU7TW5k/3+ybhulhp9CSghZO9FaW 7dW/mX+6SR/hTdW6nItfPCjXGbwipCdSpnwVm80ryiZO9y+zcer03cALc2omRnLq9J DwY1GjbhDqyoLMpb2CvXaEkWRUlo2SW4KEzRb8S1008kTiCVshP4Fv2t7dqg/j8PUJ Gxuaf8uERnNt2TTsqNqN5RODIbksLYj76Ten1BbZW6xfm5YV3vuGjNW1mPQk5zx0/H 3tuRVViuICzNqzo/5FJz/Wk1iQjgEyPLZinJRNqFoAvCrDOT+iz5H1zMvi/6VSwCnA aUUbS+dUJMH9Q== From: "Matthieu Baerts (NGI0)" Date: Fri, 15 Aug 2025 19:28:20 +0200 Subject: [PATCH net 2/8] mptcp: pm: kernel: flush: do not reset ADD_ADDR limit Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-2-521fe9957892@kernel.org> References: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-0-521fe9957892@kernel.org> In-Reply-To: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-0-521fe9957892@kernel.org> To: mptcp@lists.linux.dev, Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Jianguo Wu , Shuah Khan , Jonathan Corbet , zhenwei pi Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, "Matthieu Baerts (NGI0)" , stable@vger.kernel.org, Thomas Dreibholz X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1234; i=matttbe@kernel.org; h=from:subject:message-id; bh=ztDCln7jBtzQR3343136FV3STkEDzGIsbFAfGPVrCzw=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDLm5zlpb1VKEfsrPEX0CNcXjhrRFa8KXbffdJo16d00c 00J8cveHaUsDGJcDLJiiizSbZH5M59X8ZZ4+VnAzGFlAhnCwMUpABNRfM3wvyx/uciblc6+TAVf /9jkGHb9CH4gGXRu1d4wJ/+LSsu+XmL4ZxAd0j1T+mbvitf6nEazTDTO15xgOvvrc4+95WH/f7u N+QE= X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 A flush of the MPTCP endpoints should not affect the MPTCP limits. In other words, 'ip mptcp endpoint flush' should not change 'ip mptcp limits'. But it was the case: the MPTCP_PM_ATTR_RCV_ADD_ADDRS (add_addr_accepted) limit was reset by accident. Removing the reset of this counter during a flush fixes this issue. Fixes: 01cacb00b35c ("mptcp: add netlink-based PM") Cc: stable@vger.kernel.org Reported-by: Thomas Dreibholz Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/579 Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/pm_kernel.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/mptcp/pm_kernel.c b/net/mptcp/pm_kernel.c index d39e7c1784608db290b8a2c1bc4fc24ed800cbb4..667803d72b643a0bb98365003b1= 36c53f2a9a975 100644 --- a/net/mptcp/pm_kernel.c +++ b/net/mptcp/pm_kernel.c @@ -1085,7 +1085,6 @@ static void __flush_addrs(struct list_head *list) static void __reset_counters(struct pm_nl_pernet *pernet) { WRITE_ONCE(pernet->add_addr_signal_max, 0); - WRITE_ONCE(pernet->add_addr_accept_max, 0); WRITE_ONCE(pernet->local_addr_max, 0); pernet->addrs =3D 0; } --=20 2.50.0 From nobody Wed Sep 17 18:05:38 2025 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 AA20E30F535; Fri, 15 Aug 2025 17:28:57 +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=1755278937; cv=none; b=TXT9GSt1X6g8g9qJ55+yht1nn/BXcdoNvJNmUfq7CTZQM1B2lz6YD0OWw+365AMVWz94tVNC7+e5ZixbZzsejEcMhh0rQQfKPwGEOSIX5ZZnBYH74zPYcLXqDpbqNm3rK/8TxJsQgLw4jTV9SVlN8/oAEOs99QRFJ24MTAkl7qY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755278937; c=relaxed/simple; bh=wVhVNJGxv9DpeQikf06WEKzYzRCoz7rAHEfrPSheFI0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=K/o4mR60meAaa9ctEC/RltaTGzLTGcMQyEtsuGmwGiqMzyOnIx+Puqp00wnivDx0aRA/l1Z61l/buf9jZkcAu4Gwc1KjR0jy9z2cjtIal1zT29fMH2y0xQdYeD0vZAQfsbdJz08CyiVh1+LKuSIYH9UndY6TX1JM/BoxDxueeO0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qblfX77W; 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="qblfX77W" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3284EC4CEF1; Fri, 15 Aug 2025 17:28:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1755278937; bh=wVhVNJGxv9DpeQikf06WEKzYzRCoz7rAHEfrPSheFI0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=qblfX77WfMr7lbeZ0LnyyzXE9L5zCPUQG1OdxgwaHw9MullTYwslMf++eUw59NeUb 3k3j6gTeZMDfQ6bRbwkT3JxQqm5Bl5QDBBl3LtdfnggrzAsNA6mg9QGkUtH/VNbhYi TgomWnEiZgJzBujK2a9CyUgCPiQE9iZkn0teUPIHLVhQCAS6o4o/LFhxVgiLgfy2ek jV8qwI7uLOREz0FfnV5CNaFN7Kn8GZb8xAlssjbgFk2aAIHMGrAYmc9gGvL5ehUr8g /DnJ1wxt5335lU1Ssxt+54H814+LNU6FuYVsUa2reCSq//ytcBKaS+7lPyh4D5jb8f iO3gRx8HZY0Yw== From: "Matthieu Baerts (NGI0)" Date: Fri, 15 Aug 2025 19:28:21 +0200 Subject: [PATCH net 3/8] selftests: mptcp: pm: check flush doesn't reset limits Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-3-521fe9957892@kernel.org> References: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-0-521fe9957892@kernel.org> In-Reply-To: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-0-521fe9957892@kernel.org> To: mptcp@lists.linux.dev, Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Jianguo Wu , Shuah Khan , Jonathan Corbet , zhenwei pi Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, "Matthieu Baerts (NGI0)" , stable@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1376; i=matttbe@kernel.org; h=from:subject:message-id; bh=wVhVNJGxv9DpeQikf06WEKzYzRCoz7rAHEfrPSheFI0=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDLm5zmrq2022CFr2n1zTWrYzLVPvZev/ej88u+xeq7w6 qClPJZxHaUsDGJcDLJiiizSbZH5M59X8ZZ4+VnAzGFlAhnCwMUpABNJfMjIcC3ttm6GXdzaX0dt lfbl1acvL84UnbD5yvIcq0WrJU05pBn+F5p8DNzJ3tTNvjy58xfXzBK1bYtFuw9cZmv5bMcw+aA 3IwA= X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 This modification is linked to the parent commit where the received ADD_ADDR limit was accidentally reset when the endpoints were flushed. To validate that, the test is now flushing endpoints after having set new limits, and before checking them. The 'Fixes' tag here below is the same as the one from the previous commit: this patch here is not fixing anything wrong in the selftests, but it validates the previous fix for an issue introduced by this commit ID. Fixes: 01cacb00b35c ("mptcp: add netlink-based PM") Cc: stable@vger.kernel.org Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/pm_netlink.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testin= g/selftests/net/mptcp/pm_netlink.sh index 2e6648a2b2c0c6ea0e9f030c942077a0f483092f..ac7ec6f9402376a34602ef1ca6c= 4822e8dde0ded 100755 --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -198,6 +198,7 @@ set_limits 1 9 2>/dev/null check "get_limits" "${default_limits}" "subflows above hard limit" =20 set_limits 8 8 +flush_endpoint ## to make sure it doesn't affect the limits check "get_limits" "$(format_limits 8 8)" "set limits" =20 flush_endpoint --=20 2.50.0 From nobody Wed Sep 17 18:05:38 2025 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 3F3CC31062A; Fri, 15 Aug 2025 17:29:00 +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=1755278941; cv=none; b=Ql55M5w/YsEPISYS54BwwBmsMh1fOtLG2VIDbYgZJAEC1fyBbhUkNWfmN6UyFqGPlADBE34jr4sAbbauZtzOBJw0XY9iowCjaCZXvZL/SdMh2qIkhu/xYbi5PH9E6OT9E0eACojtw5q+VdT9KYMWqGsr4RCuZPpRgNor6EpJI70= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755278941; c=relaxed/simple; bh=ua3JGiT4jYheiUorZF5N/JLVDKvXbPZiqO4sZcmEV0k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bZL2mNgBpdZL2ISQt5c2g6CyVmEQ0Ep1ik4YFHsfdUObl+FRYmyn/K5prDVlmg14MvWuU9nydSIombSnCDfRwL747fKCUZJ06HGiwhA++o5S1r7UC2Spb/x+U9H4YOav5VBWwrMizctZgZALn9r9bWPb8BVQcg0gxCuAzWqpCBA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=g9d4HPNd; 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="g9d4HPNd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9FB91C4CEEB; Fri, 15 Aug 2025 17:28:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1755278940; bh=ua3JGiT4jYheiUorZF5N/JLVDKvXbPZiqO4sZcmEV0k=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=g9d4HPNdBdMi0TKNdKc0gkLpdaiq7Dp+pHGdlk94290g6xgbxBMyt+EWtBEXI16Qi i7JTsmt3xXEi8rONAD6/1sqqJEYbyJme+Ushr6X/Xa9o1DVD82eRegb24TrThrvDIF 3mJXWP5mhPdn5iXdJvA8iDk4TBwV9E3d8XuOlROKHJyN/3xMMxhaF/37ZB8kLG3pz+ pQl/CghsPtPjXku5dwCHrgWZFBhnb3OrerB7Trx76AHVkjzw+oABYZaWhDfK7U9kSd rKw1gXYbTDZJKxy9fC2j4aSyVf2Emth16JVJjpPqupVD1vmkBeTqFl14O5WyNZCikU LZhwDzf7wT35w== From: "Matthieu Baerts (NGI0)" Date: Fri, 15 Aug 2025 19:28:22 +0200 Subject: [PATCH net 4/8] mptcp: remove duplicate sk_reset_timer call Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-4-521fe9957892@kernel.org> References: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-0-521fe9957892@kernel.org> In-Reply-To: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-0-521fe9957892@kernel.org> To: mptcp@lists.linux.dev, Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Jianguo Wu , Shuah Khan , Jonathan Corbet , zhenwei pi Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, "Matthieu Baerts (NGI0)" , stable@vger.kernel.org, Geliang Tang X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1474; i=matttbe@kernel.org; h=from:subject:message-id; bh=FrXeJh53BVT5ky3wW9Bq6fbRb8TgEnUSVU2pkmK1AX4=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDLm57m++iLLP3tfsag144yNdp812yLjN1UfaTO2ySl55 abHV3Sxo5SFQYyLQVZMkUW6LTJ/5vMq3hIvPwuYOaxMIEMYuDgFYCJrpjL84XzT8pg5/FH1bU6e I69W7d5u+2zjamvf/tW6DVbb6uPeJTL892h/1D1R9vvVzCet6o0V8+fqNR/m/mnfb12TEcSgYC7 DDAA= X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: Geliang Tang sk_reset_timer() was called twice in mptcp_pm_alloc_anno_list. Simplify the code by using a 'goto' statement to eliminate the duplication. Note that this is not a fix, but it will help backporting the following patch. The same "Fixes" tag has been added for this reason. Fixes: 93f323b9cccc ("mptcp: add a new sysctl add_addr_timeout") Cc: stable@vger.kernel.org Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/pm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 420d416e2603de2e54f017216c56daa80f356e87..c5f6a53ce5f1e10dada52865e41= b685d888a71fa 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -353,9 +353,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, if (WARN_ON_ONCE(mptcp_pm_is_kernel(msk))) return false; =20 - sk_reset_timer(sk, &add_entry->add_timer, - jiffies + mptcp_get_add_addr_timeout(net)); - return true; + goto reset_timer; } =20 add_entry =3D kmalloc(sizeof(*add_entry), GFP_ATOMIC); @@ -369,6 +367,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, add_entry->retrans_times =3D 0; =20 timer_setup(&add_entry->add_timer, mptcp_pm_add_timer, 0); +reset_timer: sk_reset_timer(sk, &add_entry->add_timer, jiffies + mptcp_get_add_addr_timeout(net)); =20 --=20 2.50.0 From nobody Wed Sep 17 18:05:38 2025 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 A4B6C310658; Fri, 15 Aug 2025 17:29: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=1755278944; cv=none; b=nO2/zt3MQZrqA3iyQeEqlgRxUZRLszq775NXIi9eMQJr/Uk15v1U0wx5kkARB0ef6oHgRYKt6tir6fXbKLD2JaVVP1w/iKsyvxJzA61WsV1gYh5GzUOmysEKOdRWMj+RGpA+z0Dz0nndq4Ye/WxzFR+AmCDK064KIA5emSPvyps= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755278944; c=relaxed/simple; bh=WgjJaS+rdFhCMCImcMRpi0vO9gmWRJGFBiZz38gakh4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cZ6KQO2YiiZts7+/Yhfv9AULHFIO4yY9DrXFiGcmv6iEiSIwD+pjbJMekwczH+9aqh2z2DgqGKFcfTjw3iyIrX/5xLza/5rN8mPsuyRkSHdezgq3U18tQEIuTBbDbVmte5zpmNoWw3OfRrtn/jxJChN3ku8HDZ7kXRgtYZIH+8Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hgyelfFl; 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="hgyelfFl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F6E5C4CEF1; Fri, 15 Aug 2025 17:29:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1755278944; bh=WgjJaS+rdFhCMCImcMRpi0vO9gmWRJGFBiZz38gakh4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=hgyelfFlCiapEJQNA9mFHrdPA8aW41S2aGp0mbWeQml5A5PN+W8chHXKESwY1xCva VfBscPxohyQbQ9yZfXiz+MXr2Q3/bR8gUkyGGHkN/1KoFR5kCHYl0KE0ZNX0wrwCrx lvDDh6J/WhAUx9v1ae5wWkqS7PCihH+EVnGUYKizNc6hUlF/EBQOrabDjC88zOHmHo X28e4bFeAStvveq2bXzoQmGlf/r6pNM+g9YInoYlA2zdOkyPlrIUbhe1sLxO+lM3E4 PSyhZskiu4jbuOvd0wh2e62T8BhG7SSP63snf5JGrWLaXcINd4rDveYIYXOYl9cocB VqkSIIZNxNQAQ== From: "Matthieu Baerts (NGI0)" Date: Fri, 15 Aug 2025 19:28:23 +0200 Subject: [PATCH net 5/8] mptcp: disable add_addr retransmission when timeout is 0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-5-521fe9957892@kernel.org> References: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-0-521fe9957892@kernel.org> In-Reply-To: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-0-521fe9957892@kernel.org> To: mptcp@lists.linux.dev, Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Jianguo Wu , Shuah Khan , Jonathan Corbet , zhenwei pi Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, "Matthieu Baerts (NGI0)" , stable@vger.kernel.org, Geliang Tang X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3042; i=matttbe@kernel.org; h=from:subject:message-id; bh=m82o899n5rC/GDPYqz458xzlkCJvdREvDViuEaEDHUA=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDLm57nZrN0S13TIvylki/Jes33t5o7zf+St1T/K/Oyn0 dVv4jWfOkpZGMS4GGTFFFmk2yLzZz6v4i3x8rOAmcPKBDKEgYtTACaS9ZKRYZL/rLj73woa5Vp/ 612cJ6tw7cHONv/cr0/UnwrH3Y3iZGf4Z3XZ5LfdWlWRMK5TGX9+/t09QX3FYrtG5tTm68H151z 38AEA X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: Geliang Tang When add_addr_timeout was set to 0, this caused the ADD_ADDR to be retransmitted immediately, which looks like a buggy behaviour. Instead, interpret 0 as "no retransmissions needed". The documentation is updated to explicitly state that setting the timeout to 0 disables retransmission. Fixes: 93f323b9cccc ("mptcp: add a new sysctl add_addr_timeout") Cc: stable@vger.kernel.org Suggested-by: Matthieu Baerts Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) --- Documentation/networking/mptcp-sysctl.rst | 2 ++ net/mptcp/pm.c | 13 ++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Documentation/networking/mptcp-sysctl.rst b/Documentation/netw= orking/mptcp-sysctl.rst index 5bfab01eff5a9db89e1484787953241c16e147cf..1683c139821e3ba6d9eaa3c5933= 0a523d29f1164 100644 --- a/Documentation/networking/mptcp-sysctl.rst +++ b/Documentation/networking/mptcp-sysctl.rst @@ -12,6 +12,8 @@ add_addr_timeout - INTEGER (seconds) resent to an MPTCP peer that has not acknowledged a previous ADD_ADDR message. =20 + Do not retransmit if set to 0. + The default value matches TCP_RTO_MAX. This is a per-namespace sysctl. =20 diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index c5f6a53ce5f1e10dada52865e41b685d888a71fa..136a380602cae872b76560649c9= 24330e5f42533 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -274,6 +274,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer) add_timer); struct mptcp_sock *msk =3D entry->sock; struct sock *sk =3D (struct sock *)msk; + unsigned int timeout; =20 pr_debug("msk=3D%p\n", msk); =20 @@ -291,6 +292,10 @@ static void mptcp_pm_add_timer(struct timer_list *time= r) goto out; } =20 + timeout =3D mptcp_get_add_addr_timeout(sock_net(sk)); + if (!timeout) + goto out; + spin_lock_bh(&msk->pm.lock); =20 if (!mptcp_pm_should_add_signal_addr(msk)) { @@ -302,7 +307,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer) =20 if (entry->retrans_times < ADD_ADDR_RETRANS_MAX) sk_reset_timer(sk, timer, - jiffies + mptcp_get_add_addr_timeout(sock_net(sk))); + jiffies + timeout); =20 spin_unlock_bh(&msk->pm.lock); =20 @@ -344,6 +349,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, struct mptcp_pm_add_entry *add_entry =3D NULL; struct sock *sk =3D (struct sock *)msk; struct net *net =3D sock_net(sk); + unsigned int timeout; =20 lockdep_assert_held(&msk->pm.lock); =20 @@ -368,8 +374,9 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, =20 timer_setup(&add_entry->add_timer, mptcp_pm_add_timer, 0); reset_timer: - sk_reset_timer(sk, &add_entry->add_timer, - jiffies + mptcp_get_add_addr_timeout(net)); + timeout =3D mptcp_get_add_addr_timeout(net); + if (timeout) + sk_reset_timer(sk, &add_entry->add_timer, jiffies + timeout); =20 return true; } --=20 2.50.0 From nobody Wed Sep 17 18:05:38 2025 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 E476E3115B7; Fri, 15 Aug 2025 17:29:07 +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=1755278948; cv=none; b=S71jqp5ueG0BbkcRVRlYm1PDJ4625Flp4DDZE65ohTKwcXI3FIBi6Np1NOsrTqdEjn1pWve8jG0Uqh9XJF+mE1GD6TIqX5Wf0+jxivF+5BTd7t4phmdZQfbhR2kVrKTc1lKNjhTbe+Khb5mg6Mv4AMzoqhtU43dTtmD+lU11Ovc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755278948; c=relaxed/simple; bh=SNZJTCa5XDVUd8KDVWlx3dbijbMr9Mux8fViXWyTANs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qkmSgRFAHfDQJ4nl3co4/bhr/rICCD28HIjqN0LmDwydKZyFqmLS57JNNZiV5NFfg9M5BaFnXDAkBg7a3N5ujZqRXfEZoZp0s7PWYnvtqFBg1jie5dEcPde+SmZCGyTco+Aka9LfA8W6UgLK/nAbOFH2FOzoRNgs6YqwezgXLcc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sc3gqioU; 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="sc3gqioU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A07F8C4CEEB; Fri, 15 Aug 2025 17:29:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1755278947; bh=SNZJTCa5XDVUd8KDVWlx3dbijbMr9Mux8fViXWyTANs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=sc3gqioUWdKnm8fmCZvYhxjrQ55L1+nj4s/YURqRHZLunssJBt5wa3MG7WyDPT4cU ebOJWksKop2aKLaR3x4yqldQHLV1fUgKour9LaMJzm/WozDhcef5YAOZrmWpiV5Cgj IBYOfeYIIk53G3FauAGTS6JB4gUbLAjPz7kNJ1lfcOk9FsCWc3Krb8VhaV+7W3t41+ L4d1encDZ/56hN7tY2lYkqlwYTSuVtqc9DXFICKggpXPFv0GcG1q1uDKvitnTXgZAe wPhrQX1VmExLpNzN6mnYM9CAx9sMi16awkjTQBreLh4m/K4WfAL9Sog4oY/Jr3vliY rdpL4e1hLLg5g== From: "Matthieu Baerts (NGI0)" Date: Fri, 15 Aug 2025 19:28:24 +0200 Subject: [PATCH net 6/8] selftests: mptcp: disable add_addr retrans in endpoint_tests Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-6-521fe9957892@kernel.org> References: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-0-521fe9957892@kernel.org> In-Reply-To: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-0-521fe9957892@kernel.org> To: mptcp@lists.linux.dev, Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Jianguo Wu , Shuah Khan , Jonathan Corbet , zhenwei pi Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, "Matthieu Baerts (NGI0)" , Geliang Tang X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1191; i=matttbe@kernel.org; h=from:subject:message-id; bh=lTOus+pRfZXHIltK845L7Aj+ND+bfeKF5GBsaPtYkzc=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDLm57kXVuaeSZqvuiHUpWWu1VxpU8vL1/xKNaOXrFF7V z5x4wrVjlIWBjEuBlkxRRbptsj8mc+reEu8/Cxg5rAygQxh4OIUgIlsaGf4pxRg8rDut8OWWSoO R1gUrz6ouvP7bshJLXceyV8qh9/3cTEyrP96oOLXiQtcNTuXydxcUr+Be8lHVda9km06f56v3Zu 8lwUA X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: Geliang Tang To prevent test instability in the "delete re-add signal" test caused by ADD_ADDR retransmissions, disable retransmissions for this test by setting net.mptcp.add_addr_timeout to 0. Suggested-by: Matthieu Baerts Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index b8af65373b3ada96472347171924ad3a6cf14777..82cae37d9c2026cc55466636d53= a76f929a03452 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3842,6 +3842,7 @@ endpoint_tests() # remove and re-add if reset_with_events "delete re-add signal" && mptcp_lib_kallsyms_has "subflow_rebuild_header$"; then + ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=3D0 pm_nl_set_limits $ns1 0 3 pm_nl_set_limits $ns2 3 3 pm_nl_add_endpoint $ns1 10.0.2.1 id 1 flags signal --=20 2.50.0 From nobody Wed Sep 17 18:05:38 2025 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 1BADD315788; Fri, 15 Aug 2025 17:29:11 +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=1755278951; cv=none; b=nbtnSugAsQyd+kYuVW+lSqZD/R1DLMvVxah19i/w6eFL85qC3nWhvgK5yOUB8UGUrLd6gSNUtiiWPbmAc91f2fOYPq3sTPnWm0SioOhqSNBZa2vZZSK/Vz5qIe0an062KGS2k8oNbh992eM7Tx694GfEM9xGSmQ0tzUnpjGSZO8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755278951; c=relaxed/simple; bh=e6SjnKvlM2L9QU1I7NMIYkV0u+TLc37nAIXkPyJli0g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DgBh1xeS9nFwv0vr0b2GLDq3YgVkTYm/Nle1wPOav6GkukdrrK3baTf6t8Lq7fEanM0cp2FCjXljwbmRxIrmPn0d154Y4cKvjO2wGaFiOfcYKu8rHFNR7lo8/YtPf+jOu4l+zHT1N0bIPG/1nligrOITuj1kWqSLjIpOLJoNzjM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uoOQbkcC; 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="uoOQbkcC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E7334C4CEF1; Fri, 15 Aug 2025 17:29:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1755278951; bh=e6SjnKvlM2L9QU1I7NMIYkV0u+TLc37nAIXkPyJli0g=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=uoOQbkcCLun8AiXIfnmQXHlHAkkSMyjmuyHtabMxXbQNu4aRLBI9PFESb/O3ypMBL T0eV/zfqldcFNvHfJ7PXdBCdXKtcTUij0UhfEkG9Wu0Rx5fjSviC9Vbax2CaYcv9ip TxkdBdZ65kJjyMhPFtVJquLqLY/2zC5AWPZl0UB7SyOMel1lOTAgSeEoOcDNfcg9VO yHxSGhbi3LYQBcw8uSIm9v2GxEY/WSNZNoXINZawCeRm8FXA8baS65vXSQxUVscP7C KDH6PVsEMWm7KKIJCNEmX3VJFRG/6LbwYJPr3b7WGvnXHgRl00VM+Ee2HCVBjF3eAM BB5VyQgxjYEVA== From: "Matthieu Baerts (NGI0)" Date: Fri, 15 Aug 2025 19:28:25 +0200 Subject: [PATCH net 7/8] selftests: mptcp: connect: fix C23 extension warning Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-7-521fe9957892@kernel.org> References: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-0-521fe9957892@kernel.org> In-Reply-To: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-0-521fe9957892@kernel.org> To: mptcp@lists.linux.dev, Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Jianguo Wu , Shuah Khan , Jonathan Corbet , zhenwei pi Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, "Matthieu Baerts (NGI0)" , stable@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1304; i=matttbe@kernel.org; h=from:subject:message-id; bh=e6SjnKvlM2L9QU1I7NMIYkV0u+TLc37nAIXkPyJli0g=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDLm53l+Tk741fiN68LPU9tu3j11ije98wX3y2MZ+o6nW 6w4ldUbO0pZGMS4GGTFFFmk2yLzZz6v4i3x8rOAmcPKBDKEgYtTACby9Scjwwou6QrNOVslvuw6 /P7k/WRxudcfUhd2txU8KZhZUvJL/ATDf/81bjM+1jI/NzuYtf7bA/bLh7Zvm+xdvvSeCodvxLt zP1gA X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 GCC was complaining about the new label: mptcp_connect.c:187:2: warning: label followed by a declaration is a C23 = extension [-Wc23-extensions] 187 | int err =3D getaddrinfo(node, service, hints, res); | ^ Simply declare 'err' before the label to avoid this warning. Fixes: a862771d1aa4 ("selftests: mptcp: use IPPROTO_MPTCP for getaddrinfo") Cc: stable@vger.kernel.org Reviewed-by: Geliang Tang Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/mptcp_connect.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/test= ing/selftests/net/mptcp/mptcp_connect.c index ac1349c4b9e5404c95935eb38b08a15d774eb1d9..4f07ac9fa207cb08a934582b98d= 688d0b9512f97 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c @@ -183,9 +183,10 @@ static void xgetaddrinfo(const char *node, const char = *service, struct addrinfo *hints, struct addrinfo **res) { -again: - int err =3D getaddrinfo(node, service, hints, res); + int err; =20 +again: + err =3D getaddrinfo(node, service, hints, res); if (err) { const char *errstr; =20 --=20 2.50.0 From nobody Wed Sep 17 18:05:38 2025 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 E8F793176E3; Fri, 15 Aug 2025 17:29:14 +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=1755278955; cv=none; b=NUdHhsaJX85uAl+iRuWmtwMDT9r8uoHS6LvIssBJsuWj3pDTs8r10WoI1E4ici4JpzfcOOuicXaKNF0Uvols3akGQj3/O+C+uSpetMJX8IvutARcOQoAh72gqKRWbsVc0S+OxKTH+zabqUhOqSP/ttSckpbxacAjH9K/Rg6EArY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755278955; c=relaxed/simple; bh=PK26ncj1sRIqMENRXER6Zb/SJgspRGIPg5z97PYQV90=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mQQ4soKdvKM+WE5xmK4jFTGFUw+1rwqZszfIscAiy2s6aktVLPB+cKaSCidgmGDgeiBGvaRJtl8mKOUpQmke8DjGiBCwXcMeAVK0Msl9lOFJ6NdB1qUgZD8+qrdH+Ai0KZHB5g+5yg7bBm3IaV2FfwzX3fxkfcNmj012QisgJ9o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=A86cYmj/; 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="A86cYmj/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60CAEC4CEEB; Fri, 15 Aug 2025 17:29:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1755278954; bh=PK26ncj1sRIqMENRXER6Zb/SJgspRGIPg5z97PYQV90=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=A86cYmj/HBFtAAj2CzEkcbBe9jKSWZ7H0ENkfA7ZqLkv/UaoRHpkSjCPW0va0KBQb chCDuL+Rrbtcm2OVRFrTt3eKhVFvySV0AUFQaOQBZy05QZ81wKzAYzcBSx8ZgMBKNn LBfiouBXINSjhqMyXFUFDhhZYTkpQCVaLGX9LSeUlgFOiLOd22+JBzgCP9Gx7HEQ/a L3mSYdpTJX9zbE44nmA1tVIznYNF1QUM2xpXGcEFaZUUd5EJzGYXyPu3lnyNKhVOXE 3DyXWrfsKkRO/kZctZ+arUNTbxqi2G+nbqwzLPyF9MImVBvC93fd6BO0MnPbNQ17iN J7PDRmlHRoQdw== From: "Matthieu Baerts (NGI0)" Date: Fri, 15 Aug 2025 19:28:26 +0200 Subject: [PATCH net 8/8] selftests: mptcp: sockopt: fix C23 extension warning Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-8-521fe9957892@kernel.org> References: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-0-521fe9957892@kernel.org> In-Reply-To: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-0-521fe9957892@kernel.org> To: mptcp@lists.linux.dev, Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Jianguo Wu , Shuah Khan , Jonathan Corbet , zhenwei pi Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, "Matthieu Baerts (NGI0)" , stable@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2202; i=matttbe@kernel.org; h=from:subject:message-id; bh=PK26ncj1sRIqMENRXER6Zb/SJgspRGIPg5z97PYQV90=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDLm53k53Fm9pdLSzs7IPexQu1+hfEeN6WlZi4497y6dm vL08rzijlIWBjEuBlkxRRbptsj8mc+reEu8/Cxg5rAygQxh4OIUgIms/8Twm11tamCvUNOUL+E2 K2p62jcvXOZlfenXrm/lwiyzKp779DH8FdL34fOYrZMn0mq87G6W1js2rgx1KZ6/nxe/FNCJmbm eBwA= X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 GCC was complaining about the new label: mptcp_inq.c:79:2: warning: label followed by a declaration is a C23 exten= sion [-Wc23-extensions] 79 | int err =3D getaddrinfo(node, service, hints, res); | ^ mptcp_sockopt.c:166:2: warning: label followed by a declaration is a C23 = extension [-Wc23-extensions] 166 | int err =3D getaddrinfo(node, service, hints, res); | ^ Simply declare 'err' before the label to avoid this warning. Fixes: dd367e81b79a ("selftests: mptcp: sockopt: use IPPROTO_MPTCP for geta= ddrinfo") Cc: stable@vger.kernel.org Reviewed-by: Geliang Tang Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/mptcp_inq.c | 5 +++-- tools/testing/selftests/net/mptcp/mptcp_sockopt.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_inq.c b/tools/testing/= selftests/net/mptcp/mptcp_inq.c index 3cf1e2a612cef911028f46569563d16dd5d32129..f3bcaa48df8f22e8f4833fcc3b9= 19d21764bf7fb 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_inq.c +++ b/tools/testing/selftests/net/mptcp/mptcp_inq.c @@ -75,9 +75,10 @@ static void xgetaddrinfo(const char *node, const char *s= ervice, struct addrinfo *hints, struct addrinfo **res) { -again: - int err =3D getaddrinfo(node, service, hints, res); + int err; =20 +again: + err =3D getaddrinfo(node, service, hints, res); if (err) { const char *errstr; =20 diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index 9934a68df23708ecb413c4ab26523989e3b9f158..e934dd26a59d9b50445d61e8b80= 13ce3c8d2a8a0 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -162,9 +162,10 @@ static void xgetaddrinfo(const char *node, const char = *service, struct addrinfo *hints, struct addrinfo **res) { -again: - int err =3D getaddrinfo(node, service, hints, res); + int err; =20 +again: + err =3D getaddrinfo(node, service, hints, res); if (err) { const char *errstr; =20 --=20 2.50.0