selftests-vm-add-file-shmem-madv_collapse-selftest-for-cleared-pmd.patch removed from -mm tree
The quilt patch titled
Subject: selftests/vm: add file/shmem MADV_COLLAPSE selftest for cleared pmd
has been removed from the -mm tree. Its filename was
selftests-vm-add-file-shmem-madv_collapse-selftest-for-cleared-pmd.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: "Zach O'Keefe" <[email protected]>
Subject: selftests/vm: add file/shmem MADV_COLLAPSE selftest for cleared pmd
Date: Thu, 22 Sep 2022 15:40:45 -0700
This test tests that MADV_COLLAPSE acting on file/shmem memory for which
(1) the file extent mapping by the memory is already a huge page in the page cache, and (2) the pmd mapping this memory in the target process is none.
In practice, (1)+(2) is the state left over after khugepaged has successfully collapsed file/shmem memory for a target VMA, but the memory has not yet been refaulted. So, this test in-effect tests MADV_COLLAPSE racing with khugepaged to collapse the memory first.
---
tools/testing/selftests/vm/khugepaged.c | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+)
tools/testing/selftests/vm/khugepaged.c renamed from tools/testing/selftests/vm/khugepaged.c~selftests-vm-add-file-shmem-madv_collapse-selftest-for-cleared-pmd +30 -0
@@ -1353,6 +1353,33 @@ static void madvise_collapse_existing_th ops->cleanup_area (p, hpage_pmd_size); } +/* +* Test race with khugepaged where page tables have been retracted and +* pmd cleared. +*/ +static void madvise_retracted_page_tables (struct collapse_context *c, +struct mem_ops *ops) +{ +void *p; +int nr_hpages =1 ; +unsigned long size = nr_hpages * hpage_pmd_size; + + p = ops->setup_area (nr_hpages); + ops->fault (p,0 , size); + +/* Let khugepaged collapse and leave pmd cleared */ +if (wait_for_scan ("Collapse and leave PMD cleared" , p, nr_hpages, + ops)) { +fail ("Timeout" ); +return ; + } +success ("OK" ); + c->collapse ("Install huge PMD from page cache" , p, nr_hpages, ops, + true); +validate_memory (p,0 , size); + ops->cleanup_area (p, size); +} +static void usage (void ) {fprintf (stderr,"\nUsage: ./khugepaged <test type> [dir]\n\n" );
@@ -1524,5 +1551,8 @@ int main(int argc, const char **argv)TEST (madvise_collapse_existing_thps, madvise_context, 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, shmem_ops); +restore_settings (0 ); }
_
Patches currently in -mm which might be from [email protected] are