2023-07-17 19:19:57

by Christophe JAILLET

Subject: [PATCH] drm/i915: Fix an error handling path in igt_write_huge()

All error handling paths go to 'out', except this one. Be consistent and
also branch to 'out' here.

Fixes: c10a652e239e ("drm/i915/selftests: Rework context handling in hugepages selftests")
Signed-off-by: Christophe JAILLET <[email protected]>
---
/!\ Speculative /!\

This patch is based on analysis of the surrounding code and should be
reviewed with care !

If the patch is wrong, maybe a comment in the code could explain why.

/!\ Speculative /!\
---
drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
index df6c9a84252c..6b9f6cf50bf6 100644
--- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
+++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
@@ -1246,8 +1246,10 @@ static int igt_write_huge(struct drm_i915_private *i915,
* times in succession a possibility by enlarging the permutation array.
*/
order = i915_random_order(count * count, &prng);
- if (!order)
- return -ENOMEM;
+ if (!order) {
+ err = -ENOMEM;
+ goto out;
+ }

max_page_size = rounddown_pow_of_two(obj->mm.page_sizes.sg);
max = div_u64(max - size, max_page_size);
--
2.34.1

2023-07-18 12:15:33

by Andrzej Hajda

Subject: Re: [Intel-gfx] [PATCH] drm/i915: Fix an error handling path in igt_write_huge()

On 17.07.2023 20:49, Christophe JAILLET wrote:
> All error handling paths go to 'out', except this one. Be consistent and
> also branch to 'out' here.
>
> Fixes: c10a652e239e ("drm/i915/selftests: Rework context handling in hugepages selftests")
> Signed-off-by: Christophe JAILLET <[email protected]>


For me seems correct.

Reviewed-by: Andrzej Hajda <[email protected]>

Regards
Andrzej


> ---
> /!\ Speculative /!\
>
> This patch is based on analysis of the surrounding code and should be
> reviewed with care !
>
> If the patch is wrong, maybe a comment in the code could explain why.
>
> /!\ Speculative /!\
> ---
> drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> index df6c9a84252c..6b9f6cf50bf6 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> @@ -1246,8 +1246,10 @@ static int igt_write_huge(struct drm_i915_private *i915,
> * times in succession a possibility by enlarging the permutation array.
> */
> order = i915_random_order(count * count, &prng);
> - if (!order)
> - return -ENOMEM;
> + if (!order) {
> + err = -ENOMEM;
> + goto out;
> + }
>
> max_page_size = rounddown_pow_of_two(obj->mm.page_sizes.sg);
> max = div_u64(max - size, max_page_size);

2023-07-24 16:51:39

by Andi Shyti

Subject: Re: [Intel-gfx] [PATCH] drm/i915: Fix an error handling path in igt_write_huge()

Hi Christophe,

On Mon, Jul 17, 2023 at 08:49:31PM +0200, Christophe JAILLET wrote:
> All error handling paths go to 'out', except this one. Be consistent and
> also branch to 'out' here.
>
> Fixes: c10a652e239e ("drm/i915/selftests: Rework context handling in hugepages selftests")
> Signed-off-by: Christophe JAILLET <[email protected]>
> ---
> /!\ Speculative /!\
>
> This patch is based on analysis of the surrounding code and should be
> reviewed with care !
>
> If the patch is wrong, maybe a comment in the code could explain why.
>
> /!\ Speculative /!\
> ---
> drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> index df6c9a84252c..6b9f6cf50bf6 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> @@ -1246,8 +1246,10 @@ static int igt_write_huge(struct drm_i915_private *i915,
> * times in succession a possibility by enlarging the permutation array.
> */
> order = i915_random_order(count * count, &prng);
> - if (!order)
> - return -ENOMEM;
> + if (!order) {
> + err = -ENOMEM;
> + goto out;
> + }

Looks good:

Reviewed-by: Andi Shyti <[email protected]>

Thanks,
Andi

2023-07-24 17:15:58

by Andi Shyti

Subject: Re: [Intel-gfx] [PATCH] drm/i915: Fix an error handling path in igt_write_huge()

Hi Christophe,

> All error handling paths go to 'out', except this one. Be consistent and
> also branch to 'out' here.
>
> Fixes: c10a652e239e ("drm/i915/selftests: Rework context handling in hugepages selftests")
> Signed-off-by: Christophe JAILLET <[email protected]>

Pushed to drm-intel-gt-next.

Thanks,
Andi