On Thu, Mar 12, 2026 at 07:40:25PM +0800, Chunyu Hu wrote: > The test_hugepage test contain two sub tests. If just reporting one skip > when thp not available, there will be error in the log because the test > count don't match the test plan. Change to skip two tests by running the > ksft_test_result_skip twice in this case. > > Without the fix (run test on thp disabled kernel): > ./run_vmtests.sh -t soft_dirty > # -------------------- > # running ./soft-dirty > # -------------------- > # TAP version 13 > # 1..19 > # ok 1 Test test_simple > # ok 2 Test test_vma_reuse dirty bit of allocated page > # ok 3 Test test_vma_reuse dirty bit of reused address page > # ok 4 # SKIP Transparent Hugepages not available > # ok 5 Test test_mprotect-anon dirty bit of new written page > # ok 6 Test test_mprotect-anon soft-dirty clear after clear_refs > # ok 7 Test test_mprotect-anon soft-dirty clear after marking RO > # ok 8 Test test_mprotect-anon soft-dirty clear after marking RW > # ok 9 Test test_mprotect-anon soft-dirty after rewritten > # ok 10 Test test_mprotect-file dirty bit of new written page > # ok 11 Test test_mprotect-file soft-dirty clear after clear_refs > # ok 12 Test test_mprotect-file soft-dirty clear after marking RO > # ok 13 Test test_mprotect-file soft-dirty clear after marking RW > # ok 14 Test test_mprotect-file soft-dirty after rewritten > # ok 15 Test test_merge-anon soft-dirty after remap merge 1st pg > # ok 16 Test test_merge-anon soft-dirty after remap merge 2nd pg > # ok 17 Test test_merge-anon soft-dirty after mprotect merge 1st pg > # ok 18 Test test_merge-anon soft-dirty after mprotect merge 2nd pg > # # 1 skipped test(s) detected. Consider enabling relevant config options > to improve coverage. > # # Planned tests != run tests (19 != 18) > # # Totals: pass:17 fail:0 xfail:0 xpass:0 skip:1 error:0 > # [FAIL] > not ok 52 soft-dirty # exit=1 > > With the fix (run test on thp disabled kernel): > ./run_vmtests.sh -t soft_dirty > # -------------------- > # running ./soft-dirty > # TAP version 13 > # -------------------- > # running ./soft-dirty > # -------------------- > # TAP version 13 > # 1..19 > # ok 1 Test test_simple > # ok 2 Test test_vma_reuse dirty bit of allocated page > # ok 3 Test test_vma_reuse dirty bit of reused address page > # # Transparent Hugepages not available > # ok 4 # SKIP Test test_hugepage huge page allocation > # ok 5 # SKIP Test test_hugepage huge page dirty bit > # ok 6 Test test_mprotect-anon dirty bit of new written page > # ok 7 Test test_mprotect-anon soft-dirty clear after clear_refs > # ok 8 Test test_mprotect-anon soft-dirty clear after marking RO > # ok 9 Test test_mprotect-anon soft-dirty clear after marking RW > # ok 10 Test test_mprotect-anon soft-dirty after rewritten > # ok 11 Test test_mprotect-file dirty bit of new written page > # ok 12 Test test_mprotect-file soft-dirty clear after clear_refs > # ok 13 Test test_mprotect-file soft-dirty clear after marking RO > # ok 14 Test test_mprotect-file soft-dirty clear after marking RW > # ok 15 Test test_mprotect-file soft-dirty after rewritten > # ok 16 Test test_merge-anon soft-dirty after remap merge 1st pg > # ok 17 Test test_merge-anon soft-dirty after remap merge 2nd pg > # ok 18 Test test_merge-anon soft-dirty after mprotect merge 1st pg > # ok 19 Test test_merge-anon soft-dirty after mprotect merge 2nd pg > # # 2 skipped test(s) detected. Consider enabling relevant config options > to improve coverage. > # # Totals: pass:17 fail:0 xfail:0 xpass:0 skip:2 error:0 > # [PASS] > ok 1 soft-dirty > hwpoison_inject > # SUMMARY: PASS=1 SKIP=0 FAIL=0 > 1..1 > CC: Li Wang <[email protected]> > Signed-off-by: Chunyu Hu <[email protected]>
LGTM, so: Reviewed-by: Lorenzo Stoakes (Oracle) <[email protected]> > --- > tools/testing/selftests/mm/soft-dirty.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/mm/soft-dirty.c > b/tools/testing/selftests/mm/soft-dirty.c > index 59c0dbe99a9b..bcfcac99b436 100644 > --- a/tools/testing/selftests/mm/soft-dirty.c > +++ b/tools/testing/selftests/mm/soft-dirty.c > @@ -82,7 +82,9 @@ static void test_hugepage(int pagemap_fd, int pagesize) > int i, ret; > > if (!thp_is_enabled()) { > - ksft_test_result_skip("Transparent Hugepages not available\n"); > + ksft_print_msg("Transparent Hugepages not available\n"); > + ksft_test_result_skip("Test %s huge page allocation\n", > __func__); > + ksft_test_result_skip("Test %s huge page dirty bit\n", > __func__); > return; > } > > -- > 2.53.0 >
