Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C102368D49 for ; Sun, 21 Jun 2026 18:39:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782067149; cv=none; b=uUou/FRmcuutN9pPxFwVh0iiguj1WaNswzoWYxIpV0kARR4fD6rrXbE2S0c3U1bJDpukbdD4HJFjhm81x82R98yw18H9AQhjmwQemjSoFgu/UWqt95sJ2n2+ci6F3jjyIXsak2HND7bPB7a1gI7sKbxoxWmXRS8f3UQnBklDSD8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782067149; c=relaxed/simple; bh=3U9wXUr70nl2bZZ80fra570Ie1qbxSjxB0zi7S/WL/4=; h=Date:To:From:Subject:Message-Id; b=RmGjmi53Jn6HP5mCr9jBktM5eqUrrsL8UVABeU2B+AT/HRwiqx+hhEguIImSlR0OYWp5MpL0k5fb2yTb2Lklm9Mf8U8byJiWQWQdMryNt/+T9EwIo0PS7i80D6O6u7jfYKwbhHdC76+UTSXFZagq8V28Uu3ibZYjR/9GZ0pPhy4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=a1SIRJWp; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="a1SIRJWp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16B101F00A3A; Sun, 21 Jun 2026 18:39:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=korg; t=1782067147; bh=kN314oFKJBKWOz1cJsqKLXBGy4lKgSyOVL/RBmCE8RA=; h=Date:To:From:Subject; b=a1SIRJWpMTXshf5bvBs6qRIjPDVvgUKXCO0sN42AxKukizyW8DFkF9jumsOmddtdA wWsEKWOxRq3VrTuHOnoH9lKhusQTBrTKF/BR/5Ntjzyv6POunIuJi/zztX8qAnqQrC 4I6DmDafwN39SmvUj8meVuEsmLXCR79dWDgBf8uM= Date: Sun, 21 Jun 2026 11:39:06 -0700 To: mm-commits@vger.kernel.org,ziy@nvidia.com,vbabka@kernel.org,surenb@google.com,shuah@kernel.org,sarthak.sharma@arm.com,ryan.roberts@arm.com,peterx@redhat.com,npache@redhat.com,mhocko@suse.com,luizcap@redhat.com,ljs@kernel.org,li.wang@linux.dev,liam@infradead.org,leon@kernel.org,lance.yang@linux.dev,jhubbard@nvidia.com,jgg@ziepe.ca,donettom@linux.ibm.com,dev.jain@arm.com,david@kernel.org,broonie@kernel.org,baolin.wang@linux.alibaba.com,baohua@kernel.org,rppt@kernel.org,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] selftests-mm-rename-thp_settings-to-hugepage_settings.patch removed from -mm tree Message-Id: <20260621183907.16B101F00A3A@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: selftests/mm: rename thp_settings.[ch] to hugepage_settings.[ch] has been removed from the -mm tree. Its filename was selftests-mm-rename-thp_settings-to-hugepage_settings.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)" Subject: selftests/mm: rename thp_settings.[ch] to hugepage_settings.[ch] Date: Mon, 11 May 2026 19:28:07 +0300 ... for upcoming addition of HugeTLB helpers. Link: https://lore.kernel.org/20260511162840.375890-24-rppt@kernel.org Signed-off-by: Mike Rapoport (Microsoft) Tested-by: Luiz Capitulino Tested-by: Sarthak Sharma Cc: Baolin Wang Cc: Barry Song Cc: David Hildenbrand Cc: Dev Jain Cc: Donet Tom Cc: Jason Gunthorpe Cc: John Hubbard Cc: Lance Yang Cc: Leon Romanovsky Cc: Liam Howlett Cc: Li Wang Cc: Lorenzo Stoakes Cc: Mark Brown Cc: Michal Hocko Cc: Nico Pache Cc: Peter Xu Cc: Ryan Roberts Cc: Shuah Khan Cc: Suren Baghdasaryan Cc: Vlastimil Babka Cc: Zi Yan Signed-off-by: Andrew Morton --- tools/testing/selftests/mm/Makefile | 4 tools/testing/selftests/mm/cow.c | 2 tools/testing/selftests/mm/folio_split_race_test.c | 2 tools/testing/selftests/mm/guard-regions.c | 2 tools/testing/selftests/mm/hugepage_settings.c | 397 +++++++++++ tools/testing/selftests/mm/hugepage_settings.h | 89 ++ tools/testing/selftests/mm/khugepaged.c | 2 tools/testing/selftests/mm/ksm_tests.c | 2 tools/testing/selftests/mm/migration.c | 2 tools/testing/selftests/mm/prctl_thp_disable.c | 2 tools/testing/selftests/mm/soft-dirty.c | 2 tools/testing/selftests/mm/split_huge_page_test.c | 2 tools/testing/selftests/mm/thp_settings.c | 397 ----------- tools/testing/selftests/mm/thp_settings.h | 89 -- tools/testing/selftests/mm/transhuge-stress.c | 2 tools/testing/selftests/mm/uffd-wp-mremap.c | 2 16 files changed, 499 insertions(+), 499 deletions(-) --- a/tools/testing/selftests/mm/cow.c~selftests-mm-rename-thp_settings-to-hugepage_settings +++ a/tools/testing/selftests/mm/cow.c @@ -29,7 +29,7 @@ #include "../../../../mm/gup_test.h" #include "kselftest.h" #include "vm_util.h" -#include "thp_settings.h" +#include "hugepage_settings.h" static size_t pagesize; static int pagemap_fd; --- a/tools/testing/selftests/mm/folio_split_race_test.c~selftests-mm-rename-thp_settings-to-hugepage_settings +++ a/tools/testing/selftests/mm/folio_split_race_test.c @@ -25,7 +25,7 @@ #include #include "vm_util.h" #include "kselftest.h" -#include "thp_settings.h" +#include "hugepage_settings.h" uint64_t page_size; uint64_t pmd_pagesize; --- a/tools/testing/selftests/mm/guard-regions.c~selftests-mm-rename-thp_settings-to-hugepage_settings +++ a/tools/testing/selftests/mm/guard-regions.c @@ -21,7 +21,7 @@ #include #include #include "vm_util.h" -#include "thp_settings.h" +#include "hugepage_settings.h" #include "../pidfd/pidfd.h" diff --git a/tools/testing/selftests/mm/hugepage_settings.c a/tools/testing/selftests/mm/hugepage_settings.c new file mode 100664 --- /dev/null +++ a/tools/testing/selftests/mm/hugepage_settings.c @@ -0,0 +1,397 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include +#include +#include +#include + +#include "vm_util.h" +#include "hugepage_settings.h" + +#define THP_SYSFS "/sys/kernel/mm/transparent_hugepage/" +#define MAX_SETTINGS_DEPTH 4 +static struct thp_settings settings_stack[MAX_SETTINGS_DEPTH]; +static int settings_index; +static struct thp_settings saved_settings; +static char dev_queue_read_ahead_path[PATH_MAX]; +static bool thp_settings_saved; + +static const char * const thp_enabled_strings[] = { + "never", + "always", + "inherit", + "madvise", + NULL +}; + +static const char * const thp_defrag_strings[] = { + "always", + "defer", + "defer+madvise", + "madvise", + "never", + NULL +}; + +static const char * const shmem_enabled_strings[] = { + "never", + "always", + "within_size", + "advise", + "inherit", + "deny", + "force", + NULL +}; + +int read_file(const char *path, char *buf, size_t buflen) +{ + int fd; + ssize_t numread; + + fd = open(path, O_RDONLY); + if (fd == -1) + return 0; + + numread = read(fd, buf, buflen - 1); + if (numread < 1) { + close(fd); + return 0; + } + + buf[numread] = '\0'; + close(fd); + + return (unsigned int) numread; +} + +unsigned long read_num(const char *path) +{ + char buf[21]; + + if (read_file(path, buf, sizeof(buf)) < 0) { + perror("read_file()"); + exit(EXIT_FAILURE); + } + + return strtoul(buf, NULL, 10); +} + +void write_num(const char *path, unsigned long num) +{ + char buf[21]; + + sprintf(buf, "%ld", num); + write_file(path, buf, strlen(buf) + 1); +} + +int thp_read_string(const char *name, const char * const strings[]) +{ + char path[PATH_MAX]; + char buf[256]; + char *c; + int ret; + + ret = snprintf(path, PATH_MAX, THP_SYSFS "%s", name); + if (ret >= PATH_MAX) { + printf("%s: Pathname is too long\n", __func__); + exit(EXIT_FAILURE); + } + + if (!read_file(path, buf, sizeof(buf))) { + perror(path); + exit(EXIT_FAILURE); + } + + c = strchr(buf, '['); + if (!c) { + printf("%s: Parse failure\n", __func__); + exit(EXIT_FAILURE); + } + + c++; + memmove(buf, c, sizeof(buf) - (c - buf)); + + c = strchr(buf, ']'); + if (!c) { + printf("%s: Parse failure\n", __func__); + exit(EXIT_FAILURE); + } + *c = '\0'; + + ret = 0; + while (strings[ret]) { + if (!strcmp(strings[ret], buf)) + return ret; + ret++; + } + + printf("Failed to parse %s\n", name); + exit(EXIT_FAILURE); +} + +void thp_write_string(const char *name, const char *val) +{ + char path[PATH_MAX]; + int ret; + + ret = snprintf(path, PATH_MAX, THP_SYSFS "%s", name); + if (ret >= PATH_MAX) { + printf("%s: Pathname is too long\n", __func__); + exit(EXIT_FAILURE); + } + write_file(path, val, strlen(val) + 1); +} + +unsigned long thp_read_num(const char *name) +{ + char path[PATH_MAX]; + int ret; + + ret = snprintf(path, PATH_MAX, THP_SYSFS "%s", name); + if (ret >= PATH_MAX) { + printf("%s: Pathname is too long\n", __func__); + exit(EXIT_FAILURE); + } + return read_num(path); +} + +void thp_write_num(const char *name, unsigned long num) +{ + char path[PATH_MAX]; + int ret; + + ret = snprintf(path, PATH_MAX, THP_SYSFS "%s", name); + if (ret >= PATH_MAX) { + printf("%s: Pathname is too long\n", __func__); + exit(EXIT_FAILURE); + } + write_num(path, num); +} + +void thp_read_settings(struct thp_settings *settings) +{ + unsigned long orders = thp_supported_orders(); + unsigned long shmem_orders = thp_shmem_supported_orders(); + char path[PATH_MAX]; + int i; + + *settings = (struct thp_settings) { + .thp_enabled = thp_read_string("enabled", thp_enabled_strings), + .thp_defrag = thp_read_string("defrag", thp_defrag_strings), + .shmem_enabled = + thp_read_string("shmem_enabled", shmem_enabled_strings), + .use_zero_page = thp_read_num("use_zero_page"), + }; + settings->khugepaged = (struct khugepaged_settings) { + .defrag = thp_read_num("khugepaged/defrag"), + .alloc_sleep_millisecs = + thp_read_num("khugepaged/alloc_sleep_millisecs"), + .scan_sleep_millisecs = + thp_read_num("khugepaged/scan_sleep_millisecs"), + .max_ptes_none = thp_read_num("khugepaged/max_ptes_none"), + .max_ptes_swap = thp_read_num("khugepaged/max_ptes_swap"), + .max_ptes_shared = thp_read_num("khugepaged/max_ptes_shared"), + .pages_to_scan = thp_read_num("khugepaged/pages_to_scan"), + }; + if (dev_queue_read_ahead_path[0]) + settings->read_ahead_kb = read_num(dev_queue_read_ahead_path); + + for (i = 0; i < NR_ORDERS; i++) { + if (!((1 << i) & orders)) { + settings->hugepages[i].enabled = THP_NEVER; + continue; + } + snprintf(path, PATH_MAX, "hugepages-%ukB/enabled", + (getpagesize() >> 10) << i); + settings->hugepages[i].enabled = + thp_read_string(path, thp_enabled_strings); + } + + for (i = 0; i < NR_ORDERS; i++) { + if (!((1 << i) & shmem_orders)) { + settings->shmem_hugepages[i].enabled = SHMEM_NEVER; + continue; + } + snprintf(path, PATH_MAX, "hugepages-%ukB/shmem_enabled", + (getpagesize() >> 10) << i); + settings->shmem_hugepages[i].enabled = + thp_read_string(path, shmem_enabled_strings); + } +} + +void thp_write_settings(struct thp_settings *settings) +{ + struct khugepaged_settings *khugepaged = &settings->khugepaged; + unsigned long orders = thp_supported_orders(); + unsigned long shmem_orders = thp_shmem_supported_orders(); + char path[PATH_MAX]; + int enabled; + int i; + + thp_write_string("enabled", thp_enabled_strings[settings->thp_enabled]); + thp_write_string("defrag", thp_defrag_strings[settings->thp_defrag]); + thp_write_string("shmem_enabled", + shmem_enabled_strings[settings->shmem_enabled]); + thp_write_num("use_zero_page", settings->use_zero_page); + + thp_write_num("khugepaged/defrag", khugepaged->defrag); + thp_write_num("khugepaged/alloc_sleep_millisecs", + khugepaged->alloc_sleep_millisecs); + thp_write_num("khugepaged/scan_sleep_millisecs", + khugepaged->scan_sleep_millisecs); + thp_write_num("khugepaged/max_ptes_none", khugepaged->max_ptes_none); + thp_write_num("khugepaged/max_ptes_swap", khugepaged->max_ptes_swap); + thp_write_num("khugepaged/max_ptes_shared", khugepaged->max_ptes_shared); + thp_write_num("khugepaged/pages_to_scan", khugepaged->pages_to_scan); + + if (dev_queue_read_ahead_path[0]) + write_num(dev_queue_read_ahead_path, settings->read_ahead_kb); + + for (i = 0; i < NR_ORDERS; i++) { + if (!((1 << i) & orders)) + continue; + snprintf(path, PATH_MAX, "hugepages-%ukB/enabled", + (getpagesize() >> 10) << i); + enabled = settings->hugepages[i].enabled; + thp_write_string(path, thp_enabled_strings[enabled]); + } + + for (i = 0; i < NR_ORDERS; i++) { + if (!((1 << i) & shmem_orders)) + continue; + snprintf(path, PATH_MAX, "hugepages-%ukB/shmem_enabled", + (getpagesize() >> 10) << i); + enabled = settings->shmem_hugepages[i].enabled; + thp_write_string(path, shmem_enabled_strings[enabled]); + } +} + +struct thp_settings *thp_current_settings(void) +{ + if (!settings_index) { + printf("Fail: No settings set"); + exit(EXIT_FAILURE); + } + return settings_stack + settings_index - 1; +} + +void thp_push_settings(struct thp_settings *settings) +{ + if (settings_index >= MAX_SETTINGS_DEPTH) { + printf("Fail: Settings stack exceeded"); + exit(EXIT_FAILURE); + } + settings_stack[settings_index++] = *settings; + thp_write_settings(thp_current_settings()); +} + +void thp_pop_settings(void) +{ + if (settings_index <= 0) { + printf("Fail: Settings stack empty"); + exit(EXIT_FAILURE); + } + --settings_index; + thp_write_settings(thp_current_settings()); +} + +void thp_restore_settings(void) +{ + if (thp_settings_saved) + thp_write_settings(&saved_settings); +} + +static void thp_restore_settings_atexit(void) +{ + thp_restore_settings(); +} + +static void thp_restore_settings_sighandler(int sig) +{ + /* exit() will invoke the thp_restore_settings_atexit handler. */ + exit(KSFT_FAIL); +} + +void thp_save_settings(void) +{ + thp_read_settings(&saved_settings); + thp_settings_saved = true; + + /* + * 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); +} + +void thp_set_read_ahead_path(char *path) +{ + if (!path) { + dev_queue_read_ahead_path[0] = '\0'; + return; + } + + strncpy(dev_queue_read_ahead_path, path, + sizeof(dev_queue_read_ahead_path)); + dev_queue_read_ahead_path[sizeof(dev_queue_read_ahead_path) - 1] = '\0'; +} + +static unsigned long __thp_supported_orders(bool is_shmem) +{ + unsigned long orders = 0; + char path[PATH_MAX]; + char buf[256]; + int ret, i; + char anon_dir[] = "enabled"; + char shmem_dir[] = "shmem_enabled"; + + for (i = 0; i < NR_ORDERS; i++) { + ret = snprintf(path, PATH_MAX, THP_SYSFS "hugepages-%ukB/%s", + (getpagesize() >> 10) << i, is_shmem ? shmem_dir : anon_dir); + if (ret >= PATH_MAX) { + printf("%s: Pathname is too long\n", __func__); + exit(EXIT_FAILURE); + } + + ret = read_file(path, buf, sizeof(buf)); + if (ret) + orders |= 1UL << i; + } + + return orders; +} + +unsigned long thp_supported_orders(void) +{ + return __thp_supported_orders(false); +} + +unsigned long thp_shmem_supported_orders(void) +{ + return __thp_supported_orders(true); +} + +bool thp_available(void) +{ + if (access(THP_SYSFS, F_OK) != 0) + return false; + return true; +} + +bool thp_is_enabled(void) +{ + if (!thp_available()) + return false; + + int mode = thp_read_string("enabled", thp_enabled_strings); + + /* THP is considered enabled if it's either "always" or "madvise" */ + return mode == 1 || mode == 3; +} diff --git a/tools/testing/selftests/mm/hugepage_settings.h a/tools/testing/selftests/mm/hugepage_settings.h new file mode 100664 --- /dev/null +++ a/tools/testing/selftests/mm/hugepage_settings.h @@ -0,0 +1,89 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __HUGEPAGE_SETTINGS_H__ +#define __HUGEPAGE_SETTINGS_H__ + +#include +#include +#include + +enum thp_enabled { + THP_NEVER, + THP_ALWAYS, + THP_INHERIT, + THP_MADVISE, +}; + +enum thp_defrag { + THP_DEFRAG_ALWAYS, + THP_DEFRAG_DEFER, + THP_DEFRAG_DEFER_MADVISE, + THP_DEFRAG_MADVISE, + THP_DEFRAG_NEVER, +}; + +enum shmem_enabled { + SHMEM_NEVER, + SHMEM_ALWAYS, + SHMEM_WITHIN_SIZE, + SHMEM_ADVISE, + SHMEM_INHERIT, + SHMEM_DENY, + SHMEM_FORCE, +}; + +#define NR_ORDERS 20 + +struct hugepages_settings { + enum thp_enabled enabled; +}; + +struct khugepaged_settings { + bool defrag; + unsigned int alloc_sleep_millisecs; + unsigned int scan_sleep_millisecs; + unsigned int max_ptes_none; + unsigned int max_ptes_swap; + unsigned int max_ptes_shared; + unsigned long pages_to_scan; +}; + +struct shmem_hugepages_settings { + enum shmem_enabled enabled; +}; + +struct thp_settings { + enum thp_enabled thp_enabled; + enum thp_defrag thp_defrag; + enum shmem_enabled shmem_enabled; + bool use_zero_page; + struct khugepaged_settings khugepaged; + unsigned long read_ahead_kb; + struct hugepages_settings hugepages[NR_ORDERS]; + struct shmem_hugepages_settings shmem_hugepages[NR_ORDERS]; +}; + +int read_file(const char *path, char *buf, size_t buflen); +unsigned long read_num(const char *path); +void write_num(const char *path, unsigned long num); + +int thp_read_string(const char *name, const char * const strings[]); +void thp_write_string(const char *name, const char *val); +unsigned long thp_read_num(const char *name); +void thp_write_num(const char *name, unsigned long num); + +void thp_write_settings(struct thp_settings *settings); +void thp_read_settings(struct thp_settings *settings); +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); + +void thp_set_read_ahead_path(char *path); +unsigned long thp_supported_orders(void); +unsigned long thp_shmem_supported_orders(void); + +bool thp_available(void); +bool thp_is_enabled(void); + +#endif /* __HUGEPAGE_SETTINGS_H__ */ --- a/tools/testing/selftests/mm/khugepaged.c~selftests-mm-rename-thp_settings-to-hugepage_settings +++ a/tools/testing/selftests/mm/khugepaged.c @@ -22,7 +22,7 @@ #include "linux/magic.h" #include "vm_util.h" -#include "thp_settings.h" +#include "hugepage_settings.h" #define BASE_ADDR ((void *)(1UL << 30)) static unsigned long hpage_pmd_size; --- a/tools/testing/selftests/mm/ksm_tests.c~selftests-mm-rename-thp_settings-to-hugepage_settings +++ a/tools/testing/selftests/mm/ksm_tests.c @@ -15,7 +15,7 @@ #include "kselftest.h" #include #include "vm_util.h" -#include "thp_settings.h" +#include "hugepage_settings.h" #define KSM_SYSFS_PATH "/sys/kernel/mm/ksm/" #define KSM_FP(s) (KSM_SYSFS_PATH s) --- a/tools/testing/selftests/mm/Makefile~selftests-mm-rename-thp_settings-to-hugepage_settings +++ a/tools/testing/selftests/mm/Makefile @@ -187,8 +187,8 @@ TEST_FILES += write_hugetlb_memory.sh include ../lib.mk -$(TEST_GEN_PROGS): vm_util.c thp_settings.c -$(TEST_GEN_FILES): vm_util.c thp_settings.c +$(TEST_GEN_PROGS): vm_util.c hugepage_settings.c +$(TEST_GEN_FILES): vm_util.c hugepage_settings.c $(OUTPUT)/uffd-stress: uffd-common.c $(OUTPUT)/uffd-unit-tests: uffd-common.c --- a/tools/testing/selftests/mm/migration.c~selftests-mm-rename-thp_settings-to-hugepage_settings +++ a/tools/testing/selftests/mm/migration.c @@ -5,7 +5,7 @@ */ #include "kselftest_harness.h" -#include "thp_settings.h" +#include "hugepage_settings.h" #include #include --- a/tools/testing/selftests/mm/prctl_thp_disable.c~selftests-mm-rename-thp_settings-to-hugepage_settings +++ a/tools/testing/selftests/mm/prctl_thp_disable.c @@ -14,7 +14,7 @@ #include #include "kselftest_harness.h" -#include "thp_settings.h" +#include "hugepage_settings.h" #include "vm_util.h" #ifndef PR_THP_DISABLE_EXCEPT_ADVISED --- a/tools/testing/selftests/mm/soft-dirty.c~selftests-mm-rename-thp_settings-to-hugepage_settings +++ a/tools/testing/selftests/mm/soft-dirty.c @@ -9,7 +9,7 @@ #include "kselftest.h" #include "vm_util.h" -#include "thp_settings.h" +#include "hugepage_settings.h" #define PAGEMAP_FILE_PATH "/proc/self/pagemap" #define TEST_ITERATIONS 10000 --- a/tools/testing/selftests/mm/split_huge_page_test.c~selftests-mm-rename-thp_settings-to-hugepage_settings +++ a/tools/testing/selftests/mm/split_huge_page_test.c @@ -21,7 +21,7 @@ #include #include "vm_util.h" #include "kselftest.h" -#include "thp_settings.h" +#include "hugepage_settings.h" uint64_t pagesize; unsigned int pageshift; diff --git a/tools/testing/selftests/mm/thp_settings.c a/tools/testing/selftests/mm/thp_settings.c deleted file mode 100644 --- a/tools/testing/selftests/mm/thp_settings.c +++ /dev/null @@ -1,397 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include -#include -#include -#include -#include -#include -#include - -#include "vm_util.h" -#include "thp_settings.h" - -#define THP_SYSFS "/sys/kernel/mm/transparent_hugepage/" -#define MAX_SETTINGS_DEPTH 4 -static struct thp_settings settings_stack[MAX_SETTINGS_DEPTH]; -static int settings_index; -static struct thp_settings saved_settings; -static char dev_queue_read_ahead_path[PATH_MAX]; -static bool thp_settings_saved; - -static const char * const thp_enabled_strings[] = { - "never", - "always", - "inherit", - "madvise", - NULL -}; - -static const char * const thp_defrag_strings[] = { - "always", - "defer", - "defer+madvise", - "madvise", - "never", - NULL -}; - -static const char * const shmem_enabled_strings[] = { - "never", - "always", - "within_size", - "advise", - "inherit", - "deny", - "force", - NULL -}; - -int read_file(const char *path, char *buf, size_t buflen) -{ - int fd; - ssize_t numread; - - fd = open(path, O_RDONLY); - if (fd == -1) - return 0; - - numread = read(fd, buf, buflen - 1); - if (numread < 1) { - close(fd); - return 0; - } - - buf[numread] = '\0'; - close(fd); - - return (unsigned int) numread; -} - -unsigned long read_num(const char *path) -{ - char buf[21]; - - if (read_file(path, buf, sizeof(buf)) < 0) { - perror("read_file()"); - exit(EXIT_FAILURE); - } - - return strtoul(buf, NULL, 10); -} - -void write_num(const char *path, unsigned long num) -{ - char buf[21]; - - sprintf(buf, "%ld", num); - write_file(path, buf, strlen(buf) + 1); -} - -int thp_read_string(const char *name, const char * const strings[]) -{ - char path[PATH_MAX]; - char buf[256]; - char *c; - int ret; - - ret = snprintf(path, PATH_MAX, THP_SYSFS "%s", name); - if (ret >= PATH_MAX) { - printf("%s: Pathname is too long\n", __func__); - exit(EXIT_FAILURE); - } - - if (!read_file(path, buf, sizeof(buf))) { - perror(path); - exit(EXIT_FAILURE); - } - - c = strchr(buf, '['); - if (!c) { - printf("%s: Parse failure\n", __func__); - exit(EXIT_FAILURE); - } - - c++; - memmove(buf, c, sizeof(buf) - (c - buf)); - - c = strchr(buf, ']'); - if (!c) { - printf("%s: Parse failure\n", __func__); - exit(EXIT_FAILURE); - } - *c = '\0'; - - ret = 0; - while (strings[ret]) { - if (!strcmp(strings[ret], buf)) - return ret; - ret++; - } - - printf("Failed to parse %s\n", name); - exit(EXIT_FAILURE); -} - -void thp_write_string(const char *name, const char *val) -{ - char path[PATH_MAX]; - int ret; - - ret = snprintf(path, PATH_MAX, THP_SYSFS "%s", name); - if (ret >= PATH_MAX) { - printf("%s: Pathname is too long\n", __func__); - exit(EXIT_FAILURE); - } - write_file(path, val, strlen(val) + 1); -} - -unsigned long thp_read_num(const char *name) -{ - char path[PATH_MAX]; - int ret; - - ret = snprintf(path, PATH_MAX, THP_SYSFS "%s", name); - if (ret >= PATH_MAX) { - printf("%s: Pathname is too long\n", __func__); - exit(EXIT_FAILURE); - } - return read_num(path); -} - -void thp_write_num(const char *name, unsigned long num) -{ - char path[PATH_MAX]; - int ret; - - ret = snprintf(path, PATH_MAX, THP_SYSFS "%s", name); - if (ret >= PATH_MAX) { - printf("%s: Pathname is too long\n", __func__); - exit(EXIT_FAILURE); - } - write_num(path, num); -} - -void thp_read_settings(struct thp_settings *settings) -{ - unsigned long orders = thp_supported_orders(); - unsigned long shmem_orders = thp_shmem_supported_orders(); - char path[PATH_MAX]; - int i; - - *settings = (struct thp_settings) { - .thp_enabled = thp_read_string("enabled", thp_enabled_strings), - .thp_defrag = thp_read_string("defrag", thp_defrag_strings), - .shmem_enabled = - thp_read_string("shmem_enabled", shmem_enabled_strings), - .use_zero_page = thp_read_num("use_zero_page"), - }; - settings->khugepaged = (struct khugepaged_settings) { - .defrag = thp_read_num("khugepaged/defrag"), - .alloc_sleep_millisecs = - thp_read_num("khugepaged/alloc_sleep_millisecs"), - .scan_sleep_millisecs = - thp_read_num("khugepaged/scan_sleep_millisecs"), - .max_ptes_none = thp_read_num("khugepaged/max_ptes_none"), - .max_ptes_swap = thp_read_num("khugepaged/max_ptes_swap"), - .max_ptes_shared = thp_read_num("khugepaged/max_ptes_shared"), - .pages_to_scan = thp_read_num("khugepaged/pages_to_scan"), - }; - if (dev_queue_read_ahead_path[0]) - settings->read_ahead_kb = read_num(dev_queue_read_ahead_path); - - for (i = 0; i < NR_ORDERS; i++) { - if (!((1 << i) & orders)) { - settings->hugepages[i].enabled = THP_NEVER; - continue; - } - snprintf(path, PATH_MAX, "hugepages-%ukB/enabled", - (getpagesize() >> 10) << i); - settings->hugepages[i].enabled = - thp_read_string(path, thp_enabled_strings); - } - - for (i = 0; i < NR_ORDERS; i++) { - if (!((1 << i) & shmem_orders)) { - settings->shmem_hugepages[i].enabled = SHMEM_NEVER; - continue; - } - snprintf(path, PATH_MAX, "hugepages-%ukB/shmem_enabled", - (getpagesize() >> 10) << i); - settings->shmem_hugepages[i].enabled = - thp_read_string(path, shmem_enabled_strings); - } -} - -void thp_write_settings(struct thp_settings *settings) -{ - struct khugepaged_settings *khugepaged = &settings->khugepaged; - unsigned long orders = thp_supported_orders(); - unsigned long shmem_orders = thp_shmem_supported_orders(); - char path[PATH_MAX]; - int enabled; - int i; - - thp_write_string("enabled", thp_enabled_strings[settings->thp_enabled]); - thp_write_string("defrag", thp_defrag_strings[settings->thp_defrag]); - thp_write_string("shmem_enabled", - shmem_enabled_strings[settings->shmem_enabled]); - thp_write_num("use_zero_page", settings->use_zero_page); - - thp_write_num("khugepaged/defrag", khugepaged->defrag); - thp_write_num("khugepaged/alloc_sleep_millisecs", - khugepaged->alloc_sleep_millisecs); - thp_write_num("khugepaged/scan_sleep_millisecs", - khugepaged->scan_sleep_millisecs); - thp_write_num("khugepaged/max_ptes_none", khugepaged->max_ptes_none); - thp_write_num("khugepaged/max_ptes_swap", khugepaged->max_ptes_swap); - thp_write_num("khugepaged/max_ptes_shared", khugepaged->max_ptes_shared); - thp_write_num("khugepaged/pages_to_scan", khugepaged->pages_to_scan); - - if (dev_queue_read_ahead_path[0]) - write_num(dev_queue_read_ahead_path, settings->read_ahead_kb); - - for (i = 0; i < NR_ORDERS; i++) { - if (!((1 << i) & orders)) - continue; - snprintf(path, PATH_MAX, "hugepages-%ukB/enabled", - (getpagesize() >> 10) << i); - enabled = settings->hugepages[i].enabled; - thp_write_string(path, thp_enabled_strings[enabled]); - } - - for (i = 0; i < NR_ORDERS; i++) { - if (!((1 << i) & shmem_orders)) - continue; - snprintf(path, PATH_MAX, "hugepages-%ukB/shmem_enabled", - (getpagesize() >> 10) << i); - enabled = settings->shmem_hugepages[i].enabled; - thp_write_string(path, shmem_enabled_strings[enabled]); - } -} - -struct thp_settings *thp_current_settings(void) -{ - if (!settings_index) { - printf("Fail: No settings set"); - exit(EXIT_FAILURE); - } - return settings_stack + settings_index - 1; -} - -void thp_push_settings(struct thp_settings *settings) -{ - if (settings_index >= MAX_SETTINGS_DEPTH) { - printf("Fail: Settings stack exceeded"); - exit(EXIT_FAILURE); - } - settings_stack[settings_index++] = *settings; - thp_write_settings(thp_current_settings()); -} - -void thp_pop_settings(void) -{ - if (settings_index <= 0) { - printf("Fail: Settings stack empty"); - exit(EXIT_FAILURE); - } - --settings_index; - thp_write_settings(thp_current_settings()); -} - -void thp_restore_settings(void) -{ - if (thp_settings_saved) - thp_write_settings(&saved_settings); -} - -static void thp_restore_settings_atexit(void) -{ - thp_restore_settings(); -} - -static void thp_restore_settings_sighandler(int sig) -{ - /* exit() will invoke the thp_restore_settings_atexit handler. */ - exit(KSFT_FAIL); -} - -void thp_save_settings(void) -{ - thp_read_settings(&saved_settings); - thp_settings_saved = true; - - /* - * 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); -} - -void thp_set_read_ahead_path(char *path) -{ - if (!path) { - dev_queue_read_ahead_path[0] = '\0'; - return; - } - - strncpy(dev_queue_read_ahead_path, path, - sizeof(dev_queue_read_ahead_path)); - dev_queue_read_ahead_path[sizeof(dev_queue_read_ahead_path) - 1] = '\0'; -} - -static unsigned long __thp_supported_orders(bool is_shmem) -{ - unsigned long orders = 0; - char path[PATH_MAX]; - char buf[256]; - int ret, i; - char anon_dir[] = "enabled"; - char shmem_dir[] = "shmem_enabled"; - - for (i = 0; i < NR_ORDERS; i++) { - ret = snprintf(path, PATH_MAX, THP_SYSFS "hugepages-%ukB/%s", - (getpagesize() >> 10) << i, is_shmem ? shmem_dir : anon_dir); - if (ret >= PATH_MAX) { - printf("%s: Pathname is too long\n", __func__); - exit(EXIT_FAILURE); - } - - ret = read_file(path, buf, sizeof(buf)); - if (ret) - orders |= 1UL << i; - } - - return orders; -} - -unsigned long thp_supported_orders(void) -{ - return __thp_supported_orders(false); -} - -unsigned long thp_shmem_supported_orders(void) -{ - return __thp_supported_orders(true); -} - -bool thp_available(void) -{ - if (access(THP_SYSFS, F_OK) != 0) - return false; - return true; -} - -bool thp_is_enabled(void) -{ - if (!thp_available()) - return false; - - int mode = thp_read_string("enabled", thp_enabled_strings); - - /* THP is considered enabled if it's either "always" or "madvise" */ - return mode == 1 || mode == 3; -} diff --git a/tools/testing/selftests/mm/thp_settings.h a/tools/testing/selftests/mm/thp_settings.h deleted file mode 100644 --- a/tools/testing/selftests/mm/thp_settings.h +++ /dev/null @@ -1,89 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __THP_SETTINGS_H__ -#define __THP_SETTINGS_H__ - -#include -#include -#include - -enum thp_enabled { - THP_NEVER, - THP_ALWAYS, - THP_INHERIT, - THP_MADVISE, -}; - -enum thp_defrag { - THP_DEFRAG_ALWAYS, - THP_DEFRAG_DEFER, - THP_DEFRAG_DEFER_MADVISE, - THP_DEFRAG_MADVISE, - THP_DEFRAG_NEVER, -}; - -enum shmem_enabled { - SHMEM_NEVER, - SHMEM_ALWAYS, - SHMEM_WITHIN_SIZE, - SHMEM_ADVISE, - SHMEM_INHERIT, - SHMEM_DENY, - SHMEM_FORCE, -}; - -#define NR_ORDERS 20 - -struct hugepages_settings { - enum thp_enabled enabled; -}; - -struct khugepaged_settings { - bool defrag; - unsigned int alloc_sleep_millisecs; - unsigned int scan_sleep_millisecs; - unsigned int max_ptes_none; - unsigned int max_ptes_swap; - unsigned int max_ptes_shared; - unsigned long pages_to_scan; -}; - -struct shmem_hugepages_settings { - enum shmem_enabled enabled; -}; - -struct thp_settings { - enum thp_enabled thp_enabled; - enum thp_defrag thp_defrag; - enum shmem_enabled shmem_enabled; - bool use_zero_page; - struct khugepaged_settings khugepaged; - unsigned long read_ahead_kb; - struct hugepages_settings hugepages[NR_ORDERS]; - struct shmem_hugepages_settings shmem_hugepages[NR_ORDERS]; -}; - -int read_file(const char *path, char *buf, size_t buflen); -unsigned long read_num(const char *path); -void write_num(const char *path, unsigned long num); - -int thp_read_string(const char *name, const char * const strings[]); -void thp_write_string(const char *name, const char *val); -unsigned long thp_read_num(const char *name); -void thp_write_num(const char *name, unsigned long num); - -void thp_write_settings(struct thp_settings *settings); -void thp_read_settings(struct thp_settings *settings); -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); - -void thp_set_read_ahead_path(char *path); -unsigned long thp_supported_orders(void); -unsigned long thp_shmem_supported_orders(void); - -bool thp_available(void); -bool thp_is_enabled(void); - -#endif /* __THP_SETTINGS_H__ */ --- a/tools/testing/selftests/mm/transhuge-stress.c~selftests-mm-rename-thp_settings-to-hugepage_settings +++ a/tools/testing/selftests/mm/transhuge-stress.c @@ -17,7 +17,7 @@ #include #include "vm_util.h" #include "kselftest.h" -#include "thp_settings.h" +#include "hugepage_settings.h" int backing_fd = -1; int mmap_flags = MAP_ANONYMOUS | MAP_NORESERVE | MAP_PRIVATE; --- a/tools/testing/selftests/mm/uffd-wp-mremap.c~selftests-mm-rename-thp_settings-to-hugepage_settings +++ a/tools/testing/selftests/mm/uffd-wp-mremap.c @@ -8,7 +8,7 @@ #include #include #include "kselftest.h" -#include "thp_settings.h" +#include "hugepage_settings.h" #include "uffd-common.h" static int pagemap_fd; _ Patches currently in -mm which might be from rppt@kernel.org are