[PATCH 6.6.y 0/2] Fixes for recent backports

[PATCH 6.6.y 0/2] Fixes for recent backports

[Matthieu Baerts (NGI0)]

A few commits have been recently queued to v6.6 and needs to be adapted
for this kernel version:

  - 38f027fca1b7 ("selftests: mptcp: dump userspace addrs list")
  - 4cc5cc7ca052 ("selftests: mptcp: userspace pm get addr tests")
  - b2e2248f365a ("selftests: mptcp: userspace pm create id 0 subflow")

Matthieu Baerts (NGI0) (2):
  selftests: mptcp: join: disable get and dump addr checks
  selftests: mptcp: join: stop transfer when check is done (part 2.2)

 tools/testing/selftests/net/mptcp/mptcp_join.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-- 
2.45.2

[PATCH 6.6.y 1/2] selftests: mptcp: join: disable get and dump addr checks

[Matthieu Baerts (NGI0)]

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=1 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.git/commit/?id=bd2122541bd8 [1]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
 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/testing/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()
 
 	print_check "dump addrs ${check}"
 
-	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()
 
 	print_check "get id ${id} addr"
 
-	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
-- 
2.45.2

[PATCH 6.6.y 2/2] selftests: mptcp: join: stop transfer when check is done (part 2.2)

[Matthieu Baerts (NGI0)]

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.git/commit/?id=bd2122541bd8 [1]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
 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/testing/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
 }
 
-- 
2.45.2

Re: [PATCH 6.6.y 0/2] Fixes for recent backports

[Greg KH]

On Wed, Sep 04, 2024 at 03:37:56PM +0200, Matthieu Baerts (NGI0) wrote:
> A few commits have been recently queued to v6.6 and needs to be adapted
> for this kernel version:
> 
>   - 38f027fca1b7 ("selftests: mptcp: dump userspace addrs list")
>   - 4cc5cc7ca052 ("selftests: mptcp: userspace pm get addr tests")
>   - b2e2248f365a ("selftests: mptcp: userspace pm create id 0 subflow")
> 
> Matthieu Baerts (NGI0) (2):
>   selftests: mptcp: join: disable get and dump addr checks
>   selftests: mptcp: join: stop transfer when check is done (part 2.2)
> 
>  tools/testing/selftests/net/mptcp/mptcp_join.sh | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> -- 
> 2.45.2
> 
> 

Now queued up, thanks.

greg k-h