[PATCH v2] drm/i915/selftests: Unwind hugepages to drop wakeref on error

[Das, Nirmoy]

|Reviewed-by: Nirmoy Das <nirmoy.das at intel.com>|

On 1/17/2023 1:32 PM, Nirmoy Das wrote:
> From: Chris Wilson<chris.p.wilson at linux.intel.com>
>
> Make sure that upon error after we have acquired the wakeref we do
> release it again.
>
> v2: add another missing "goto out_wf"(Andi).
>
> Fixes: 027c38b4121e ("drm/i915/selftests: Grab the runtime pm in shrink_thp")
> Cc: Andi Shyti<andi.shyti at linux.intel.com>
> Reviewed-by: Matthew Auld<matthew.auld at intel.com>
> Reviewed-by: Andrzej Hajda<andrzej.hajda at intel.com>
> Signed-off-by: Chris Wilson<chris.p.wilson at linux.intel.com>
> Signed-off-by: Nirmoy Das<nirmoy.das at intel.com>
> ---
>   drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 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..defece0bcb81 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,19 +1871,19 @@ 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)) {
>   		pr_err("unexpected residual page-size bits, should_swap=%s\n",
>   		       str_yes_no(should_swap));
>   		err = -EINVAL;
> -		goto out_put;
> +		goto out_wf;
>   	}
>   
>   	err = i915_vma_pin(vma, 0, 0, flags);
>   	if (err)
> -		goto out_put;
> +		goto out_wf;
>   
>   	while (n--) {
>   		err = cpu_check(obj, n, 0xdeadbeaf);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20230117/01f6bb4c/attachment-0001.htm>