The Linux Kernel Mailing List
 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>, Li Wang <li.wang@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 v4 50/55] selftests/mm: uffd-unit-tests: add setup of HugeTLB pages
Date: Mon, 11 May 2026 19:28:34 +0300	[thread overview]
Message-ID: <20260511162840.375890-51-rppt@kernel.org> (raw)
In-Reply-To: <20260511162840.375890-1-rppt@kernel.org>

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

uffd-unit-tests 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.

Replace exit() calls with _exit() to avoid restoring HugeTLB settings in
the middle of test.

Tested-by: Luiz Capitulino <luizcap@redhat.com>
Tested-by: Sarthak Sharma <sarthak.sharma@arm.com>
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
---
 tools/testing/selftests/mm/uffd-unit-tests.c | 33 +++++++++++++++++---
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/tools/testing/selftests/mm/uffd-unit-tests.c b/tools/testing/selftests/mm/uffd-unit-tests.c
index db7c26835487..a6c14109e818 100644
--- a/tools/testing/selftests/mm/uffd-unit-tests.c
+++ b/tools/testing/selftests/mm/uffd-unit-tests.c
@@ -299,7 +299,7 @@ static int pagemap_test_fork(uffd_global_test_opts_t *gopts, bool with_event, bo
 		if (test_pin)
 			unpin_pages(&args);
 		/* Succeed */
-		exit(0);
+		_exit(0);
 	}
 	waitpid(child, &result, 0);
 
@@ -767,7 +767,7 @@ static void uffd_sigbus_test_common(uffd_global_test_opts_t *gopts, bool wp)
 		err("fork");
 
 	if (!pid)
-		exit(faulting_process(gopts, 2, wp));
+		_exit(faulting_process(gopts, 2, wp));
 
 	waitpid(pid, &err, 0);
 	if (err)
@@ -821,7 +821,7 @@ static void uffd_events_test_common(uffd_global_test_opts_t *gopts, bool wp)
 		err("fork");
 
 	if (!pid)
-		exit(faulting_process(gopts, 0, wp));
+		_exit(faulting_process(gopts, 0, wp));
 
 	waitpid(pid, &err, 0);
 	if (err)
@@ -1700,11 +1700,32 @@ static int uffd_count_tests(int n_tests, int n_mems, const char *test_filter)
 	return count;
 }
 
+static unsigned long uffd_setup_hugetlb(void)
+{
+	unsigned long nr_hugepages, hp_size;
+
+	hugetlb_save_settings();
+	hp_size = default_huge_page_size();
+
+	if (!hp_size)
+		return 0;
+
+	/* need twice UFFD_TEST_MEM_SIZE, one for src area and one for dst */
+	nr_hugepages = 2 * MAX(UFFD_TEST_MEM_SIZE, hp_size * 2) / hp_size;
+	hugetlb_set_nr_default_pages(nr_hugepages);
+
+	if (hugetlb_free_default_pages() < nr_hugepages)
+		return 0;
+
+	return hp_size;
+}
+
 int main(int argc, char *argv[])
 {
 	int n_tests = sizeof(uffd_tests) / sizeof(uffd_test_case_t);
 	int n_mems = sizeof(mem_types) / sizeof(mem_type_t);
 	const char *test_filter = NULL;
+	unsigned long hugepage_size;
 	bool list_only = false;
 	uffd_test_case_t *test;
 	mem_type_t *mem_type;
@@ -1738,6 +1759,8 @@ int main(int argc, char *argv[])
 		return KSFT_PASS;
 	}
 
+	hugepage_size = uffd_setup_hugetlb();
+
 	ksft_print_header();
 	ksft_set_plan(uffd_count_tests(n_tests, n_mems, test_filter));
 
@@ -1765,9 +1788,9 @@ int main(int argc, char *argv[])
 
 			uffd_test_start("%s on %s", test->name, mem_type->name);
 			if (mem_type->mem_flag & (MEM_HUGETLB_PRIVATE | MEM_HUGETLB)) {
-				gopts.page_size = default_huge_page_size();
+				gopts.page_size = hugepage_size;
 				if (gopts.page_size == 0) {
-					uffd_test_skip("huge page size is 0, feature missing?");
+					uffd_test_skip("not enough HugeTLB pages");
 					continue;
 				}
 			} else {
-- 
2.53.0


  parent reply	other threads:[~2026-05-11 16:34 UTC|newest]

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

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=20260511162840.375890-51-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=li.wang@linux.dev \
    --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