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");
        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);
 }