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 8F98C368D65 for ; Sun, 21 Jun 2026 18:39:08 +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=1782067150; cv=none; b=ZOfOwsxU+hCv5dvdTa98hB9H2qhaX0MAUowyN7pS+Dyslng4kxZq+bdxAlJNlw6K4lrpnnqRPKAAP7Tc6AgazCO2Brwb7YGvPPp86PoMJGgKri1+kSm9gpHAcAmNGBD1mNOgNXtWDODkkkbwMF4c06wBvJ7h4Nq6Docqn8lrYcs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782067150; c=relaxed/simple; bh=H0HE5CV6agCt+q3JSHGFWYNBIGCFT1d1+2PbEPlxdXw=; h=Date:To:From:Subject:Message-Id; b=RYbwP1n9OVI7mZx64jmfdXW663o2VPucLF8h3glxxe53FsTMDtwCWmLxACIX0ewF9UrT6g0YFlwLz3MNfL/rd0axfMavXK7BzDUnAldpPbmXPkzJ/LGvGdAf0nqcc307ZZ1MAWjuuI30wHZ49DvL8pIVXOT4uc0O0qppcBi4L10= 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=rRdve+na; 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="rRdve+na" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 687D51F000E9; Sun, 21 Jun 2026 18:39:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=korg; t=1782067148; bh=GQwQ7EkRIku671n+YqAGPM6JG0+y7jz8Ee5DbcwFNpo=; h=Date:To:From:Subject; b=rRdve+naTmLzXW+m4QLbjzRiywqLQf3yFSvIGKekuCqpnC20yfyPG+0x4jL6dbetu ymjBr7PqlLlOoqzafO6LhO8ZIUappLGWl7QTGpGVohukb7/mQTvVQhGW6gZSXGCbaZ ZlDGVRP3qnrLFOnA2DdM4H1+z6NhlFmwfLvEOsVo= Date: Sun, 21 Jun 2026 11:39:08 -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-move-hugetlb-helpers-to-hugepage_settings.patch removed from -mm tree Message-Id: <20260621183908.687D51F000E9@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: move HugeTLB helpers to hugepage_settings has been removed from the -mm tree. Its filename was selftests-mm-move-hugetlb-helpers-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: move HugeTLB helpers to hugepage_settings Date: Mon, 11 May 2026 19:28:08 +0300 Move library functions that abstract HugeTLB /proc and /sysfs access from vm_util to hugepage_settings. This will help creating common helpers that save and restore HugeTLB and THP settings. Link: https://lore.kernel.org/20260511162840.375890-25-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/gup_longterm.c | 1 tools/testing/selftests/mm/hmm-tests.c | 2 tools/testing/selftests/mm/hugepage_settings.c | 68 ++++++++++ tools/testing/selftests/mm/hugepage_settings.h | 8 + tools/testing/selftests/mm/hugetlb-madvise.c | 1 tools/testing/selftests/mm/hugetlb-mmap.c | 1 tools/testing/selftests/mm/hugetlb-vmemmap.c | 1 tools/testing/selftests/mm/hugetlb_dio.c | 1 tools/testing/selftests/mm/hugetlb_fault_after_madv.c | 1 tools/testing/selftests/mm/hugetlb_madv_vs_map.c | 1 tools/testing/selftests/mm/protection_keys.c | 1 tools/testing/selftests/mm/thuge-gen.c | 1 tools/testing/selftests/mm/uffd-common.h | 1 tools/testing/selftests/mm/va_high_addr_switch.c | 1 tools/testing/selftests/mm/vm_util.c | 67 --------- tools/testing/selftests/mm/vm_util.h | 3 16 files changed, 88 insertions(+), 71 deletions(-) --- a/tools/testing/selftests/mm/gup_longterm.c~selftests-mm-move-hugetlb-helpers-to-hugepage_settings +++ a/tools/testing/selftests/mm/gup_longterm.c @@ -29,6 +29,7 @@ #include "../../../../mm/gup_test.h" #include "kselftest.h" #include "vm_util.h" +#include "hugepage_settings.h" static size_t pagesize; static int nr_hugetlbsizes; --- a/tools/testing/selftests/mm/hmm-tests.c~selftests-mm-move-hugetlb-helpers-to-hugepage_settings +++ a/tools/testing/selftests/mm/hmm-tests.c @@ -11,6 +11,7 @@ */ #include "kselftest_harness.h" +#include "hugepage_settings.h" #include #include @@ -27,7 +28,6 @@ #include #include - /* * This is a private UAPI to the kernel test module so it isn't exported * in the usual include/uapi/... directory. --- a/tools/testing/selftests/mm/hugepage_settings.c~selftests-mm-move-hugetlb-helpers-to-hugepage_settings +++ a/tools/testing/selftests/mm/hugepage_settings.c @@ -1,7 +1,9 @@ // SPDX-License-Identifier: GPL-2.0 +#include #include #include #include +#include #include #include #include @@ -395,3 +397,69 @@ bool thp_is_enabled(void) /* THP is considered enabled if it's either "always" or "madvise" */ return mode == 1 || mode == 3; } + +int detect_hugetlb_page_sizes(size_t sizes[], int max) +{ + DIR *dir = opendir("/sys/kernel/mm/hugepages/"); + int count = 0; + + if (!dir) + return 0; + + while (count < max) { + struct dirent *entry = readdir(dir); + size_t kb; + + if (!entry) + break; + if (entry->d_type != DT_DIR) + continue; + if (sscanf(entry->d_name, "hugepages-%zukB", &kb) != 1) + continue; + sizes[count++] = kb * 1024; + ksft_print_msg("[INFO] detected hugetlb page size: %zu KiB\n", + kb); + } + closedir(dir); + return count; +} + +unsigned long default_huge_page_size(void) +{ + unsigned long hps = 0; + char *line = NULL; + size_t linelen = 0; + FILE *f = fopen("/proc/meminfo", "r"); + + if (!f) + return 0; + while (getline(&line, &linelen, f) > 0) { + if (sscanf(line, "Hugepagesize: %lu kB", &hps) == 1) { + hps <<= 10; + break; + } + } + + free(line); + fclose(f); + return hps; +} + +unsigned long get_free_hugepages(void) +{ + unsigned long fhp = 0; + char *line = NULL; + size_t linelen = 0; + FILE *f = fopen("/proc/meminfo", "r"); + + if (!f) + return fhp; + while (getline(&line, &linelen, f) > 0) { + if (sscanf(line, "HugePages_Free: %lu", &fhp) == 1) + break; + } + + free(line); + fclose(f); + return fhp; +} --- a/tools/testing/selftests/mm/hugepage_settings.h~selftests-mm-move-hugetlb-helpers-to-hugepage_settings +++ a/tools/testing/selftests/mm/hugepage_settings.h @@ -6,6 +6,8 @@ #include #include +/* Transparent Huge Pages (THP) */ + enum thp_enabled { THP_NEVER, THP_ALWAYS, @@ -86,4 +88,10 @@ unsigned long thp_shmem_supported_orders bool thp_available(void); bool thp_is_enabled(void); +/* HugeTLB */ + +int detect_hugetlb_page_sizes(size_t sizes[], int max); +unsigned long default_huge_page_size(void); +unsigned long get_free_hugepages(void); + #endif /* __HUGEPAGE_SETTINGS_H__ */ --- a/tools/testing/selftests/mm/hugetlb_dio.c~selftests-mm-move-hugetlb-helpers-to-hugepage_settings +++ a/tools/testing/selftests/mm/hugetlb_dio.c @@ -20,6 +20,7 @@ #include #include "vm_util.h" #include "kselftest.h" +#include "hugepage_settings.h" #ifndef STATX_DIOALIGN #define STATX_DIOALIGN 0x00002000U --- a/tools/testing/selftests/mm/hugetlb_fault_after_madv.c~selftests-mm-move-hugetlb-helpers-to-hugepage_settings +++ a/tools/testing/selftests/mm/hugetlb_fault_after_madv.c @@ -10,6 +10,7 @@ #include "vm_util.h" #include "kselftest.h" +#include "hugepage_settings.h" #define INLOOP_ITER 100 --- a/tools/testing/selftests/mm/hugetlb-madvise.c~selftests-mm-move-hugetlb-helpers-to-hugepage_settings +++ a/tools/testing/selftests/mm/hugetlb-madvise.c @@ -20,6 +20,7 @@ #include #include "vm_util.h" #include "kselftest.h" +#include "hugepage_settings.h" #define MIN_FREE_PAGES 20 #define NR_HUGE_PAGES 10 /* common number of pages to map/allocate */ --- a/tools/testing/selftests/mm/hugetlb_madv_vs_map.c~selftests-mm-move-hugetlb-helpers-to-hugepage_settings +++ a/tools/testing/selftests/mm/hugetlb_madv_vs_map.c @@ -25,6 +25,7 @@ #include #include "vm_util.h" +#include "hugepage_settings.h" #define INLOOP_ITER 100 --- a/tools/testing/selftests/mm/hugetlb-mmap.c~selftests-mm-move-hugetlb-helpers-to-hugepage_settings +++ a/tools/testing/selftests/mm/hugetlb-mmap.c @@ -18,6 +18,7 @@ #include #include "vm_util.h" #include "kselftest.h" +#include "hugepage_settings.h" #define LENGTH (256UL*1024*1024) #define PROTECTION (PROT_READ | PROT_WRITE) --- a/tools/testing/selftests/mm/hugetlb-vmemmap.c~selftests-mm-move-hugetlb-helpers-to-hugepage_settings +++ a/tools/testing/selftests/mm/hugetlb-vmemmap.c @@ -11,6 +11,7 @@ #include #include #include "vm_util.h" +#include "hugepage_settings.h" #define PAGE_COMPOUND_HEAD (1UL << 15) #define PAGE_COMPOUND_TAIL (1UL << 16) --- a/tools/testing/selftests/mm/protection_keys.c~selftests-mm-move-hugetlb-helpers-to-hugepage_settings +++ a/tools/testing/selftests/mm/protection_keys.c @@ -46,6 +46,7 @@ #include #include +#include "hugepage_settings.h" #include "pkey-helpers.h" int iteration_nr = 1; --- a/tools/testing/selftests/mm/thuge-gen.c~selftests-mm-move-hugetlb-helpers-to-hugepage_settings +++ a/tools/testing/selftests/mm/thuge-gen.c @@ -28,6 +28,7 @@ #include #include "vm_util.h" #include "kselftest.h" +#include "hugepage_settings.h" #if !defined(MAP_HUGETLB) #define MAP_HUGETLB 0x40000 --- a/tools/testing/selftests/mm/uffd-common.h~selftests-mm-move-hugetlb-helpers-to-hugepage_settings +++ a/tools/testing/selftests/mm/uffd-common.h @@ -37,6 +37,7 @@ #include "kselftest.h" #include "vm_util.h" +#include "hugepage_settings.h" #define UFFD_FLAGS (O_CLOEXEC | O_NONBLOCK | UFFD_USER_MODE_ONLY) --- a/tools/testing/selftests/mm/va_high_addr_switch.c~selftests-mm-move-hugetlb-helpers-to-hugepage_settings +++ a/tools/testing/selftests/mm/va_high_addr_switch.c @@ -11,6 +11,7 @@ #include "vm_util.h" #include "kselftest.h" +#include "hugepage_settings.h" /* * The hint addr value is used to allocate addresses --- a/tools/testing/selftests/mm/vm_util.c~selftests-mm-move-hugetlb-helpers-to-hugepage_settings +++ a/tools/testing/selftests/mm/vm_util.c @@ -2,7 +2,6 @@ #include #include #include -#include #include #include #include @@ -291,53 +290,6 @@ int64_t allocate_transhuge(void *ptr, in return -1; } -unsigned long default_huge_page_size(void) -{ - unsigned long hps = 0; - char *line = NULL; - size_t linelen = 0; - FILE *f = fopen("/proc/meminfo", "r"); - - if (!f) - return 0; - while (getline(&line, &linelen, f) > 0) { - if (sscanf(line, "Hugepagesize: %lu kB", &hps) == 1) { - hps <<= 10; - break; - } - } - - free(line); - fclose(f); - return hps; -} - -int detect_hugetlb_page_sizes(size_t sizes[], int max) -{ - DIR *dir = opendir("/sys/kernel/mm/hugepages/"); - int count = 0; - - if (!dir) - return 0; - - while (count < max) { - struct dirent *entry = readdir(dir); - size_t kb; - - if (!entry) - break; - if (entry->d_type != DT_DIR) - continue; - if (sscanf(entry->d_name, "hugepages-%zukB", &kb) != 1) - continue; - sizes[count++] = kb * 1024; - ksft_print_msg("[INFO] detected hugetlb page size: %zu KiB\n", - kb); - } - closedir(dir); - return count; -} - int pageflags_get(unsigned long pfn, int kpageflags_fd, uint64_t *flags) { size_t count; @@ -396,25 +348,6 @@ int uffd_unregister(int uffd, void *addr return ret; } -unsigned long get_free_hugepages(void) -{ - unsigned long fhp = 0; - char *line = NULL; - size_t linelen = 0; - FILE *f = fopen("/proc/meminfo", "r"); - - if (!f) - return fhp; - while (getline(&line, &linelen, f) > 0) { - if (sscanf(line, "HugePages_Free: %lu", &fhp) == 1) - break; - } - - free(line); - fclose(f); - return fhp; -} - static bool check_vmflag(void *addr, const char *flag) { char buffer[MAX_LINE_LENGTH]; --- a/tools/testing/selftests/mm/vm_util.h~selftests-mm-move-hugetlb-helpers-to-hugepage_settings +++ a/tools/testing/selftests/mm/vm_util.h @@ -94,8 +94,6 @@ bool check_huge_anon(void *addr, int nr_ bool check_huge_file(void *addr, int nr_hpages, uint64_t hpage_size); bool check_huge_shmem(void *addr, int nr_hpages, uint64_t hpage_size); int64_t allocate_transhuge(void *ptr, int pagemap_fd); -unsigned long default_huge_page_size(void); -int detect_hugetlb_page_sizes(size_t sizes[], int max); int pageflags_get(unsigned long pfn, int kpageflags_fd, uint64_t *flags); int uffd_register(int uffd, void *addr, uint64_t len, @@ -103,7 +101,6 @@ int uffd_register(int uffd, void *addr, int uffd_unregister(int uffd, void *addr, uint64_t len); int uffd_register_with_ioctls(int uffd, void *addr, uint64_t len, bool miss, bool wp, bool minor, uint64_t *ioctls); -unsigned long get_free_hugepages(void); bool check_vmflag_io(void *addr); bool check_vmflag_pfnmap(void *addr); bool check_vmflag_guard(void *addr); _ Patches currently in -mm which might be from rppt@kernel.org are