[igt-dev] [PATCH i-g-t] tests/vgem_basic: Fix unload testcase

[Daniel Vetter]

On Thu, May 27, 2021 at 4:07 PM Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
>
> An mmap _should_ keep the module alive.
>
> This reverts
>
> commit 8abe91985b30f8a26cdcb6816d2393956f171ea5
> Author: Chris Wilson <chris at chris-wilson.co.uk>
> Date:   Wed Oct 5 14:40:16 2016 +0100
>
>     igt/vgem_basic: Allow mmap() to persist without the vgem module loaded
>
> With real drivers there is usually more than just shmem around, so
> encoding this as some kind of expectation just doesn't make sense at
> all.
>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>

Merged with Thomas' irc-ack. I'll go right ahead and merge the kernel
side too so there's not too much window for CI breakage.
-Daniel
> ---
>  tests/vgem_basic.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/tests/vgem_basic.c b/tests/vgem_basic.c
> index 526636dd1772..57c575e2e51b 100644
> --- a/tests/vgem_basic.c
> +++ b/tests/vgem_basic.c
> @@ -382,14 +382,18 @@ static void test_unload(void)
>         close(dmabuf);
>
>         /* Although closed, the mmap should keep the dmabuf/module alive */
> -       igt_assert_f(module_unload() == 0,
> -                    "A mmap should not keep the module alive\n");
> +       igt_assert_f(module_unload() != 0,
> +                    "A mmap should keep the module alive\n");
>
>         for (int page = 0; page < bo.size >> 12; page++)
>                 ptr[1024*page + page%1024] = page;
>
>         /* And finally we should have no more uses on the module. */
>         munmap(ptr, bo.size);
> +
> +       igt_assert_f(module_unload() == 0,
> +                    "No mmap anymore, should be able to unload\n");
> +
>  }
>
>  static bool has_prime_export(int fd)
> --
> 2.24.1
>


-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch