selftests-mm-khugepaged-group-tests-in-an-array.patch removed from -mm tree
The quilt patch titled
Subject: selftests/mm: khugepaged: group tests in an array
has been removed from the -mm tree. Its filename was
selftests-mm-khugepaged-group-tests-in-an-array.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)" <[email protected]>
Subject: selftests/mm: khugepaged: group tests in an array
Date: Mon, 11 May 2026 19:27:57 +0300
Currently khugepaged decides if a test can run using TEST() macro that checks what mem_ops and collapse_context are set by the command line arguments.
For better compatibility with ksefltest framework, add an array of 'struct test_case's and redefine TEST() macro to conditionally add enabled tests to that array.
Then execute the enabled test by looping the test_case's array.
---
tools/testing/selftests/mm/khugepaged.c | 43 ++++++++++++++++++---- 1 file changed, 36 insertions(+), 7 deletions(-)
tools/testing/selftests/mm/khugepaged.c renamed from tools/testing/selftests/mm/khugepaged.c~selftests-mm-khugepaged-group-tests-in-an-array +36 -7
@@ -1265,6 +1265,34 @@ static void parse_test_type(int argc, chget_finfo (argv[1 ]); } +typedef void (*test_fn )(struct collapse_context *c,struct mem_ops *ops); + +struct test_case { +struct collapse_context *ctx; +struct mem_ops *ops; +const char *desc; +test_fn fn; +}; + +#define MAX_TEST_CASES 64 +static struct test_case test_cases[MAX_TEST_CASES ]; +static int nr_test_cases; + +#define TEST (t, c, o) do { \ + if (c && o) { \ + if (nr_test_cases >= MAX_TEST_CASES) { \ + printf("MAX_TEST_CASES is too small\n"); \ + exit(EXIT_FAILURE); \ + } \ + test_cases[nr_test_cases++] = (struct test_case){ \ + .ctx = c, \ + .ops = o, \ + .desc = #t, \ + .fn = t, \ + }; \ + } \ + } while (0) +int main (int argc,char **argv) {int hpage_pmd_order;
@@ -1320,13 +1348,6 @@ int main(int argc, char **argv)alloc_at_fault (); -#define TEST (t, c, o) do { \ - if (c && o) { \ - printf("\nRun test: " #t " (%s:%s)\n", c->name, o->name); \ - t(c, o); \ - } \ - } while (0) -TEST (collapse_full, khugepaged_context, anon_ops);TEST (collapse_full, khugepaged_context, read_only_file_ops);TEST (collapse_full, khugepaged_context, read_write_file_read_ops);
@@ -1404,5 +1425,13 @@ int main(int argc, char **argv)TEST (madvise_retracted_page_tables, madvise_context, read_write_file_read_ops);TEST (madvise_retracted_page_tables, madvise_context, shmem_ops); + exit_status =KSFT_PASS ; +for (int i =0 ; i < nr_test_cases; i++) { +struct test_case *t = &test_cases[i]; + +printf ("\nRun test: %s (%s:%s)\n" , t->desc, t->ctx->name, t->ops->name); + t->fn (t->ctx, t->ops); + } +restore_settings (0 ); }
_
Patches currently in -mm which might be from [email protected] are