Skip to contentSkip to conversation

selftests-mm-merge-map_hugetlb-into-hugepage-mmap.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: merge map_hugetlb into hugepage-mmap
has been removed from the -mm tree. Its filename was
selftests-mm-merge-map_hugetlb-into-hugepage-mmap.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: merge map_hugetlb into hugepage-mmap
Date: Mon, 11 May 2026 19:27:50 +0300

Both tests create a hugettlb mapping, fill it with data and verify the data, the only difference is that one uses file-backed memory and another one uses anonymous memory.

Merge both tests into a single file.

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 Li Wang <[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 Sarthak Sharma <[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 |    7 -
 tools/testing/selftests/mm/Makefile          |    1 
 tools/testing/selftests/mm/hugepage-mmap.c   |  107 +++++++++++++----
 tools/testing/selftests/mm/map_hugetlb.c     |   88 -------------
 tools/testing/selftests/mm/run_vmtests.sh    |    1 
 5 files changed, 84 insertions(+), 120 deletions(-)
Documentation/admin-guide/mm/hugetlbpage.rst renamed from Documentation/admin-guide/mm/hugetlbpage.rst~selftests-mm-merge-map_hugetlb-into-hugepage-mmap +2 -5
@@ -455,7 +455,7 @@ used to change the file attributes on hu
 Also, it is important to note that no such mount command is required if
 applications are going to use only shmat/shmget system calls or mmap with
 MAP_HUGETLB.  For an example of how to use mmap with MAP_HUGETLB see
-:ref:`map_hugetlb <map_hugetlb>` below.
+:ref:`examples <examples>` below.
 
 Users who wish to use hugetlb memory via shared memory segment should be
 members of a supplementary group and system admin needs to configure that gid
@@ -473,10 +473,7 @@ a hugetlb page and the length is smaller
 Examples
 ========
 
-.. _map_hugetlb:
-
-``map_hugetlb``
-	see tools/testing/selftests/mm/map_hugetlb.c
+.. _examples:
 
 ``hugepage-shm``
 	see tools/testing/selftests/mm/hugepage-shm.c
tools/testing/selftests/mm/hugepage-mmap.c renamed from tools/testing/selftests/mm/hugepage-mmap.c~selftests-mm-merge-map_hugetlb-into-hugepage-mmap +82 -25

142 lines not on this page · raw message

tools/testing/selftests/mm/Makefile renamed from tools/testing/selftests/mm/Makefile~selftests-mm-merge-map_hugetlb-into-hugepage-mmap +0 -1
@@ -70,7 +70,6 @@ TEST_GEN_FILES += hugepage-vmemmap
 TEST_GEN_FILES += khugepaged
 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 loongarch32 loongarch64))
 TEST_GEN_FILES += memfd_secret
tools/testing/selftests/mm/map_hugetlb.c deleted +0 -88

88 lines not on this page · raw message

tools/testing/selftests/mm/run_vmtests.sh renamed from tools/testing/selftests/mm/run_vmtests.sh~selftests-mm-merge-map_hugetlb-into-hugepage-mmap +0 -1
@@ -292,7 +292,6 @@ CATEGORY="hugetlb" run_test ./hugepage-s
 echo "$shmmax" > /proc/sys/kernel/shmmax
 echo "$shmall" > /proc/sys/kernel/shmall
 
-CATEGORY="hugetlb" run_test ./map_hugetlb
 CATEGORY="hugetlb" run_test ./hugepage-mremap
 CATEGORY="hugetlb" run_test ./hugepage-vmemmap
 CATEGORY="hugetlb" run_test ./hugetlb-madvise

_

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