On Fri, Aug 30, 2024 at 5:52 AM Pedro Falcato <pedro.falcato@xxxxxxxxx> wrote: > > On Thu, Aug 29, 2024 at 09:43:50PM GMT, jeffxu@xxxxxxxxxxxx wrote: > > From: Jeff Xu <jeffxu@xxxxxxxxxxxx> > > > > Add a testcase to cover all sealed madvise type. > > > > Signed-off-by: Jeff Xu <jeffxu@xxxxxxxxxxxx> > > --- > > tools/testing/selftests/mm/mseal_test.c | 108 +++++++++++++++++++++++- > > 1 file changed, 107 insertions(+), 1 deletion(-) > > > > diff --git a/tools/testing/selftests/mm/mseal_test.c b/tools/testing/selftests/mm/mseal_test.c > > index adc646cf576c..ae06c354220d 100644 > > --- a/tools/testing/selftests/mm/mseal_test.c > > +++ b/tools/testing/selftests/mm/mseal_test.c > > @@ -2121,6 +2121,107 @@ static void test_seal_madvise_nodiscard(bool seal) > > REPORT_TEST_PASS(); > > } > > > > +static void test_seal_discard_madvise_advice(void) > > +{ > > + void *ptr; > > + unsigned long page_size = getpagesize(); > > + unsigned long size = 4 * page_size; > > + int ret; > > + int sealed_advice[] = {MADV_FREE, MADV_DONTNEED, > > + MADV_DONTNEED_LOCKED, MADV_REMOVE, > > + MADV_DONTFORK, MADV_WIPEONFORK}; > > + int size_sealed_advice = sizeof(sealed_advice) / sizeof(int); > > + > > + setup_single_address(size, &ptr); > > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > + > > + ret = seal_single_address(ptr, size); > > + FAIL_TEST_IF_FALSE(!ret); > > + > > + for (int i = 0; i < size_sealed_advice; i++) { > > + ret = sys_madvise(ptr, size, sealed_advice[i]); > > + FAIL_TEST_IF_FALSE(ret < 0); > > + FAIL_TEST_IF_FALSE(errno == EPERM); > > + } > > + > > + REPORT_TEST_PASS(); > > +} > > This can replace some of the other 9 discard tests already there, no? > No, this is focused on enumerating all types. > > + > > +static void test_munmap_free_multiple_ranges(bool seal) > > +{ > > + void *ptr; > > + unsigned long page_size = getpagesize(); > > + unsigned long size = 8 * page_size; > > + int ret; > > + int prot; > > + > > + setup_single_address(size, &ptr); > > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > + > > + /* unmap one page from beginning. */ > > + ret = sys_munmap(ptr, page_size); > > + FAIL_TEST_IF_FALSE(!ret); > > + > > + /* unmap one page from middle. */ > > + ret = sys_munmap(ptr + 4 * page_size, page_size); > > + FAIL_TEST_IF_FALSE(!ret); > > + > > + size = get_vma_size(ptr + page_size, &prot); > > + FAIL_TEST_IF_FALSE(size == 3 * page_size); > > + FAIL_TEST_IF_FALSE(prot == 4); > > + > > + size = get_vma_size(ptr + 5 * page_size, &prot); > > + FAIL_TEST_IF_FALSE(size == 3 * page_size); > > + FAIL_TEST_IF_FALSE(prot == 4); > > + > > + > > + /* seal the last page */ > > + if (seal) { > > + ret = sys_mseal(ptr + 7 * page_size, page_size); > > + FAIL_TEST_IF_FALSE(!ret); > > + > > + size = get_vma_size(ptr + 1 * page_size, &prot); > > + FAIL_TEST_IF_FALSE(size == 3 * page_size); > > + FAIL_TEST_IF_FALSE(prot == 4); > > + > > + size = get_vma_size(ptr + 5 * page_size, &prot); > > + FAIL_TEST_IF_FALSE(size == 2 * page_size); > > + FAIL_TEST_IF_FALSE(prot == 4); > > + > > + size = get_vma_size(ptr + 7 * page_size, &prot); > > + FAIL_TEST_IF_FALSE(size == 1 * page_size); > > + FAIL_TEST_IF_FALSE(prot == 4); > > + } > > + > > + /* munmap all 8 pages from beginning */ > > + ret = sys_munmap(ptr, 8 * page_size); > > + if (seal) { > > + FAIL_TEST_IF_FALSE(ret); > > + > > + /* verify mapping are not changed */ > > + size = get_vma_size(ptr + 1 * page_size, &prot); > > + FAIL_TEST_IF_FALSE(size == 3 * page_size); > > + FAIL_TEST_IF_FALSE(prot == 4); > > + > > + size = get_vma_size(ptr + 5 * page_size, &prot); > > + FAIL_TEST_IF_FALSE(size == 2 * page_size); > > + FAIL_TEST_IF_FALSE(prot == 4); > > + > > + size = get_vma_size(ptr + 7 * page_size, &prot); > > + FAIL_TEST_IF_FALSE(size == 1 * page_size); > > + FAIL_TEST_IF_FALSE(prot == 4); > > + } else { > > + FAIL_TEST_IF_FALSE(!ret); > > + > > + for (int i = 0; i < 8; i++) { > > + size = get_vma_size(ptr, &prot); > > + FAIL_TEST_IF_FALSE(size == 0); > > + } > > + } > > + > > + REPORT_TEST_PASS(); > > +} > > Unrelated munmap change. will move. > > -- > Pedro