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 7F7741F583D for ; Tue, 3 Feb 2026 12:47:43 +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=1770122863; cv=none; b=ZlcalKltsUw1PN+4uSYPh+DK2DAKOCvlcdJ/Y+k0wWNGbMTgepDH6wvIMCcMJhYE1nl1WBPnykCq/TG1SOiwttqAxKrMXD28Nu/M0X4gyE/KWPssDY8zQEIR+krhWiiVRIxX69aJYJo5+9fQpY4H6TvfuDs1nWvpPNE/dOU0jbM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770122863; c=relaxed/simple; bh=Af6ODBRCUMmmyr9m4SFu7jVJ+o2hKN6Xq5LNhaTqOP0=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=edHHxhnk2WI+QhBJZpaa8lSlEDd5aLDLn/uDUH1AevYMhUGbSKVCYS+9Noof5g70QGzIeeTHCnuuacT9bxZ5+Zf7Pqp3bRwVFMGw182yvhBDTmMFrOEzPcCAJVuAuqso/hyO8jLyRdgp73txheaYH5kHws8Di/F7mCND9wxDEm4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gyeU1gVJ; 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="gyeU1gVJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ABFCFC116D0; Tue, 3 Feb 2026 12:47:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1770122863; bh=Af6ODBRCUMmmyr9m4SFu7jVJ+o2hKN6Xq5LNhaTqOP0=; h=Subject:To:Cc:From:Date:From; b=gyeU1gVJtsieCY8jlYEdkvGwwdUqaAY/ZGvJJtr05Cdw84mUd/O7Et8rC0PgXiimr bBDwSB+24OhBfTEoU3QZ8AQZKbVU+xXOet9voJhTAjTVxc/F94jCIEKc4ueqPK7sIY 3O65IyXlS8PzxjX89eXbm3xljAYic47qXjbif5tg= Subject: FAILED: patch "[PATCH] selftests: mptcp: join: fix local endp not being tracked" failed to apply to 6.1-stable tree To: matttbe@kernel.org,kuba@kernel.org,martineau@kernel.org Cc: From: Date: Tue, 03 Feb 2026 13:47:39 +0100 Message-ID: <2026020339-impart-correct-2ff7@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x c5d5ecf21fdd9ce91e6116feb3aa83cee73352cc # git commit -s git send-email --to '' --in-reply-to '2026020339-impart-correct-2ff7@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From c5d5ecf21fdd9ce91e6116feb3aa83cee73352cc Mon Sep 17 00:00:00 2001 From: "Matthieu Baerts (NGI0)" Date: Tue, 27 Jan 2026 20:27:27 +0100 Subject: [PATCH] selftests: mptcp: join: fix local endp not being tracked 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 diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh index 3fc29201362a..e70d3420954f 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2329,17 +2329,16 @@ signal_address_tests() ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=1 speed=slow \ run_tests $ns1 $ns2 10.0.1.1 + 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 }