| Message ID | 20240809075642.403247-1-usama.anjum@collabora.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | selftests: memfd_secret: don't build memfd_secret test on unsupported arches | expand |
On Fri, Aug 09, 2024 at 12:56:42PM +0500, Muhammad Usama Anjum wrote: > [1] mentions that memfd_secret is only supported on arm64, riscv, x86 > and x86_64 for now. It doesn't support other architectures. I found the > build error on arm and decided to send the fix as it was creating noise > on KernelCI. Hence I'm adding condition that memfd_secret should only be > compiled on supported architectures. > > Also check in run_vmtests script if memfd_secret binary is present > before executing it. > > [1] https://lore.kernel.org/all/20210518072034.31572-7-rppt@kernel.org/ > Cc: stable@vger.kernel.org > Fixes: 76fe17ef588a ("secretmem: test: add basic selftest for memfd_secret(2)") > Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com> Acked-by: Mike Rapoport (Microsoft) <rppt@kernel.org> > --- > tools/testing/selftests/mm/Makefile | 2 ++ > tools/testing/selftests/mm/run_vmtests.sh | 3 +++ > 2 files changed, 5 insertions(+) > > diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile > index 1a83b70e84535..4ea188be0588a 100644 > --- a/tools/testing/selftests/mm/Makefile > +++ b/tools/testing/selftests/mm/Makefile > @@ -53,7 +53,9 @@ TEST_GEN_FILES += madv_populate > TEST_GEN_FILES += map_fixed_noreplace > TEST_GEN_FILES += map_hugetlb > TEST_GEN_FILES += map_populate > +ifneq (,$(filter $(ARCH),arm64 riscv riscv64 x86 x86_64)) > TEST_GEN_FILES += memfd_secret > +endif > TEST_GEN_FILES += migration > TEST_GEN_FILES += mkdirty > TEST_GEN_FILES += mlock-random-test > diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh > index 03ac4f2e1cce6..36045edb10dea 100755 > --- a/tools/testing/selftests/mm/run_vmtests.sh > +++ b/tools/testing/selftests/mm/run_vmtests.sh > @@ -374,8 +374,11 @@ CATEGORY="hmm" run_test bash ./test_hmm.sh smoke > # MADV_POPULATE_READ and MADV_POPULATE_WRITE tests > CATEGORY="madv_populate" run_test ./madv_populate > > +if [ -x ./memfd_secret ] > +then > (echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope 2>&1) | tap_prefix > CATEGORY="memfd_secret" run_test ./memfd_secret > +fi > > # KSM KSM_MERGE_TIME_HUGE_PAGES test with size of 100 > CATEGORY="ksm" run_test ./ksm_tests -H -s 100 > -- > 2.39.2 >
diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile index 1a83b70e84535..4ea188be0588a 100644 --- a/tools/testing/selftests/mm/Makefile +++ b/tools/testing/selftests/mm/Makefile @@ -53,7 +53,9 @@ TEST_GEN_FILES += madv_populate TEST_GEN_FILES += map_fixed_noreplace TEST_GEN_FILES += map_hugetlb TEST_GEN_FILES += map_populate +ifneq (,$(filter $(ARCH),arm64 riscv riscv64 x86 x86_64)) TEST_GEN_FILES += memfd_secret +endif TEST_GEN_FILES += migration TEST_GEN_FILES += mkdirty TEST_GEN_FILES += mlock-random-test diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh index 03ac4f2e1cce6..36045edb10dea 100755 --- a/tools/testing/selftests/mm/run_vmtests.sh +++ b/tools/testing/selftests/mm/run_vmtests.sh @@ -374,8 +374,11 @@ CATEGORY="hmm" run_test bash ./test_hmm.sh smoke # MADV_POPULATE_READ and MADV_POPULATE_WRITE tests CATEGORY="madv_populate" run_test ./madv_populate +if [ -x ./memfd_secret ] +then (echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope 2>&1) | tap_prefix CATEGORY="memfd_secret" run_test ./memfd_secret +fi # KSM KSM_MERGE_TIME_HUGE_PAGES test with size of 100 CATEGORY="ksm" run_test ./ksm_tests -H -s 100
[1] mentions that memfd_secret is only supported on arm64, riscv, x86 and x86_64 for now. It doesn't support other architectures. I found the build error on arm and decided to send the fix as it was creating noise on KernelCI. Hence I'm adding condition that memfd_secret should only be compiled on supported architectures. Also check in run_vmtests script if memfd_secret binary is present before executing it. [1] https://lore.kernel.org/all/20210518072034.31572-7-rppt@kernel.org/ Cc: stable@vger.kernel.org Fixes: 76fe17ef588a ("secretmem: test: add basic selftest for memfd_secret(2)") Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com> --- tools/testing/selftests/mm/Makefile | 2 ++ tools/testing/selftests/mm/run_vmtests.sh | 3 +++ 2 files changed, 5 insertions(+)