Skip to contentSkip to conversation

selftests-mm-rename-hugepage-tests-to-hugetlb.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jun 21

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: selftests/mm: rename hugepage-* tests to hugetlb-*
has been removed from the -mm tree. Its filename was
selftests-mm-rename-hugepage-tests-to-hugetlb.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: "Mike Rapoport (Microsoft)" <[email protected]>
Subject: selftests/mm: rename hugepage-* tests to hugetlb-*
Date: Mon, 11 May 2026 19:27:51 +0300

hugepage could mean both THP and HugeTLB these days.

Rename hugepage-* tests for HugeTLB to hugetlb-* to avoid confusion.

Make sure that Makefile update keeps alphabetical ordering of the TEST_GEN_FILES entries.

Keep old binary names in .gitignore because Linus prefers it this way.

Cc Baolin Wang <[email protected]>
Cc Barry Song <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc Dev Jain <[email protected]>
Cc Jason Gunthorpe <[email protected]>
Cc John Hubbard <[email protected]>
Cc Lance Yang <[email protected]>
Cc Leon Romanovsky <[email protected]>
Cc Liam Howlett <[email protected]>
Cc Lorenzo Stoakes <[email protected]>
Cc Mark Brown <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Nico Pache <[email protected]>
Cc Peter Xu <[email protected]>
Cc Ryan Roberts <[email protected]>
Cc Shuah Khan <[email protected]>
Cc Suren Baghdasaryan <[email protected]>
Cc Vlastimil Babka <[email protected]>
Cc Zi Yan <[email protected]>

---

 Documentation/admin-guide/mm/hugetlbpage.rst  |    8 
 tools/testing/selftests/mm/.gitignore         |    4 
 tools/testing/selftests/mm/Makefile           |    8 
 tools/testing/selftests/mm/hugepage-mmap.c    |  135 ------------
 tools/testing/selftests/mm/hugepage-mremap.c  |  178 ----------------
 tools/testing/selftests/mm/hugepage-shm.c     |   81 -------
 tools/testing/selftests/mm/hugepage-vmemmap.c |  134 ------------
 tools/testing/selftests/mm/hugetlb-madvise.c  |    2 
 tools/testing/selftests/mm/hugetlb-mmap.c     |  135 ++++++++++++
 tools/testing/selftests/mm/hugetlb-mremap.c   |  178 ++++++++++++++++
 tools/testing/selftests/mm/hugetlb-shm.c      |   81 +++++++
 tools/testing/selftests/mm/hugetlb-vmemmap.c  |  134 ++++++++++++
 tools/testing/selftests/mm/run_vmtests.sh     |    8 
 13 files changed, 545 insertions(+), 541 deletions(-)
Documentation/admin-guide/mm/hugetlbpage.rst renamed from Documentation/admin-guide/mm/hugetlbpage.rst~selftests-mm-rename-hugepage-tests-to-hugetlb +4 -4
@@ -475,11 +475,11 @@ Examples
 
 .. _examples:
 
-``hugepage-shm``
-	see tools/testing/selftests/mm/hugepage-shm.c
+``hugetlb-shm``
+	see tools/testing/selftests/mm/hugetlb-shm.c
 
-``hugepage-mmap``
-	see tools/testing/selftests/mm/hugepage-mmap.c
+``hugetlb-mmap``
+	see tools/testing/selftests/mm/hugetlb-mmap.c
 
 The `libhugetlbfs`_  library provides a wide range of userspace tools
 to help with huge page usability, environment setup, and control.
tools/testing/selftests/mm/.gitignore renamed from tools/testing/selftests/mm/.gitignore~selftests-mm-rename-hugepage-tests-to-hugetlb +4 -0
@@ -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
tools/testing/selftests/mm/hugepage-mmap.c deleted +0 -135

135 lines not on this page · raw message

tools/testing/selftests/mm/hugepage-mremap.c deleted +0 -178

178 lines not on this page · raw message

tools/testing/selftests/mm/hugepage-shm.c deleted +0 -81

81 lines not on this page · raw message

tools/testing/selftests/mm/hugepage-vmemmap.c deleted +0 -134

134 lines not on this page · raw message

tools/testing/selftests/mm/hugetlb-madvise.c renamed from tools/testing/selftests/mm/hugetlb-madvise.c~selftests-mm-rename-hugepage-tests-to-hugetlb +1 -1
@@ -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.
tools/testing/selftests/mm/hugetlb-mmap.c new file +135 -0

135 lines not on this page · raw message

tools/testing/selftests/mm/hugetlb-mremap.c new file +178 -0

178 lines not on this page · raw message

tools/testing/selftests/mm/hugetlb-shm.c new file +81 -0

81 lines not on this page · raw message

tools/testing/selftests/mm/hugetlb-vmemmap.c new file +134 -0

134 lines not on this page · raw message

tools/testing/selftests/mm/Makefile renamed from tools/testing/selftests/mm/Makefile~selftests-mm-rename-hugepage-tests-to-hugetlb +4 -4
@@ -61,12 +61,12 @@ TEST_GEN_FILES += gup_longterm
 TEST_GEN_FILES += gup_test
 TEST_GEN_FILES += hmm-tests
 TEST_GEN_FILES += hugetlb-madvise
+TEST_GEN_FILES += hugetlb-mmap
+TEST_GEN_FILES += hugetlb-mremap
 TEST_GEN_FILES += hugetlb-read-hwpoison
+TEST_GEN_FILES += hugetlb-shm
 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-vmemmap
 TEST_GEN_FILES += khugepaged
 TEST_GEN_FILES += madv_populate
 TEST_GEN_FILES += map_fixed_noreplace
tools/testing/selftests/mm/run_vmtests.sh renamed from tools/testing/selftests/mm/run_vmtests.sh~selftests-mm-rename-hugepage-tests-to-hugetlb +4 -4
@@ -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
 

_

Patches currently in -mm which might be from [email protected] are