public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Mike Rapoport <rppt@kernel.org>
To: Andrew Morton <akpm@linux-foundation.org>,
	David Hildenbrand <david@kernel.org>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>,
	Barry Song <baohua@kernel.org>, Dev Jain <dev.jain@arm.com>,
	Donet Tom <donettom@linux.ibm.com>,
	Jason Gunthorpe <jgg@ziepe.ca>,
	John Hubbard <jhubbard@nvidia.com>,
	"Liam R. Howlett" <Liam.Howlett@oracle.com>,
	Lance Yang <lance.yang@linux.dev>,
	Leon Romanovsky <leon@kernel.org>,
	Lorenzo Stoakes <ljs@kernel.org>,
	Luiz Capitulino <luizcap@redhat.com>,
	Mark Brown <broonie@kernel.org>, Michal Hocko <mhocko@suse.com>,
	Mike Rapoport <rppt@kernel.org>, Nico Pache <npache@redhat.com>,
	Peter Xu <peterx@redhat.com>, Ryan Roberts <ryan.roberts@arm.com>,
	Sarthak Sharma <sarthak.sharma@arm.com>,
	Shuah Khan <shuah@kernel.org>,
	Suren Baghdasaryan <surenb@google.com>,
	Vlastimil Babka <vbabka@kernel.org>, Zi Yan <ziy@nvidia.com>,
	linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org,
	linux-mm@kvack.org
Subject: [PATCH v3 45/54] selftests/mm: pagemap_ioctl: add setup of HugeTLB pages
Date: Tue, 28 Apr 2026 23:42:31 +0300	[thread overview]
Message-ID: <20260428204240.1924129-46-rppt@kernel.org> (raw)
In-Reply-To: <20260428204240.1924129-1-rppt@kernel.org>

From: "Mike Rapoport (Microsoft)" <rppt@kernel.org>

pagemap-ioctl skips HugeTLB tests if there are no free huge pages
prepared by a wrapper script.

Add setup of HugeTLB pages to the test and make sure that the original
settings are restored on the test exit.

Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
---
 tools/testing/selftests/mm/pagemap_ioctl.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tools/testing/selftests/mm/pagemap_ioctl.c b/tools/testing/selftests/mm/pagemap_ioctl.c
index 7f9428d6062c..e2c62cb6978f 100644
--- a/tools/testing/selftests/mm/pagemap_ioctl.c
+++ b/tools/testing/selftests/mm/pagemap_ioctl.c
@@ -7,8 +7,6 @@
 #include <sys/mman.h>
 #include <errno.h>
 #include <malloc.h>
-#include "vm_util.h"
-#include "kselftest.h"
 #include <linux/types.h>
 #include <linux/memfd.h>
 #include <linux/userfaultfd.h>
@@ -23,6 +21,10 @@
 #include <sys/ipc.h>
 #include <sys/shm.h>
 
+#include "vm_util.h"
+#include "kselftest.h"
+#include "hugepage_settings.h"
+
 #define PAGEMAP_BITS_ALL		(PAGE_IS_WPALLOWED | PAGE_IS_WRITTEN |	\
 					 PAGE_IS_FILE | PAGE_IS_PRESENT |	\
 					 PAGE_IS_SWAPPED | PAGE_IS_PFNZERO |	\
@@ -1554,6 +1556,9 @@ int main(int __attribute__((unused)) argc, char *argv[])
 	if (init_uffd())
 		ksft_exit_skip("Failed to initialize userfaultfd\n");
 
+	if (!hugetlb_setup_default(4))
+		ksft_exit_skip("Not enough huge pages\n");
+
 	ksft_set_plan(117);
 
 	page_size = getpagesize();
@@ -1605,7 +1610,7 @@ int main(int __attribute__((unused)) argc, char *argv[])
 	}
 
 	/* 5. SHM Hugetlb page testing */
-	mem_size = 2*1024*1024;
+	mem_size = default_huge_page_size();
 	mem = gethugetlb_mem(mem_size, &shmid);
 	if (mem) {
 		wp_init(mem, mem_size);
@@ -1633,7 +1638,7 @@ int main(int __attribute__((unused)) argc, char *argv[])
 	}
 
 	/* 7. File Hugetlb testing */
