selftests-mm-remove-read_only_thp_for_fs-in-khugepaged.patch removed from -mm tree
The quilt patch titled
Subject: selftests/mm: remove READ_ONLY_THP_FOR_FS in khugepaged
has been removed from the -mm tree. Its filename was
selftests-mm-remove-read_only_thp_for_fs-in-khugepaged.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: Zi Yan <[email protected]>
Subject: selftests/mm: remove READ_ONLY_THP_FOR_FS in khugepaged
Date: Sun, 17 May 2026 09:54:13 -0400
Change the requirement to a file system with large folio support and the supported order needs to include PMD_ORDER.
Also add tests of opening a file with read write permission and populating folios with writes. Reuse the XFS image from split_huge_page_test.
---
tools/testing/selftests/mm/khugepaged.c | 125 +++++++++++++------- tools/testing/selftests/mm/run_vmtests.sh | 12 + 2 files changed, 96 insertions(+), 41 deletions(-)
tools/testing/selftests/mm/khugepaged.c renamed from tools/testing/selftests/mm/khugepaged.c~selftests-mm-remove-read_only_thp_for_fs-in-khugepaged +86 -39
@@ -49,7 +49,8 @@ struct mem_ops {const char *name; }; -static struct mem_ops *file_ops; +static struct mem_ops *read_only_file_ops; +static struct mem_ops *read_write_file_ops;static struct mem_ops *anon_ops;static struct mem_ops *shmem_ops;
@@ -112,7 +113,8 @@ static void restore_settings(int sig)static void save_settings (void ) {printf ("Save THP and khugepaged settings..." ); -if (file_ops && finfo.type ==VMA_FILE ) +if ((read_only_file_ops || read_write_file_ops) && + finfo.type ==VMA_FILE )thp_set_read_ahead_path (finfo.dev_queue_read_ahead_path);thp_save_settings ();
@@ -364,8 +366,10 @@ static bool anon_check_huge(void *addr,return check_huge_anon (addr, nr_hpages, hpage_pmd_size); } -static void *file_setup_area (int nr_hpages) +static void *file_setup_area_common (int nr_hpages,bool read_only) { +const int open_opt = read_only ?O_RDONLY :O_RDWR ; +const int mmap_prot = read_only ?PROT_READ : (PROT_READ |PROT_WRITE );int fd;void *p;unsigned long size;
@@ -400,14 +404,14 @@ static void *file_setup_area(int nr_hpagmunmap (p, size);success ("OK" ); -printf ("Opening %s read only for collapse..." , finfo.path); - finfo.fd =open (finfo.path,O_RDONLY ,777 ); +printf ("Opening %s %s for collapse..." , finfo.path, + read_only ?"read-only" :"read-write" ); + finfo.fd =open (finfo.path, open_opt,777 );if (finfo.fd <0 ) {perror ("open()" );exit (EXIT_FAILURE ); } - p =mmap (BASE_ADDR , size,PROT_READ , -MAP_PRIVATE , finfo.fd,0 ); + p =mmap (BASE_ADDR , size, mmap_prot,MAP_SHARED , finfo.fd,0 );if (p ==MAP_FAILED || p !=BASE_ADDR ) {perror ("mmap()" );exit (EXIT_FAILURE );
@@ -419,6 +423,16 @@ static void *file_setup_area(int nr_hpagreturn p; } +static void *file_setup_read_only_area (int nr_hpages) +{ +return file_setup_area_common (nr_hpages,/* read_only= */ true); +} + +static void *file_setup_read_write_area (int nr_hpages) +{ +return file_setup_area_common (nr_hpages,/* read_only= */ false); +} +static void file_cleanup_area (void *p,unsigned long size) {munmap (p, size);
@@ -426,10 +440,18 @@ static void file_cleanup_area(void *p, uunlink (finfo.path); } -static void file_fault (void *p,unsigned long start,unsigned long end) +static void file_fault_read (void *p,unsigned long start,unsigned long end) {if (madvise (((char *)p) + start, end - start,MADV_POPULATE_READ )) { -perror ("madvise(MADV_POPULATE_READ" ); +perror ("madvise(MADV_POPULATE_READ)" ); +exit (EXIT_FAILURE ); + } +} + +static void file_fault_write (void *p,unsigned long start,unsigned long end) +{ +if (madvise (((char *)p) + start, end - start,MADV_POPULATE_WRITE )) { +perror ("madvise(MADV_POPULATE_WRITE)" );exit (EXIT_FAILURE ); } }
@@ -489,10 +511,18 @@ static struct mem_ops __anon_ops = { .name = "anon", }; -static struct mem_ops __file_ops = { - .setup_area = &file_setup_area, +static struct mem_ops __read_only_file_ops = { + .setup_area = &file_setup_read_only_area, .cleanup_area = &file_cleanup_area, - .fault = &file_fault, + .fault = &file_fault_read, + .check_huge = &file_check_huge, + .name ="file" , +}; + +static struct mem_ops __read_write_file_ops = { + .setup_area = &file_setup_read_write_area, + .cleanup_area = &file_cleanup_area, + .fault = &file_fault_write, .check_huge = &file_check_huge, .name ="file" , };
@@ -505,6 +535,17 @@ static struct mem_ops __shmem_ops = { .name = "shmem", }; +static bool is_tmpfs (struct mem_ops *ops) +{ +return (ops == &__read_only_file_ops || ops == &__read_write_file_ops) && + finfo.type ==VMA_SHMEM ; +} + +static bool is_anon (struct mem_ops *ops) +{ +return ops == &__anon_ops; +} +static void __madvise_collapse (const char *msg,char *p,int nr_hpages,struct mem_ops *ops,bool expect) {
@@ -513,6 +554,10 @@ static void __madvise_collapse(const chaprintf ("%s..." , msg); +/* read&write file collapse always fail */ +if (!is_tmpfs (ops) && ops == &__read_write_file_ops) + expect = false; +/* * Prevent khugepaged interference and tests that MADV_COLLAPSE * ignores /sys/kernel/mm/transparent_hugepage/enabled
@@ -579,6 +624,10 @@ static bool wait_for_scan(const char *msstatic void khugepaged_collapse (const char *msg,char *p,int nr_hpages,struct mem_ops *ops,bool expect) { +/* read&write file collapse always fail */ +if (!is_tmpfs (ops) && ops == &__read_write_file_ops) + expect = false; +if (wait_for_scan (msg, p, nr_hpages, ops)) {if (expect)fail ("Timeout" );
@@ -613,16 +662,6 @@ static struct collapse_context __madvise .name = "madvise", }; -static bool is_tmpfs (struct mem_ops *ops) -{ -return ops == &__file_ops && finfo.type ==VMA_SHMEM ; -} - -static bool is_anon (struct mem_ops *ops) -{ -return ops == &__anon_ops; -} -static void alloc_at_fault (void ) {struct thp_settings settings = *thp_current_settings ();
@@ -1098,8 +1137,8 @@ static void usage(void)fprintf (stderr,"\t<context>\t: [all|khugepaged|madvise]\n" );fprintf (stderr,"\t<mem_type>\t: [all|anon|file|shmem]\n" );fprintf (stderr,"\n\t\"file,all\" mem_type requires [dir] argument\n" ); -fprintf (stderr,"\n\t\"file,all\" mem_type requires kernel built with\n" ); -fprintf (stderr,"\tCONFIG_READ_ONLY_THP_FOR_FS=y\n" ); +fprintf (stderr,"\n\t\"file,all\" mem_type requires a file system\n" ); +fprintf (stderr,"\twith PMD-sized large folio support\n" );fprintf (stderr,"\n\tif [dir] is a (sub)directory of a tmpfs mount, tmpfs must be\n" );fprintf (stderr,"\tmounted with huge=advise option for khugepaged tests to work\n" );fprintf (stderr,"\n\tSupported Options:\n" );
@@ -1155,20 +1194,22 @@ static void parse_test_type(int argc, chusage ();if (!strcmp (buf,"all" )) { - file_ops = &__file_ops; + read_only_file_ops = &__read_only_file_ops; + read_write_file_ops = &__read_write_file_ops; anon_ops = &__anon_ops; shmem_ops = &__shmem_ops; }else if (!strcmp (buf,"anon" )) { anon_ops = &__anon_ops; }else if (!strcmp (buf,"file" )) { - file_ops = &__file_ops; + read_only_file_ops = &__read_only_file_ops; + read_write_file_ops = &__read_write_file_ops; }else if (!strcmp (buf,"shmem" )) { shmem_ops = &__shmem_ops; }else {usage (); } -if (!file_ops) +if (!read_only_file_ops && !read_write_file_ops)return ;if (argc !=2 )
@@ -1240,37 +1281,43 @@ int main(int argc, char **argv) }while (0 )TEST (collapse_full, khugepaged_context, anon_ops); -TEST (collapse_full, khugepaged_context, file_ops); +TEST (collapse_full, khugepaged_context, read_only_file_ops); +TEST (collapse_full, khugepaged_context, read_write_file_ops);TEST (collapse_full, khugepaged_context, shmem_ops);TEST (collapse_full, madvise_context, anon_ops); -TEST (collapse_full, madvise_context, file_ops); +TEST (collapse_full, madvise_context, read_only_file_ops); +TEST (collapse_full, madvise_context, read_write_file_ops);TEST (collapse_full, madvise_context, shmem_ops);TEST (collapse_empty, khugepaged_context, anon_ops);TEST (collapse_empty, madvise_context, anon_ops);TEST (collapse_single_pte_entry, khugepaged_context, anon_ops); -TEST (collapse_single_pte_entry, khugepaged_context, file_ops); +TEST (collapse_single_pte_entry, khugepaged_context, read_only_file_ops); +TEST (collapse_single_pte_entry, khugepaged_context, read_write_file_ops);TEST (collapse_single_pte_entry, khugepaged_context, shmem_ops);TEST (collapse_single_pte_entry, madvise_context, anon_ops); -TEST (collapse_single_pte_entry, madvise_context, file_ops); +TEST (collapse_single_pte_entry, madvise_context, read_only_file_ops); +TEST (collapse_single_pte_entry, madvise_context, read_write_file_ops);TEST (collapse_single_pte_entry, madvise_context, shmem_ops);TEST (collapse_max_ptes_none, khugepaged_context, anon_ops); -TEST (collapse_max_ptes_none, khugepaged_context, file_ops); +TEST (collapse_max_ptes_none, khugepaged_context, read_only_file_ops); +TEST (collapse_max_ptes_none, khugepaged_context, read_write_file_ops);TEST (collapse_max_ptes_none, madvise_context, anon_ops); -TEST (collapse_max_ptes_none, madvise_context, file_ops); +TEST (collapse_max_ptes_none, madvise_context, read_only_file_ops); +TEST (collapse_max_ptes_none, madvise_context, read_write_file_ops);TEST (collapse_single_pte_entry_compound, khugepaged_context, anon_ops); -TEST (collapse_single_pte_entry_compound, khugepaged_context, file_ops); +TEST (collapse_single_pte_entry_compound, khugepaged_context, read_only_file_ops);TEST (collapse_single_pte_entry_compound, madvise_context, anon_ops); -TEST (collapse_single_pte_entry_compound, madvise_context, file_ops); +TEST (collapse_single_pte_entry_compound, madvise_context, read_only_file_ops);TEST (collapse_full_of_compound, khugepaged_context, anon_ops); -TEST (collapse_full_of_compound, khugepaged_context, file_ops); +TEST (collapse_full_of_compound, khugepaged_context, read_only_file_ops);TEST (collapse_full_of_compound, khugepaged_context, shmem_ops);TEST (collapse_full_of_compound, madvise_context, anon_ops); -TEST (collapse_full_of_compound, madvise_context, file_ops); +TEST (collapse_full_of_compound, madvise_context, read_only_file_ops);TEST (collapse_full_of_compound, madvise_context, shmem_ops);TEST (collapse_compound_extreme, khugepaged_context, anon_ops);
@@ -1292,10 +1339,10 @@ int main(int argc, char **argv)TEST (collapse_max_ptes_shared, madvise_context, anon_ops);TEST (madvise_collapse_existing_thps, madvise_context, anon_ops); -TEST (madvise_collapse_existing_thps, madvise_context, file_ops); +TEST (madvise_collapse_existing_thps, madvise_context, read_only_file_ops);TEST (madvise_collapse_existing_thps, madvise_context, shmem_ops); -TEST (madvise_retracted_page_tables, madvise_context, file_ops); +TEST (madvise_retracted_page_tables, madvise_context, read_only_file_ops);TEST (madvise_retracted_page_tables, madvise_context, shmem_ops);restore_settings (0 );
tools/testing/selftests/mm/run_vmtests.sh renamed from tools/testing/selftests/mm/run_vmtests.sh~selftests-mm-remove-read_only_thp_for_fs-in-khugepaged +10 -2
@@ -490,8 +490,6 @@ CATEGORY="thp" run_test ./khugepaged all CATEGORY="thp" run_test ./khugepaged -s 4 all:shmem -CATEGORY="thp" run_test ./transhuge-stress -d 20 - # Try to create XFS if not provided if [ -z "${SPLIT_HUGE_PAGE_TEST_XFS_PATH}" ]; then if [ "${HAVE_HUGEPAGES}" = "1" ]; then
@@ -508,6 +506,14 @@ if [ -z "${SPLIT_HUGE_PAGE_TEST_XFS_PATH fi fi +if [ -n "${SPLIT_HUGE_PAGE_TEST_XFS_PATH}" ]; then +CATEGORY="thp" run_test ./khugepaged all:file ${SPLIT_HUGE_PAGE_TEST_XFS_PATH} +elif test_selected thp; then + count_total=$(( count_total + 1 )) + count_skip=$(( count_skip + 1 )) + echo "[SKIP] ./khugepaged all:file" | tap_prefix +fi + CATEGORY="thp" run_test ./split_huge_page_test ${SPLIT_HUGE_PAGE_TEST_XFS_PATH} if [ -n "${MOUNTED_XFS}" ]; then
@@ -516,6 +522,8 @@ if [ -n "${MOUNTED_XFS}" ]; then rm -f ${XFS_IMG} fi +CATEGORY="thp" run_test ./transhuge-stress -d 20 + CATEGORY="thp" run_test ./folio_split_race_test CATEGORY="migration" run_test ./migration
_
Patches currently in -mm which might be from [email protected] are