On 4/18/26 4:24 PM, Mike Rapoport wrote:
> From: "Mike Rapoport (Microsoft)" <[email protected]>
>
> hugepage could mean both THP and HugeTLB these days.
>
> Rename hugepage-* tests for HugeTLB to hugetlb-* to avoid confusion.
>
> Signed-off-by: Mike Rapoport (Microsoft) <[email protected]>
> Reviewed by: Donet Tom <[email protected]>
I ran
./run_vmtests.sh -t "hugetlb"
before and after applying the patch. Tests pass/skip identically, only
the test binary names changed as intended. No unintended behavioral
changes were observed.
Tested-by: Sarthak Sharma <[email protected]>
> ---
> tools/testing/selftests/mm/.gitignore | 4 ++++
> tools/testing/selftests/mm/Makefile | 8 ++++----
> tools/testing/selftests/mm/hugetlb-madvise.c | 2 +-
> .../selftests/mm/{hugepage-mmap.c => hugetlb-mmap.c} | 2 +-
> .../selftests/mm/{hugepage-mremap.c => hugetlb-mremap.c} | 2 +-
> .../selftests/mm/{hugepage-shm.c => hugetlb-shm.c} | 2 +-
> .../mm/{hugepage-vmemmap.c => hugetlb-vmemmap.c} | 0
> tools/testing/selftests/mm/run_vmtests.sh | 8 ++++----
> 8 files changed, 16 insertions(+), 12 deletions(-)
> rename tools/testing/selftests/mm/{hugepage-mmap.c => hugetlb-mmap.c} (99%)
> rename tools/testing/selftests/mm/{hugepage-mremap.c => hugetlb-mremap.c}
> (99%)
> rename tools/testing/selftests/mm/{hugepage-shm.c => hugetlb-shm.c} (99%)
> rename tools/testing/selftests/mm/{hugepage-vmemmap.c => hugetlb-vmemmap.c}
> (100%)
>
> diff --git a/tools/testing/selftests/mm/.gitignore
> b/tools/testing/selftests/mm/.gitignore
> index b0c30c5ee9e3..9ccd9e1447e6 100644
> --- a/tools/testing/selftests/mm/.gitignore
> +++ b/tools/testing/selftests/mm/.gitignore
> @@ -4,6 +4,10 @@ hugepage-mmap
> hugepage-mremap
> hugepage-shm
> hugepage-vmemmap
> +hugetlb-mmap
> +hugetlb-mremap
> +hugetlb-shm
> +hugetlb-vmemmap
> hugetlb-madvise
> hugetlb-read-hwpoison
> hugetlb-soft-offline
> diff --git a/tools/testing/selftests/mm/Makefile
> b/tools/testing/selftests/mm/Makefile
> index cbda989f6b6a..a6955660a806 100644
> --- a/tools/testing/selftests/mm/Makefile
> +++ b/tools/testing/selftests/mm/Makefile
> @@ -63,10 +63,10 @@ TEST_GEN_FILES += hmm-tests
> TEST_GEN_FILES += hugetlb-madvise
> TEST_GEN_FILES += hugetlb-read-hwpoison
> TEST_GEN_FILES += hugetlb-soft-offline
> -TEST_GEN_FILES += hugepage-mmap
> -TEST_GEN_FILES += hugepage-mremap
> -TEST_GEN_FILES += hugepage-shm
> -TEST_GEN_FILES += hugepage-vmemmap
> +TEST_GEN_FILES += hugetlb-mremap
> +TEST_GEN_FILES += hugetlb-shm
> +TEST_GEN_FILES += hugetlb-vmemmap
> +TEST_GEN_FILES += hugetlb-mmap
> TEST_GEN_FILES += khugepaged
> TEST_GEN_FILES += madv_populate
> TEST_GEN_FILES += map_fixed_noreplace
> diff --git a/tools/testing/selftests/mm/hugetlb-madvise.c
> b/tools/testing/selftests/mm/hugetlb-madvise.c
> index 5b12041fa310..898cc90b314f 100644
> --- a/tools/testing/selftests/mm/hugetlb-madvise.c
> +++ b/tools/testing/selftests/mm/hugetlb-madvise.c
> @@ -1,6 +1,6 @@
> // SPDX-License-Identifier: GPL-2.0
> /*
> - * hugepage-madvise:
> + * hugetlb-madvise:
> *
> * Basic functional testing of madvise MADV_DONTNEED and MADV_REMOVE
> * on hugetlb mappings.
> diff --git a/tools/testing/selftests/mm/hugepage-mmap.c
> b/tools/testing/selftests/mm/hugetlb-mmap.c
> similarity index 99%
> rename from tools/testing/selftests/mm/hugepage-mmap.c
> rename to tools/testing/selftests/mm/hugetlb-mmap.c
> index f4fcc7c45875..c0d58dd7cbf6 100644
> --- a/tools/testing/selftests/mm/hugepage-mmap.c
> +++ b/tools/testing/selftests/mm/hugetlb-mmap.c
> @@ -1,6 +1,6 @@
> // SPDX-License-Identifier: GPL-2.0
> /*
> - * hugepage-mmap:
> + * hugetlb-mmap:
> *
> * Example of using huge page memory in a user application using the mmap
> * system call. Before running this application, make sure that the
> diff --git a/tools/testing/selftests/mm/hugepage-mremap.c
> b/tools/testing/selftests/mm/hugetlb-mremap.c
> similarity index 99%
> rename from tools/testing/selftests/mm/hugepage-mremap.c
> rename to tools/testing/selftests/mm/hugetlb-mremap.c
> index b8f7d92e5a35..1c87c39780c5 100644
> --- a/tools/testing/selftests/mm/hugepage-mremap.c
> +++ b/tools/testing/selftests/mm/hugetlb-mremap.c
> @@ -1,6 +1,6 @@
> // SPDX-License-Identifier: GPL-2.0
> /*
> - * hugepage-mremap:
> + * hugetlb-mremap:
> *
> * Example of remapping huge page memory in a user application using the
> * mremap system call. The path to a file in a hugetlbfs filesystem must
> diff --git a/tools/testing/selftests/mm/hugepage-shm.c
> b/tools/testing/selftests/mm/hugetlb-shm.c
> similarity index 99%
> rename from tools/testing/selftests/mm/hugepage-shm.c
> rename to tools/testing/selftests/mm/hugetlb-shm.c
> index ef06260802b5..de8f5d523084 100644
> --- a/tools/testing/selftests/mm/hugepage-shm.c
> +++ b/tools/testing/selftests/mm/hugetlb-shm.c
> @@ -1,6 +1,6 @@
> // SPDX-License-Identifier: GPL-2.0
> /*
> - * hugepage-shm:
> + * hugetlb-shm:
> *
> * Example of using huge page memory in a user application using Sys V shared
> * memory system calls. In this example the app is requesting 256MB of
> diff --git a/tools/testing/selftests/mm/hugepage-vmemmap.c
> b/tools/testing/selftests/mm/hugetlb-vmemmap.c
> similarity index 100%
> rename from tools/testing/selftests/mm/hugepage-vmemmap.c
> rename to tools/testing/selftests/mm/hugetlb-vmemmap.c
> diff --git a/tools/testing/selftests/mm/run_vmtests.sh
> b/tools/testing/selftests/mm/run_vmtests.sh
> index 61b450032af8..b9e520194634 100755
> --- a/tools/testing/selftests/mm/run_vmtests.sh
> +++ b/tools/testing/selftests/mm/run_vmtests.sh
> @@ -282,18 +282,18 @@ run_test() {
>
> echo "TAP version 13" | tap_output
>
> -CATEGORY="hugetlb" run_test ./hugepage-mmap
> +CATEGORY="hugetlb" run_test ./hugetlb-mmap
>
> shmmax=$(cat /proc/sys/kernel/shmmax)
> shmall=$(cat /proc/sys/kernel/shmall)
> echo 268435456 > /proc/sys/kernel/shmmax
> echo 4194304 > /proc/sys/kernel/shmall
> -CATEGORY="hugetlb" run_test ./hugepage-shm
> +CATEGORY="hugetlb" run_test ./hugetlb-shm
> echo "$shmmax" > /proc/sys/kernel/shmmax
> echo "$shmall" > /proc/sys/kernel/shmall
>
> -CATEGORY="hugetlb" run_test ./hugepage-mremap
> -CATEGORY="hugetlb" run_test ./hugepage-vmemmap
> +CATEGORY="hugetlb" run_test ./hugetlb-mremap
> +CATEGORY="hugetlb" run_test ./hugetlb-vmemmap
> CATEGORY="hugetlb" run_test ./hugetlb-madvise
> CATEGORY="hugetlb" run_test ./hugetlb_dio
>