-	mem_size = 2*1024*1024;
+	mem_size = default_huge_page_size();
 	fd = memfd_create("uffd-test", MFD_HUGETLB | MFD_NOEXEC_SEAL);
 	if (fd < 0)
 		ksft_exit_fail_msg("uffd-test creation failed %d %s\n", errno, strerror(errno));
-- 
2.53.0


  parent reply	other threads:[~2026-04-28 20:47 UTC|newest]

Thread overview: 76+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-04-28 20:41 [PATCH v3 00/54] make MM selftests more CI friendly Mike Rapoport
2026-04-28 20:41 ` [PATCH v3 01/54] selftests/mm: hugetlb-read-hwpoison: add SIGBUS handler Mike Rapoport
2026-04-30 13:04   ` Li Wang
2026-04-28 20:41 ` [PATCH v3 02/54] selftests/mm: migration: don't assume hupe page is TWOMEG Mike Rapoport
2026-04-30 13:19   ` Luiz Capitulino
2026-04-28 20:41 ` [PATCH v3 03/54] selftests/mm: migration: make nthreads represent number of working threads Mike Rapoport
2026-04-30 13:21   ` Luiz Capitulino
2026-04-28 20:41 ` [PATCH v3 04/54] selftests/mm: migration: properly cleanup fork()ed processes Mike Rapoport
2026-04-30 13:37   ` Luiz Capitulino
2026-04-30 14:40     ` Mike Rapoport
2026-04-30 14:54       ` Luiz Capitulino
2026-04-28 20:41 ` [PATCH v3 05/54] selftests/mm: run_vmtests.sh: don't gate THP and KSM tests on HAVE_HUGEPAGES Mike Rapoport
2026-04-28 20:41 ` [PATCH v3 06/54] selftests/mm: merge map_hugetlb into hugepage-mmap Mike Rapoport
2026-04-30  9:33   ` Donet Tom
2026-04-30 15:26   ` Luiz Capitulino
2026-04-28 20:41 ` [PATCH v3 07/54] selftests/mm: rename hugepage-* tests to hugetlb-* Mike Rapoport
2026-04-28 20:41 ` [PATCH v3 08/54] selftests/mm: hugetlb-shm: use kselftest framework Mike Rapoport
2026-04-28 20:41 ` [PATCH v3 09/54] selftests/mm: hugetlb-vmemmap: " Mike Rapoport
2026-04-28 20:41 ` [PATCH v3 10/54] selftests/mm: hugetlb-madvise: " Mike Rapoport
2026-04-28 20:41 ` [PATCH v3 11/54] selftests/mm: hugetlb_madv_vs_map: " Mike Rapoport
2026-04-28 20:41 ` [PATCH v3 12/54] selftests/mm: hugetlb-read-hwpoison: " Mike Rapoport
2026-04-30 13:09   ` Li Wang
2026-04-28 20:41 ` [PATCH v3 13/54] selftests/mm: khugepaged: group tests in an array Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 14/54] selftests/mm: khugepaged: use ksefltest framework Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 15/54] selftests/mm: ksm_tests: use kselftest framework Mike Rapoport
2026-04-29 11:59   ` Sarthak Sharma
2026-04-28 20:42 ` [PATCH v3 16/54] selftests/mm: protection_keys: use descriptive test names in TAP output Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 17/54] selftests/mm: protection_keys: use kselftest framework Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 18/54] selftests/mm: uffd-stress: " Mike Rapoport
2026-04-29 12:10   ` Sarthak Sharma
2026-04-28 20:42 ` [PATCH v3 19/54] selftests/mm: uffd-unit-tests: " Mike Rapoport
2026-04-29 13:13   ` Sarthak Sharma
2026-04-30 14:36     ` Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 20/54] selftests/mm: va_high_addr_switch: " Mike Rapoport
2026-04-30 15:42   ` Luiz Capitulino
2026-04-28 20:42 ` [PATCH v3 21/54] selftests/mm: add atexit() and signal handlers to thp_settings Mike Rapoport
2026-04-30  7:57   ` Sarthak Sharma
2026-04-28 20:42 ` [PATCH v3 22/54] selftests/mm: rename thp_settings.[ch] to hugepage_settings.[ch] Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 23/54] selftests/mm: move HugeTLB helpers to hugepage_settings Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 24/54] selftests/mm: hugepage_settings: use unsigned long in detect_hugetlb_page_size Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 25/54] selftests/mm: hugepage_settings: add APIs to get and set nr_hugepages Mike Rapoport
2026-04-30 17:33   ` Luiz Capitulino
2026-04-28 20:42 ` [PATCH v3 26/54] selftests/mm: hugepage_settings: rename get_free_hugepages() Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 27/54] selftests/mm: hugepage_settings: add APIs for HugeTLB setup and teardown Mike Rapoport
2026-04-30 18:31   ` Luiz Capitulino
2026-04-28 20:42 ` [PATCH v3 28/54] selftests/mm: move read_file(), read_num() and write_num() to vm_util Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 29/54] selftests/mm: vm_util: add helpers to set and restore shm limits Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 30/54] selftests/mm: compaction_test: use HugeTLB helpers Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 31/54] selftests/mm: cow: add setup of HugeTLB pages Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 32/54] selftests/mm: gup_longterm: " Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 33/54] selftests/mm: gup_test: " Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 34/54] selftests/mm: hmm-tests: " Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 35/54] selftests/mm: hugepage_dio: " Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 36/54] selftests/mm: hugetlb_fault_after_madv: " Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 37/54] selftests/mm: hugetlb-madvise: " Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 38/54] selftests/mm: hugetlb_madv_vs_map: " Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 39/54] selftests/mm: hugetlb-mmap: " Mike Rapoport
2026-04-30 18:39   ` Luiz Capitulino
2026-04-28 20:42 ` [PATCH v3 40/54] selftests/mm: hugetlb-mremap: " Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 41/54] selftests/mm: hugetlb-shm: " Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 42/54] selftests/mm: hugetlb-soft-online: " Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 43/54] selftests/mm: hugetlb-vmemmap: " Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 44/54] selftests/mm: migration: " Mike Rapoport
2026-04-28 20:42 ` Mike Rapoport [this message]
2026-04-28 20:42 ` [PATCH v3 46/54] selftests/mm: protection_keys: use library code for HugeTLB setup Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 47/54] selftests/mm: thuge-gen: add setup of HugeTLB pages Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 48/54] selftests/mm: uffd-stress: use hugetlb_save and alloc huge pages Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 49/54] selftests/mm: uffd-unit-tests: add setup of HugeTLB pages Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 50/54] selftests/mm: uffd-wp-mremap: " Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 51/54] selftests/mm: va_high_addr_switch: " Mike Rapoport
2026-04-30 18:44   ` Luiz Capitulino
2026-04-28 20:42 ` [PATCH v3 52/54] selftests/mm: va_high_addr_switch.sh: drop huge pages setup Mike Rapoport
2026-04-30 18:49   ` Luiz Capitulino
2026-04-28 20:42 ` [PATCH v3 53/54] selftests/mm: run_vmtests.sh: free memory if available memory is low Mike Rapoport
2026-04-28 20:42 ` [PATCH v3 54/54] selftests/mm: run_vmtests.sh: drop detection and setup of HugeTLB Mike Rapoport
2026-04-30 12:56 ` [PATCH v3 00/54] make MM selftests more CI friendly Luiz Capitulino

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260428204240.1924129-46-rppt@kernel.org \
    --to=rppt@kernel.org \
    --cc=Liam.Howlett@oracle.com \
    --cc=akpm@linux-foundation.org \
    --cc=baohua@kernel.org \
    --cc=baolin.wang@linux.alibaba.com \
    --cc=broonie@kernel.org \
    --cc=david@kernel.org \
    --cc=dev.jain@arm.com \
    --cc=donettom@linux.ibm.com \
    --cc=jgg@ziepe.ca \
    --cc=jhubbard@nvidia.com \
    --cc=lance.yang@linux.dev \
    --cc=leon@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=ljs@kernel.org \
    --cc=luizcap@redhat.com \
    --cc=mhocko@suse.com \
    --cc=npache@redhat.com \
    --cc=peterx@redhat.com \
    --cc=ryan.roberts@arm.com \
    --cc=sarthak.sharma@arm.com \
    --cc=shuah@kernel.org \
    --cc=surenb@google.com \
    --cc=vbabka@kernel.org \
    --cc=ziy@nvidia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox