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 6C203339874; Tue, 17 Feb 2026 12:28:42 +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=1771331322; cv=none; b=iEPkxC9Df+yteMcx5k2bLeJL+qcsykoAA79cPuKPC9IV1w/a9EJ9f2+rWOvnWVf3amZ/N7YnlT8leMEJxdrQwkE/WCKbdWZrs0p/po+5z4vsN2GTZ7d/jtFg0IydvbBn5XSsMepx3c5r9dRZLP5FmwTPUisBYiJQdIqc1u12Vok= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771331322; c=relaxed/simple; bh=5Kx2JNTls6uJk+LKV69hGqdblD9QjM+Oju9KhiRbpiM=; h=Subject:To:Cc:From:Date:In-Reply-To:Message-ID:MIME-Version: Content-Type; b=LKSaJCsHlFH8QI7kBzcBDc4b3gVGRssO5UkxSkJWeMuBi+2a7OECEETi7eo/xwFErsYRkrj3sOn234+6MDfCIe624okkTHSLfz8fkwuNWpdUhf5BszuaXruSEPuKfacpcpJ6XpdJTgS8ZQZnOCgt9fkS75UtDnNCs0Xyl7+ly5E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=niyPjtZ1; 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="niyPjtZ1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D7F3C4CEF7; Tue, 17 Feb 2026 12:28:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1771331322; bh=5Kx2JNTls6uJk+LKV69hGqdblD9QjM+Oju9KhiRbpiM=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=niyPjtZ1Onf3XkYO8ZG5LQNcdqobE+M685FfafeOBxD1LUC+WWQ0iyg2dNseGko+x E2rx1tLYIFpsLOqUxe3XhuTh+5txKK/4sJpfpNnlA/3YHbeOZqqd2oKYt+lbMb+9gc Z39u2zPpHvyetawX/42c7HTECseMSg/JPiFJdbtU= Subject: Patch "selftests: mptcp: join: fix local endp not being tracked" has been added to the 6.1-stable tree To: gregkh@linuxfoundation.org,kuba@kernel.org,martineau@kernel.org,matttbe@kernel.org,mptcp@lists.linux.dev,sashal@kernel.org Cc: From: Date: Tue, 17 Feb 2026 13:28:22 +0100 In-Reply-To: <20260211190617.77192-14-matttbe@kernel.org> Message-ID: <2026021722-poser-habitable-6fd8@gregkh> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit X-stable: commit X-Patchwork-Hint: ignore This is a note to let you know that I've just added the patch titled selftests: mptcp: join: fix local endp not being tracked to the 6.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: selftests-mptcp-join-fix-local-endp-not-being-tracked.patch and it can be found in the queue-6.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From matttbe@kernel.org Wed Feb 11 20:07:06 2026 From: "Matthieu Baerts (NGI0)" Date: Wed, 11 Feb 2026 20:06:24 +0100 Subject: selftests: mptcp: join: fix local endp not being tracked To: mptcp@lists.linux.dev, stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: "Matthieu Baerts (NGI0)" , sashal@kernel.org, Mat Martineau , Jakub Kicinski Message-ID: <20260211190617.77192-14-matttbe@kernel.org> From: "Matthieu Baerts (NGI0)" commit c5d5ecf21fdd9ce91e6116feb3aa83cee73352cc upstream. When running this mptcp_join.sh selftest on older kernel versions not supporting local endpoints tracking, this test fails because 3 MP_JOIN ACKs have been received, while only 2 were expected. It is not clear why only 2 MP_JOIN ACKs were expected on old kernel versions, while 3 MP_JOIN SYN and SYN+ACK were expected. When testing on the v5.15.197 kernel, 3 MP_JOIN ACKs are seen, which is also what is expected in the selftests included in this kernel version, see commit f4480eaad489 ("selftests: mptcp: add missing join check"). Switch the expected MP_JOIN ACKs to 3. While at it, move this chk_join_nr helper out of the special condition for older kernel versions as it is now the same as with more recent ones. Also, invert the condition to be more logical: what's expected on newer kernel versions having such helper first. Fixes: d4c81bbb8600 ("selftests: mptcp: join: support local endpoint being tracked or not") Cc: stable@vger.kernel.org Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260127-net-mptcp-dup-nl-events-v1-5-7f71e1bc4feb@kernel.org Signed-off-by: Jakub Kicinski [ Conflicts in mptcp_join.sh, because commit e571fb09c893 ("selftests: mptcp: add speed env var") is not in this version, and caused conflicts in the context. The same modification can still be applied at the same place. ] Signed-off-by: Matthieu Baerts (NGI0) Signed-off-by: Greg Kroah-Hartman --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2181,17 +2181,16 @@ signal_address_tests() # the peer could possibly miss some addr notification, allow retransmission ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=1 run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow + chk_join_nr 3 3 3 # It is not directly linked to the commit introducing this # symbol but for the parent one which is linked anyway. - if ! mptcp_lib_kallsyms_has "mptcp_pm_subflow_check_next$"; then - chk_join_nr 3 3 2 - chk_add_nr 4 4 - else - chk_join_nr 3 3 3 + if mptcp_lib_kallsyms_has "mptcp_pm_subflow_check_next$"; then # the server will not signal the address terminating # the MPC subflow chk_add_nr 3 3 + else + chk_add_nr 4 4 fi fi } Patches currently in stable-queue which might be from matttbe@kernel.org are queue-6.1/selftests-mptcp-join-fix-local-endp-not-being-tracked.patch queue-6.1/mptcp-schedule-rtx-timer-only-after-pushing-data.patch queue-6.1/mptcp-ensure-context-reset-on-disconnect.patch queue-6.1/selftests-mptcp-pm-ensure-unknown-flags-are-ignored.patch queue-6.1/selftests-mptcp-check-no-dup-close-events-after-error.patch queue-6.1/selftests-mptcp-check-subflow-errors-in-close-events.patch