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>,
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>, 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>,
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 26/53] selftests/mm: hugepage_settings: add APIs for HugeTLB setup and teardown
Date: Mon, 6 Apr 2026 17:17:08 +0300 [thread overview]
Message-ID: <20260406141735.2179309-27-rppt@kernel.org> (raw)
In-Reply-To: <20260406141735.2179309-1-rppt@kernel.org>
From: "Mike Rapoport (Microsoft)" <rppt@kernel.org>
A lot of tests require free HugeTLB pages. Some need just a few default
huge pages, some need a certain amount of memory available as HugeTLB, and
some just skip lots of tests if huge pages of all supported sizes are not
available.
This all resulted in a huge mess in run_vmtests.sh that sets up some huge
pages, adjusts them later and restores some of the settings if the stars
align.
Add APIs that allow saving the state of HugeTLB and setting up the desired
amount of HugeTLB pages.
Saving the state also registers atexit() callback and signal handler that
will ensure restoration of HugeTLB state.
Since many tests use both HugeTLB and THP, the atexit() callbacks and
signal handler are restoring both.
For kselftest_harness tests that run fixture setups and test in child
processes add a constructor that will save and restore settings in the main
process.
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
---
.../testing/selftests/mm/hugepage_settings.c | 176 +++++++++++++++---
.../testing/selftests/mm/hugepage_settings.h | 30 ++-
2 files changed, 181 insertions(+), 25 deletions(-)
diff --git a/tools/testing/selftests/mm/hugepage_settings.c b/tools/testing/selftests/mm/hugepage_settings.c
index 4ae7332b5e1b..3eef87e812ba 100644
--- a/tools/testing/selftests/mm/hugepage_settings.c
+++ b/tools/testing/selftests/mm/hugepage_settings.c
@@ -306,31 +306,12 @@ void thp_restore_settings(void)
thp_write_settings(&saved_settings);
}
-static void thp_restore_settings_atexit(void)
+static void __thp_save_settings(void)
{
- thp_restore_settings();
-}
-
-static void thp_restore_settings_sighandler(int sig)
-{
- /* exit() will invoke the thp_restore_settings_atexit handler. */
- exit(KSFT_FAIL);
-}
+ if (!thp_available())
+ return;
-void thp_save_settings(void)
-{
thp_read_settings(&saved_settings);
-
- /*
- * setup exit hooks to make sure THP settings are restored on graceful
- * and error exits and signals
- */
- atexit(thp_restore_settings_atexit);
- signal(SIGTERM, thp_restore_settings_sighandler);
- signal(SIGINT, thp_restore_settings_sighandler);
- signal(SIGHUP, thp_restore_settings_sighandler);
- signal(SIGQUIT, thp_restore_settings_sighandler);
-
thp_settings_saved = true;
}
@@ -399,11 +380,31 @@ bool thp_is_enabled(void)
return mode == 1 || mode == 3;
}
+#define HUGETLB_MAX_NR_PAGESIZES 10
+struct hugetlb_settings {
+ unsigned long free_hugepages[HUGETLB_MAX_NR_PAGESIZES];
+ unsigned long nr_hugepages[HUGETLB_MAX_NR_PAGESIZES];
+ unsigned long sizes[HUGETLB_MAX_NR_PAGESIZES];
+ unsigned long default_size;
+ int nr_sizes;
+};
+
+static struct hugetlb_settings hugetlb_saved_settings;
+bool hugetlb_settings_saved;
+
int detect_hugetlb_page_sizes(unsigned long sizes[], int max)
{
- DIR *dir = opendir("/sys/kernel/mm/hugepages/");
+ static struct hugetlb_settings *settings = &hugetlb_saved_settings;
+ DIR *dir;
int count = 0;
+ if (settings->nr_sizes) {
+ for (count = 0; count < settings->nr_sizes; count++)
+ sizes[count] = settings->sizes[count];
+ return settings->nr_sizes;
+ }
+
+ dir = opendir("/sys/kernel/mm/hugepages/");
if (!dir)
return 0;
@@ -427,11 +428,16 @@ int detect_hugetlb_page_sizes(unsigned long sizes[], int max)
unsigned long default_huge_page_size(void)
{
+ static struct hugetlb_settings *settings = &hugetlb_saved_settings;
unsigned long hps = 0;
char *line = NULL;
size_t linelen = 0;
- FILE *f = fopen("/proc/meminfo", "r");
+ FILE *f;
+
+ if (settings->default_size)
+ return settings->default_size;
+ f = fopen("/proc/meminfo", "r");
if (!f)
return 0;
while (getline(&line, &linelen, f) > 0) {
@@ -479,3 +485,125 @@ unsigned long hugetlb_free_pages(unsigned long size)
return read_num(path);
}
+
+bool hugetlb_setup_default(unsigned long nr)
+{
+ unsigned long size;
+
+ hugetlb_save_settings();
+
+ size = default_huge_page_size();
+ hugetlb_set_nr_pages(size, nr);
+
+ return hugetlb_free_pages(size) == nr;
+}
+
+unsigned long hugetlb_setup(unsigned long nr, unsigned long sizes[],
+ int max)
+{
+ unsigned long enabled[10];
+ int nr_sizes = 0;
+ int nr_enabled;
+
+ nr_enabled = detect_hugetlb_page_sizes(enabled, ARRAY_SIZE(enabled));
+ if (!nr_enabled)
+ return 0;
+
+ if (nr_enabled > max) {
+ ksft_print_msg("detected %d huge page sizes, will only test %d\n", nr_enabled, max);
+ nr_enabled = max;
+ }
+
+ /* If HugeTLB is supported, request 2 HugeTLB pages of every size. */
+ for (int i = 0; i < nr_enabled; i++) {
+ hugetlb_set_nr_pages(enabled[i], nr);
+ if (hugetlb_free_pages(enabled[i]) < nr)
+ continue;
+
+ sizes[nr_sizes++] = enabled[i];
+ }
+
+ return nr_sizes;
+}
+
+static void __hugetlb_save_settings(void)
+{
+ struct hugetlb_settings *settings = &hugetlb_saved_settings;
+ int nr_sizes;
+
+ settings->default_size = default_huge_page_size();
+ if (!settings->default_size)
+ return;
+
+ nr_sizes = detect_hugetlb_page_sizes(settings->sizes,
+ HUGETLB_MAX_NR_PAGESIZES);
+ if (!nr_sizes) {
+ settings->default_size = 0;
+ return;
+ }
+
+ for (int i = 0; i < nr_sizes; i++) {
+ unsigned long sz = settings->sizes[i];
+
+ if (!sz)
+ continue;
+
+ settings->free_hugepages[i] = hugetlb_free_pages(sz);
+ settings->nr_hugepages[i] = hugetlb_nr_pages(sz);
+ }
+
+ settings->nr_sizes = nr_sizes;
+ hugetlb_settings_saved = true;
+}
+
+void hugetlb_restore_settings(void)
+{
+ struct hugetlb_settings *settings = &hugetlb_saved_settings;
+
+ if (!hugetlb_settings_saved || !settings->default_size)
+ return;
+
+ for (int i = 0; i < HUGETLB_MAX_NR_PAGESIZES; i++) {
+ unsigned long sz = settings->sizes[i];
+
+ if (!sz)
+ continue;
+
+ hugetlb_set_nr_pages(sz, settings->nr_hugepages[i]);
+ }
+}
+
+static void hugepage_restore_settings_atexit(void)
+{
+ if (thp_settings_saved)
+ thp_restore_settings();
+ if (hugetlb_settings_saved)
+ hugetlb_restore_settings();
+}
+
+static void hugepage_restore_settings_sighandler(int sig)
+{
+ /* exit() will invoke the hugetlb_restore_settings_atexit handler. */
+ exit(KSFT_FAIL);
+}
+
+void hugepage_save_settings(bool thp, bool hugetlb)
+{
+ if (!thp && !hugetlb)
+ return;
+
+ if (thp)
+ __thp_save_settings();
+ if (hugetlb)
+ __hugetlb_save_settings();
+
+ /*
+ * setup exit hooks to make sure THP settings are restored on graceful
+ * and error exits and signals
+ */
+ atexit(hugepage_restore_settings_atexit);
+ signal(SIGTERM, hugepage_restore_settings_sighandler);
+ signal(SIGINT, hugepage_restore_settings_sighandler);
+ signal(SIGHUP, hugepage_restore_settings_sighandler);
+ signal(SIGQUIT, hugepage_restore_settings_sighandler);
+}
diff --git a/tools/testing/selftests/mm/hugepage_settings.h b/tools/testing/selftests/mm/hugepage_settings.h
index 57fbf2f57e13..d6a1b4e5f734 100644
--- a/tools/testing/selftests/mm/hugepage_settings.h
+++ b/tools/testing/selftests/mm/hugepage_settings.h
@@ -6,6 +6,8 @@
#include <stddef.h>
#include <stdint.h>
+void hugepage_save_settings(bool thp, bool hugetlb);
+
/* Transparent Huge Pages (THP) */
enum thp_enabled {
@@ -79,7 +81,11 @@ struct thp_settings *thp_current_settings(void);
void thp_push_settings(struct thp_settings *settings);
void thp_pop_settings(void);
void thp_restore_settings(void);
-void thp_save_settings(void);
+
+static inline void thp_save_settings(void)
+{
+ hugepage_save_settings(/* thp = */ true, /* hugetlb = */ false);
+}
void thp_set_read_ahead_path(char *path);
unsigned long thp_supported_orders(void);
@@ -97,6 +103,13 @@ unsigned long hugetlb_nr_pages(unsigned long size);
void hugetlb_set_nr_pages(unsigned long size, unsigned long nr);
unsigned long hugetlb_free_pages(unsigned long size);
+static inline void hugetlb_save_settings(void)
+{
+ hugepage_save_settings(/* thp = */ false, /* hugetlb = */ true);
+}
+
+void hugetlb_restore_settings(void);
+
static inline unsigned long hugetlb_nr_default_pages(void)
{
unsigned long size = default_huge_page_size();
@@ -127,4 +140,19 @@ static inline unsigned long hugetlb_free_default_pages(void)
return hugetlb_free_pages(size);
}
+static inline bool hugetlb_available(void)
+{
+ return default_huge_page_size() != 0;
+}
+
+bool hugetlb_setup_default(unsigned long nr);
+unsigned long hugetlb_setup(unsigned long nr, unsigned long sizes[],
+ int max);
+
+#define HUGETLB_SETUP_DEFAULT_PAGES(nr_pages) \
+static void __attribute__((constructor)) __hugetlb_setup_default(void) \
+{ \
+ hugetlb_setup_default((nr_pages)); \
+}
+
#endif /* __THP_SETTINGS_H__ */
--
2.53.0
next prev parent reply other threads:[~2026-04-06 14:20 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-06 14:16 [PATCH 00/53] selftests/mm: make MM selftests more CI friendly Mike Rapoport
2026-04-06 14:16 ` [PATCH 01/53] selftests/mm: hugetlb-read-hwpoison: add SIGBUS handler Mike Rapoport
2026-04-06 14:16 ` [PATCH 02/53] selftests/mm: khugepaged: enable collapse_single_pte_entry_compound for shmem Mike Rapoport
2026-04-06 14:16 ` [PATCH 03/53] selftests/mm: migration: don't assume hupe page is TWOMEG Mike Rapoport
2026-04-06 14:16 ` [PATCH 04/53] selftests/mm: run_vmtests.sh: don't gate THP and KSM tests on HAVE_HUGEPAGES Mike Rapoport
2026-04-06 14:16 ` [PATCH 05/53] selftests/mm: merge map_hugetlb into hugepage-mmap Mike Rapoport
2026-04-06 14:16 ` [PATCH 06/53] selftests/mm: rename hugepage-* tests to hugetlb-* Mike Rapoport
2026-04-06 14:16 ` [PATCH 07/53] selftests/mm: hugetlb-shm: use kselftest framework Mike Rapoport
2026-04-06 14:27 ` Mark Brown
2026-04-06 14:16 ` [PATCH 08/53] selftests/mm: hugetlb-vmemmap: " Mike Rapoport
2026-04-06 14:40 ` Mark Brown
2026-04-06 14:16 ` [PATCH 09/53] selftests/mm: hugetlb-madvise: " Mike Rapoport
2026-04-06 14:16 ` [PATCH 10/53] selftests/mm: hugetlb_madv_vs_map: " Mike Rapoport
2026-04-06 15:06 ` Mark Brown
2026-04-06 14:16 ` [PATCH 11/53] selftests/mm: hugetlb-read-hwpoison: " Mike Rapoport
2026-04-06 16:19 ` Mark Brown
2026-04-06 14:16 ` [PATCH 12/53] selftests/mm: khugepaged: group tests in an array Mike Rapoport
2026-04-06 16:49 ` Mark Brown
2026-04-06 14:16 ` [PATCH 13/53] selftests/mm: khugepaged: use ksefltest framework Mike Rapoport
2026-04-06 14:16 ` [PATCH 14/53] selftests/mm: ksm_tests: use kselftest framework Mike Rapoport
2026-04-06 14:16 ` [PATCH 15/53] selftests/mm: protection_keys: use descriptive test names in TAP output Mike Rapoport
2026-04-06 16:51 ` Mark Brown
2026-04-06 14:16 ` [PATCH 16/53] selftests/mm: protection_keys: use kselftest framework Mike Rapoport
2026-04-06 17:02 ` Mark Brown
2026-04-06 14:16 ` [PATCH 17/53] selftests/mm: uffd-stress: " Mike Rapoport
2026-04-06 14:17 ` [PATCH 18/53] selftests/mm: uffd-unit-tests: " Mike Rapoport
2026-04-06 14:17 ` [PATCH 19/53] selftests/mm: va_high_addr_switch: " Mike Rapoport
2026-04-06 14:17 ` [PATCH 20/53] selftests/mm: add atexit() and signal handlers to thp_settings Mike Rapoport
2026-04-06 14:17 ` [PATCH 21/53] selftests/mm: rename thp_settings.[ch] to hugepage_settings.[ch] Mike Rapoport
2026-04-06 14:17 ` [PATCH 22/53] selftests/mm: move HugeTLB helpers to hugepage_settings Mike Rapoport
2026-04-06 14:17 ` [PATCH 23/53] selftests/mm: hugepage_settings: use unsigned long in detect_hugetlb_page_size Mike Rapoport
2026-04-06 14:17 ` [PATCH 24/53] selftests/mm: hugepage_settings: add APIs to get and set nr_hugepages Mike Rapoport
2026-04-06 14:17 ` [PATCH 25/53] selftests/mm: hugepage_settings: rename get_free_hugepages() Mike Rapoport
2026-04-06 14:17 ` Mike Rapoport [this message]
2026-04-06 14:17 ` [PATCH 27/53] selftests/mm: move read_file(), read_num() and write_num() to vm_util Mike Rapoport
2026-04-06 14:17 ` [PATCH 28/53] selftests/mm: vm_util: add helpers to set and restore shm limits Mike Rapoport
2026-04-06 14:17 ` [PATCH 29/53] selftests/mm: compaction_test: use HugeTLB helpers Mike Rapoport
2026-04-06 14:17 ` [PATCH 30/53] selftests/mm: cow: add setup of HugeTLB pages Mike Rapoport
2026-04-06 14:17 ` [PATCH 31/53] selftests/mm: gup_longterm: " Mike Rapoport
2026-04-06 14:17 ` [PATCH 32/53] selftests/mm: gup_test: " Mike Rapoport
2026-04-06 14:17 ` [PATCH 33/53] selftests/mm: hmm-tests: " Mike Rapoport
2026-04-06 14:17 ` [PATCH 34/53] selftests/mm: hugepage_dio: " Mike Rapoport
2026-04-06 14:17 ` [PATCH 35/53] selftests/mm: hugetlb_fault_after_madv: " Mike Rapoport
2026-04-06 14:17 ` [PATCH 36/53] selftests/mm: hugetlb-madvise: " Mike Rapoport
2026-04-06 14:17 ` [PATCH 37/53] selftests/mm: hugetlb_madv_vs_map: " Mike Rapoport
2026-04-06 14:17 ` [PATCH 38/53] selftests/mm: hugetlb-mmap: " Mike Rapoport
2026-04-06 14:17 ` [PATCH 39/53] selftests/mm: hugetlb-mremap: " Mike Rapoport
2026-04-06 14:17 ` [PATCH 40/53] selftests/mm: hugetlb-shm: " Mike Rapoport
2026-04-06 14:17 ` [PATCH 41/53] selftests/mm: hugetlb-soft-online: " Mike Rapoport
2026-04-06 14:17 ` [PATCH 42/53] selftests/mm: hugetlb-vmemmap: " Mike Rapoport
2026-04-06 14:17 ` [PATCH 43/53] selftests/mm: migration: " Mike Rapoport
2026-04-06 14:17 ` [PATCH 44/53] selftests/mm: pagemap_ioctl: " Mike Rapoport
2026-04-06 14:17 ` [PATCH 45/53] selftests/mm: protection_keys: use library code for HugeTLB setup Mike Rapoport
2026-04-06 14:17 ` [PATCH 46/53] selftests/mm: thuge-gen: add setup of HugeTLB pages Mike Rapoport
2026-04-06 14:17 ` [PATCH 47/53] selftests/mm: uffd-stress: use hugetlb_save and alloc huge pages Mike Rapoport
2026-04-06 14:17 ` [PATCH 48/53] selftests/mm: uffd-unit-tests: add setup of HugeTLB pages Mike Rapoport
2026-04-06 14:17 ` [PATCH 49/53] selftests/mm: uffd-wp-mremap: " Mike Rapoport
2026-04-06 14:17 ` [PATCH 50/53] selftests/mm: va_high_addr_switch: " Mike Rapoport
2026-04-06 14:17 ` [PATCH 51/53] selftests/mm: va_high_addr_switch.sh: drop huge pages setup Mike Rapoport
2026-04-06 14:17 ` [PATCH 52/53] selftests/mm: run_vmtests.sh: free memory if available memory is low Mike Rapoport
2026-04-06 14:17 ` [PATCH 53/53] selftests/mm: run_vmtests.sh: drop detection and setup of HugeTLB Mike Rapoport
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=20260406141735.2179309-27-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=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=mhocko@suse.com \
--cc=npache@redhat.com \
--cc=peterx@redhat.com \
--cc=ryan.roberts@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