Re: [Intel-gfx] [PATCH] drm/i915/selftests: Unwind hugepages to drop wakeref on error

[Andrzej Hajda <andrzej.hajda@xxxxxxxxx>]

On 13.01.2023 12:49, Nirmoy Das wrote:
> From: Chris Wilson <chris.p.wilson@xxxxxxxxxxxxxxx>
>
> Make sure that upon error after we have acquired the wakeref we do
> release it again.
>
> Signed-off-by: Chris Wilson <chris.p.wilson@xxxxxxxxxxxxxxx>
> Signed-off-by: Nirmoy Das <nirmoy.das@xxxxxxxxx>

Reviewed-by: Andrzej Hajda <andrzej.hajda@xxxxxxxxx>

Regards
Andrzej

> ---
>   drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> index c281b0ec9e05..295d6f2cc4ff 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> @@ -1855,7 +1855,7 @@ static int igt_shrink_thp(void *arg)
>   			I915_SHRINK_ACTIVE);
>   	i915_vma_unpin(vma);
>   	if (err)
> -		goto out_put;
> +		goto out_wf;
>   
>   	/*
>   	 * Now that the pages are *unpinned* shrinking should invoke
> @@ -1871,7 +1871,7 @@ static int igt_shrink_thp(void *arg)
>   		pr_err("unexpected pages mismatch, should_swap=%s\n",
>   		       str_yes_no(should_swap));
>   		err = -EINVAL;
> -		goto out_put;
> +		goto out_wf;
>   	}
>   
>   	if (should_swap == (obj->mm.page_sizes.sg || obj->mm.page_sizes.phys)) {
> @@ -1883,7 +1883,7 @@ static int igt_shrink_thp(void *arg)
>   
>   	err = i915_vma_pin(vma, 0, 0, flags);
>   	if (err)
> -		goto out_put;
> +		goto out_wf;
>   
>   	while (n--) {
>   		err = cpu_check(obj, n, 0xdeadbeaf);