From nobody Wed Dec 4 19:19:17 2024 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 C5CD416D4DF; Sun, 8 Sep 2024 14:03:32 +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=1725804213; cv=none; b=BUgYxqJqO3Ez5lgPTpOtQM8Y9o4NPX83KaD0ETTY4TPafAIZjoK1+B4+gg57gXCWLu3PyoqqxiTcnJo1o25m5AeiWEPCxM0aRnzxXi9k1kRpVqO9SJFqkKQ8xEjpUxHMP9D8n99de2rKccfbl1OV5Cu3PPmN+l7+NOzV1y+6bno= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725804213; c=relaxed/simple; bh=/uUQAk24fGQZGBhdQf6UwUYpBybmOPSXMAnl7ECd5WA=; h=Subject:To:Cc:From:Date:In-Reply-To:Message-ID:MIME-Version: Content-Type; b=eREKpyoLZZS5peBzFH5Rb987TrMGAEJHzwN1RGCVgYy3rD++qdhK4FMM/Hpoioq9kQwCQt5iwR8xMcpObo2H7CwYtpG9xzt4dsGBBhZMya+/l/+qhycdBWrrfZgp/4XJqP0H8B7pO8goXZYOu4sYuTk+YiGFr2mC07r97skXiW8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gkFVKt1U; 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="gkFVKt1U" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37B70C4CEC3; Sun, 8 Sep 2024 14:03:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725804212; bh=/uUQAk24fGQZGBhdQf6UwUYpBybmOPSXMAnl7ECd5WA=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=gkFVKt1Uo7dlcuEaGsZhDIY7c3qRrP/7ZfYsxR4Lwjf6DkeK5Q6bfW3DnmQFZeOi+ aVziYC0hg9r5xxhlHZ4SwZ4kROMatjpKRrky+lcBZvd7V9B39sS3Fq2GhOeGBLwi1G hCTrJQs70fW8E0z8RlsVSsslJMKMjC2qUCfocQ3c= Subject: Patch "selftests: mptcp: join: check re-re-adding ID 0 signal" has been added to the 6.1-stable tree To: gregkh@linuxfoundation.org,martineau@kernel.org,matttbe@kernel.org,mptcp@lists.linux.dev,pabeni@redhat.com Cc: From: Date: Sun, 08 Sep 2024 16:03:21 +0200 In-Reply-To: <20240905144306.1192409-8-matttbe@kernel.org> Message-ID: <2024090821-create-thickness-ab8d@gregkh> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-stable: commit X-Patchwork-Hint: ignore Content-Type: text/plain; charset="utf-8" This is a note to let you know that I've just added the patch titled selftests: mptcp: join: check re-re-adding ID 0 signal to the 6.1-stable tree which can be found at: http://www.kernel.org/git/?p=3Dlinux/kernel/git/stable/stable-queue.git= ;a=3Dsummary The filename of the patch is: selftests-mptcp-join-check-re-re-adding-id-0-signal.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 stable+bounces-73613-greg=3Dkroah.com@vger.kernel.org Thu Sep 5 16:44= :31 2024 From: "Matthieu Baerts (NGI0)" Date: Thu, 5 Sep 2024 16:43:10 +0200 Subject: selftests: mptcp: join: check re-re-adding ID 0 signal To: mptcp@lists.linux.dev, stable@vger.kernel.org, gregkh@linuxfoundation.o= rg Cc: "Matthieu Baerts (NGI0)" , Mat Martineau , Paolo Abeni Message-ID: <20240905144306.1192409-8-matttbe@kernel.org> From: "Matthieu Baerts (NGI0)" commit f18fa2abf81099d822d842a107f8c9889c86043c upstream. This test extends "delete re-add signal" to validate the previous commit: when the 'signal' endpoint linked to the initial subflow (ID 0) is re-added multiple times, it will re-send the ADD_ADDR with id 0. The client should still be able to re-create this subflow, even if the add_addr_accepted limit has been reached as this special address is not considered as a new address. 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: d0876b2284cf ("mptcp: add the incoming RM_ADDR support") Cc: stable@vger.kernel.org Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) Signed-off-by: Paolo Abeni [ Conflicts in mptcp_join.sh, because the helpers are different in this version: - run_tests has been modified a few times to reduce the number of positional parameters - no chk_mptcp_info helper - chk_subflow_nr taking an extra parameter - kill_tests_wait instead of mptcp_lib_kill_wait ] Signed-off-by: Matthieu Baerts (NGI0) Signed-off-by: Greg Kroah-Hartman --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 32 +++++++++++++++----= ----- 1 file changed, 20 insertions(+), 12 deletions(-) --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3387,7 +3387,7 @@ endpoint_tests() # broadcast IP: no packet for this address will be received on ns1 pm_nl_add_endpoint $ns1 224.0.0.1 id 2 flags signal pm_nl_add_endpoint $ns1 10.0.1.1 id 42 flags signal - run_tests $ns1 $ns2 10.0.1.1 4 0 0 speed_20 2>/dev/null & + run_tests $ns1 $ns2 10.0.1.1 4 0 0 speed_5 2>/dev/null & local tests_pid=3D$! =20 wait_mpj $ns2 @@ -3409,7 +3409,15 @@ endpoint_tests() =20 pm_nl_add_endpoint $ns1 10.0.1.1 id 99 flags signal wait_mpj $ns2 - chk_subflow_nr "" "after re-add" 3 + chk_subflow_nr "" "after re-add ID 0" 3 + + pm_nl_del_endpoint $ns1 99 10.0.1.1 + sleep 0.5 + chk_subflow_nr "" "after re-delete ID 0" 2 + + pm_nl_add_endpoint $ns1 10.0.1.1 id 88 flags signal + wait_mpj $ns2 + chk_subflow_nr "" "after re-re-add ID 0" 3 =20 kill_wait "${tests_pid}" kill_events_pids @@ -3419,19 +3427,19 @@ endpoint_tests() chk_evt_nr ns1 MPTCP_LIB_EVENT_ESTABLISHED 1 chk_evt_nr ns1 MPTCP_LIB_EVENT_ANNOUNCED 0 chk_evt_nr ns1 MPTCP_LIB_EVENT_REMOVED 0 - chk_evt_nr ns1 MPTCP_LIB_EVENT_SUB_ESTABLISHED 4 - chk_evt_nr ns1 MPTCP_LIB_EVENT_SUB_CLOSED 2 + chk_evt_nr ns1 MPTCP_LIB_EVENT_SUB_ESTABLISHED 5 + chk_evt_nr ns1 MPTCP_LIB_EVENT_SUB_CLOSED 3 =20 chk_evt_nr ns2 MPTCP_LIB_EVENT_CREATED 1 chk_evt_nr ns2 MPTCP_LIB_EVENT_ESTABLISHED 1 - chk_evt_nr ns2 MPTCP_LIB_EVENT_ANNOUNCED 5 - chk_evt_nr ns2 MPTCP_LIB_EVENT_REMOVED 3 - chk_evt_nr ns2 MPTCP_LIB_EVENT_SUB_ESTABLISHED 4 - chk_evt_nr ns2 MPTCP_LIB_EVENT_SUB_CLOSED 2 - - chk_join_nr 4 4 4 - chk_add_nr 5 5 - chk_rm_nr 3 2 invert + chk_evt_nr ns2 MPTCP_LIB_EVENT_ANNOUNCED 6 + chk_evt_nr ns2 MPTCP_LIB_EVENT_REMOVED 4 + chk_evt_nr ns2 MPTCP_LIB_EVENT_SUB_ESTABLISHED 5 + chk_evt_nr ns2 MPTCP_LIB_EVENT_SUB_CLOSED 3 + + chk_join_nr 5 5 5 + chk_add_nr 6 6 + chk_rm_nr 4 3 invert fi =20 # flush and re-add Patches currently in stable-queue which might be from matttbe@kernel.org are queue-6.1/selftests-mptcp-join-validate-event-numbers.patch queue-6.1/selftests-mptcp-join-check-re-re-adding-id-0-signal.patch queue-6.1/selftests-mptcp-fix-backport-issues.patch