From nobody Fri Nov 22 07:46:11 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 25BE71DB92F; Wed, 4 Sep 2024 13:38:15 +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=1725457095; cv=none; b=jI5JDZLe0OeCgJHutGMlTQv2YLHU0s0uGOfcPvh3Odf4Oba8wX4LQXk+mCpkPumQljC9SyO3IyIEi898udEpnxZwcvkPxwYMu+SHU+xmO5iwAD7AwgYb6GuRdx3LtEP71Dfv6yuFWEXtnoL+jRxn67NnMcRIZkY4iDAyvycIQyI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725457095; c=relaxed/simple; bh=OH71BZDujm8DL2ax1TpHk8KVwxCwBWAV8nDBrlPLPkk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PsNmNU5hcywNe/EOlf8Z5Ytqa5bqubJhjUCauWLANEETCA4Qec27SH2VLqrd18pI18G+iMNm9/P6gxPqdb41zOfimdbNsDp/8cz5EeFnfehkdKFX6fKB/HqBKLq4ns1uifNeCpEJ6RJWCM8zVlA9ah7bR8vw53Jn8q/OsXn3C5E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=S/vGYJ97; 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="S/vGYJ97" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B3990C4CEC6; Wed, 4 Sep 2024 13:38:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725457095; bh=OH71BZDujm8DL2ax1TpHk8KVwxCwBWAV8nDBrlPLPkk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S/vGYJ97VdjiesVmpcGArcUBD5bn4K28rwtBfId7cqnu5h0i1v1RpNMdq2XvULh4v oU2EtK4EAgaR4FTOpN3VLkic3ukNqWKwfWFVm1aXuIQqpkswzmeM13h3XXnh63xmzE Luj9Ui2/wYjRWQSSatQsmtjnQBWVJUsg4llI8zdJ37Ys35k9r55G9fR0eWpoMwZjTu /0l4Ni1S0aF7EaZY6QFQ2uAck53n8g93ykKogPgw5ezMp1deVo1L0VaQl6hqqCmAUX iTDXCsmrFmTjbYl92RTognhf4YgYIbCxwmuZWfNFQbdVAwiQEzD0x+3/34D2ClgKsP JGEJjaAM8UQEw== From: "Matthieu Baerts (NGI0)" To: mptcp@lists.linux.dev, stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: "Matthieu Baerts (NGI0)" , sashal@kernel.org Subject: [PATCH 6.6.y 1/2] selftests: mptcp: join: disable get and dump addr checks Date: Wed, 4 Sep 2024 15:37:57 +0200 Message-ID: <20240904133755.67974-5-matttbe@kernel.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240904133755.67974-4-matttbe@kernel.org> References: <20240904133755.67974-4-matttbe@kernel.org> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2009; i=matttbe@kernel.org; h=from:subject; bh=OH71BZDujm8DL2ax1TpHk8KVwxCwBWAV8nDBrlPLPkk=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBm2GK0jRU9RpxUMHG5nJSQzK7ejzEmuWBbbENIc PawL9FQpiOJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZthitAAKCRD2t4JPQmmg cwiiEACZGMGzAUrm73Uc00EomvCmLdnQFtI4PfYpxxoSEF8uOsn154osh/c3kFt8hTnmX98RrjZ mMLOzpa/WoJGmKwZ197i9XKwiwO+zM0IyWwlFaAfiTj/NNxZxfwMnmAB5NAjjD94R6GofnbI6xI iauXf4+fYi0YI2ESsCXlERPvA/MV4YrRBsTSFiTyichSP2N7HoSgFCrYOUzDKK6pUjYpZKYI/vG TvewVIxzTjKUars4q+Nt8i0DfL/tRNbxb9uuDK2OVMo9cZ4bHPxQ9al8dVIGxeq7vccMzwdabTI uKvRsx4v0L4u7ud3drerzWrVprdBX1LkEn4gvAsnG+bZOGHfNt4akBInUnmJIQGXzkNbkCE5B5Q NXGxH+gy6zfK1eQqKxgEcVGd5LfKA8P3xYMfkF9aJE+kmaWMHyosPIyCpi7nz+SP5q8G0ccS007 OGNzpZwobXvks035it8wL7Yyq1uGNnK3INwnm2GDqlQEOHy9AB7Xo5C61FUh00OA0Tl4BQassx4 AajqEO1Pfn7XEYpvb83YHLTUc2m9D5IEqrwyWhVWyoqpqjiMDOjBg9QEvB25HfEZ2QKGTSYqmZa z6QpE2YkqljokBO38ZKtx4sQQZmjBoTFtCjv/OBG4lox8DeT2e+HzU72tdiKYvhRiRZ/zDOsIqU 9Vtjf7i2x1UVAQw== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" These new checks have been recently queued to v6.6 [1] with the backport of commit 38f027fca1b7 ("selftests: mptcp: dump userspace addrs list"), and commit 4cc5cc7ca052 ("selftests: mptcp: userspace pm get addr tests"). On v6.6, these checks will simply print 'skip', because the associated features are not available in this version. That's fine, except that the MPTCP CI sets the SELFTESTS_MPTCP_LIB_EXPECT_ALL_FEATURES=3D1 env var, which will force these subtests to fail when using the selftests from v6.6 on a v6.6 kernel, because the feature is not available. To ease the backports (and possible future ones), I suggest to keep the recent backports, but skip calling mptcp_lib_kallsyms_has() not to have the CIs setting this env var complaining about the associated features not being available. Link: https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.g= it/commit/?id=3Dbd2122541bd8 [1] Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 0ff60b3744c0..14c80f980396 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3469,7 +3469,7 @@ userspace_pm_chk_dump_addr() =20 print_check "dump addrs ${check}" =20 - if mptcp_lib_kallsyms_has "mptcp_userspace_pm_dump_addr$"; then + if false && mptcp_lib_kallsyms_has "mptcp_userspace_pm_dump_addr$"; then check_output "userspace_pm_dump ${ns}" "${exp}" else print_skip @@ -3484,7 +3484,7 @@ userspace_pm_chk_get_addr() =20 print_check "get id ${id} addr" =20 - if mptcp_lib_kallsyms_has "mptcp_userspace_pm_get_addr$"; then + if false && mptcp_lib_kallsyms_has "mptcp_userspace_pm_get_addr$"; then check_output "userspace_pm_get_addr ${ns} ${id}" "${exp}" else print_skip --=20 2.45.2 From nobody Fri Nov 22 07:46:11 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 3F6431DA115; Wed, 4 Sep 2024 13:38:16 +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=1725457097; cv=none; b=Bo7JYfQ3vDbJfhf5vsKLlbqScPl4Y1Wl+nutqN0EcvIcCScb+fB56CVW1ShCvYn6jnKHvu7gno33RsTNH02j6ds4KI0cJBDTj7ocu2HPS6rCnUBddE6cxbXuYEDfGdeZ44IIFWe5VM/yKr5rHS2vvzZ/feIznKF5Xivwo64dxvQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725457097; c=relaxed/simple; bh=5i3YS1VlQeBlgEef2/qpbyEC6KCMl93C2rgBvUGpsVA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XG0C2seG3YWKLcbjHSsfQjb6XfLHBMzb+qJntIG+xofMB/JZNP8BPsDsRZ6fWsag+sq5ZLZ4DwNNhFPX1lKzFbN2GRSczBl+plOdx952J2i0EFatocbDd3BsKd/TSaspm4TGW+Qt3NbpU6YTaidWmcZIXaVmVBjO/HZGMtn+ecQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Hj6mYE2l; 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="Hj6mYE2l" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75F63C4CEC2; Wed, 4 Sep 2024 13:38:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725457096; bh=5i3YS1VlQeBlgEef2/qpbyEC6KCMl93C2rgBvUGpsVA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hj6mYE2lrHxGphhCjK80KcjLsZyU0MlFFpjeNfG7VB+rKO6Jg0kdkYWm40bGWZZX4 NNWCGm0ohxToTS0ZL7ZVaHRXHI/VCr++74zUsYGOlGeTZ4BX1gwtbEjV9ETbfBBB1T xqVhIk+80l+tlrVTNemyspko4Uv5UvVCnvSIOJAGx1pOlmOSskHTsJTWnZVMszZMWa S4zESB36hVqbYpL0n/ur2WKHNmSfaLLkWT48Xx2HufVErVRHYjQNY7zhMudciycLTR 2UsNIze+0VIL435VLhEBIJzEgAZCxv5TrEmec1jbiGFGA9VUUN6A4FBnBpbruLtOat xvS93C3OUcvTg== From: "Matthieu Baerts (NGI0)" To: mptcp@lists.linux.dev, stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: "Matthieu Baerts (NGI0)" , sashal@kernel.org Subject: [PATCH 6.6.y 2/2] selftests: mptcp: join: stop transfer when check is done (part 2.2) Date: Wed, 4 Sep 2024 15:37:58 +0200 Message-ID: <20240904133755.67974-6-matttbe@kernel.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240904133755.67974-4-matttbe@kernel.org> References: <20240904133755.67974-4-matttbe@kernel.org> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1330; i=matttbe@kernel.org; h=from:subject; bh=5i3YS1VlQeBlgEef2/qpbyEC6KCMl93C2rgBvUGpsVA=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBm2GK0QzhdcUzI6tR20UTnwKwFvcXBAv9aqIhPC a9yXXR3vpSJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZthitAAKCRD2t4JPQmmg czzkEADWyjKEllhCPwrsC0BSXUTQogNEJAi8fzQPnawXcKNIvA43xuA0nCgNTvLtX1kdc94NKPN 5icTl0iUCvfjDJbK6VSBfbGxu8bXgC0Mwbpc4Hu7iI9XcU6XRAWXwbf6rEwpSvaOoCDSbrM17hK atsgUyMyAaPwR4jwneh9LHkW/fuiJmM945olZpSGWjABqeQ4Q2eexggQyzrANvKWyXWOyfhQ0Aj PRBcTbYZKi1CgfLNt4uRo5D/vtKieCKLACbrABlfMf3i8yzFT5O/dhLF8TnPkUBPS7Z616W/l5X AjyzhkxyoHXI7bjhglzORYCjsMT0INoFn1XBkpclAL6vC114oC7u8hcARGvtMa4+ky1ouHFJ/WN 4/FhDOQhiJg+AUMpIAlRSvzt4mBfB6n4EguhIGYtAgFgHr+5u0JqhB4hdHoUhXa2JAvMzq9JgyM 88je06RjsuA/q8TOqfeszTx/r+ZxECEasDlV2O47c6T8o+86TccHB9OXEDDgCAjDDU5Dah7+7X5 8deUVWum+Kn9PgnSZx5CQF3PTqDZnu/N0VJddshGteeshwytLMMPyC0Kzb1H1HyTVjYSB0stxkm 0v8D6Ovt0RUhLQTD70e+gaj9zt0dw1WuyPNZWUfFb085gIJPqbpfZwLorTQedjkp+bN7EB8rKzs deSjl1ojNPtgEcw== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use mptcp_lib_kill_wait in "userspace pm create id 0 subflow" subtest. This new test has recently been queued to v6.6 [1] with the backport of commit b2e2248f365a ("selftests: mptcp: userspace pm create id 0 subflow"). The modification here was part of commit 04b57c9e096a ("selftests: mptcp: join: stop transfer when check is done (part 2)") that has been backported to v6.6 a few months ago -- see commit 358f02b84fbb ("selftests: mptcp: join: stop transfer when check is done (part 2)") -- but it was not modifying this subtest as it was not present in v6.6. Link: https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.g= it/commit/?id=3Dbd2122541bd8 [1] Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 14c80f980396..2fd83f2a93e3 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3645,7 +3645,7 @@ userspace_tests() chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 2 2 kill_events_pids - wait $tests_pid + mptcp_lib_kill_wait $tests_pid fi } =20 --=20 2.45.2