System mapping sealing is an mm feature, but its test has its own directory under tools/testing/selftests rather than living with the other mm tests.
Let's move it into tools/testing/selftests/mm and run it with the mmap tests. Its config now comes from mm's config fragment. The test itself is unchanged. Suggested-by: Lorenzo Stoakes <[email protected]> Signed-off-by: Chris Down <[email protected]> --- tools/testing/selftests/Makefile | 1 - tools/testing/selftests/mm/Makefile | 1 + tools/testing/selftests/mm/config | 1 + tools/testing/selftests/mm/run_vmtests.sh | 1 + .../{mseal_system_mappings => mm}/sysmap_is_sealed.c | 0 tools/testing/selftests/mseal_system_mappings/.gitignore | 2 -- tools/testing/selftests/mseal_system_mappings/Makefile | 6 ------ tools/testing/selftests/mseal_system_mappings/config | 1 - 8 files changed, 3 insertions(+), 10 deletions(-) rename tools/testing/selftests/{mseal_system_mappings => mm}/sysmap_is_sealed.c (100%) delete mode 100644 tools/testing/selftests/mseal_system_mappings/.gitignore delete mode 100644 tools/testing/selftests/mseal_system_mappings/Makefile delete mode 100644 tools/testing/selftests/mseal_system_mappings/config diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index 07c3719f8b04..94276b1310de 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -84,7 +84,6 @@ TARGETS += mount TARGETS += mount_setattr TARGETS += move_mount_set_group TARGETS += mqueue -TARGETS += mseal_system_mappings TARGETS += nci TARGETS += net TARGETS += net/af_unix diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile index 675ec57d47de..94e305643c8d 100644 --- a/tools/testing/selftests/mm/Makefile +++ b/tools/testing/selftests/mm/Makefile @@ -110,6 +110,7 @@ TEST_GEN_FILES += folio_order_check TEST_GEN_FILES += khugepaged_sync_check TEST_GEN_FILES += khugepaged_race TEST_GEN_FILES += soft-dirty +TEST_GEN_FILES += sysmap_is_sealed ifeq ($(ARCH),x86_64) CAN_BUILD_I386 := $(shell ./../x86/check_cc.sh "$(CC)" ../x86/trivial_32bit_program.c -m32) diff --git a/tools/testing/selftests/mm/config b/tools/testing/selftests/mm/config index 06f78bd232e2..b93b49cd675f 100644 --- a/tools/testing/selftests/mm/config +++ b/tools/testing/selftests/mm/config @@ -14,3 +14,4 @@ CONFIG_UPROBES=y CONFIG_MEMORY_FAILURE=y CONFIG_HWPOISON_INJECT=m CONFIG_PROC_MEM_ALWAYS_FORCE=y +CONFIG_MSEAL_SYSTEM_MAPPINGS=y diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh index 973cb715b326..573da5006268 100755 --- a/tools/testing/selftests/mm/run_vmtests.sh +++ b/tools/testing/selftests/mm/run_vmtests.sh @@ -307,6 +307,7 @@ fi CATEGORY="mmap" run_test ./map_populate CATEGORY="mmap" run_test ./droppable +CATEGORY="mmap" run_test ./sysmap_is_sealed CATEGORY="mlock" run_test ./mlock-random-test diff --git a/tools/testing/selftests/mseal_system_mappings/sysmap_is_sealed.c b/tools/testing/selftests/mm/sysmap_is_sealed.c similarity index 100% rename from tools/testing/selftests/mseal_system_mappings/sysmap_is_sealed.c rename to tools/testing/selftests/mm/sysmap_is_sealed.c diff --git a/tools/testing/selftests/mseal_system_mappings/.gitignore b/tools/testing/selftests/mseal_system_mappings/.gitignore deleted file mode 100644 index 319c497a595e..000000000000 --- a/tools/testing/selftests/mseal_system_mappings/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -sysmap_is_sealed diff --git a/tools/testing/selftests/mseal_system_mappings/Makefile b/tools/testing/selftests/mseal_system_mappings/Makefile deleted file mode 100644 index 2b4504e2f52f..000000000000 --- a/tools/testing/selftests/mseal_system_mappings/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -CFLAGS += -std=c99 -pthread -Wall $(KHDR_INCLUDES) - -TEST_GEN_PROGS := sysmap_is_sealed - -include ../lib.mk diff --git a/tools/testing/selftests/mseal_system_mappings/config b/tools/testing/selftests/mseal_system_mappings/config deleted file mode 100644 index 675cb9f37b86..000000000000 --- a/tools/testing/selftests/mseal_system_mappings/config +++ /dev/null @@ -1 +0,0 @@ -CONFIG_MSEAL_SYSTEM_MAPPINGS=y -- 2.54.0
