* [PATCH] drm/i915/selftests: fix some error codes in __cancel_reset()
@ 2022-01-27 8:49 Dan Carpenter
2022-02-04 17:45 ` Andi Shyti
0 siblings, 1 reply; 3+ messages in thread
From: Dan Carpenter @ 2022-01-27 8:49 UTC (permalink / raw)
To: Jani Nikula, Matthew Brost
Cc: Joonas Lahtinen, Rodrigo Vivi, Tvrtko Ursulin, David Airlie,
Daniel Vetter, John Harrison, Matt Roper, Thomas Hellström,
Zhihao Cheng, Lucas De Marchi, Michał Winiarski,
Maarten Lankhorst, Chris Wilson, Andi Shyti, intel-gfx,
kernel-janitors
There were two error paths in __cancel_reset() which return success
instead of a negative error code as expected.
Fixes: 4e6835466771 ("drm/i915/selftests: Add a cancel request selftest that triggers a reset")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
From static analysis. I am not 100% sure this. Please review extra
carefully!
drivers/gpu/drm/i915/selftests/i915_request.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c
index 2a99dd7c2fe8..05e9f977757b 100644
--- a/drivers/gpu/drm/i915/selftests/i915_request.c
+++ b/drivers/gpu/drm/i915/selftests/i915_request.c
@@ -809,7 +809,8 @@ static int __cancel_reset(struct drm_i915_private *i915,
preempt_timeout_ms = engine->props.preempt_timeout_ms;
engine->props.preempt_timeout_ms = 100;
- if (igt_spinner_init(&spin, engine->gt))
+ err = igt_spinner_init(&spin, engine->gt);
+ if (err)
goto out_restore;
ce = intel_context_create(engine);
@@ -838,8 +839,10 @@ static int __cancel_reset(struct drm_i915_private *i915,
}
nop = intel_context_create_request(ce);
- if (IS_ERR(nop))
+ if (IS_ERR(nop)) {
+ err = PTR_ERR(nop);
goto out_rq;
+ }
i915_request_get(nop);
i915_request_add(nop);
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915/selftests: fix some error codes in __cancel_reset()
2022-01-27 8:49 [PATCH] drm/i915/selftests: fix some error codes in __cancel_reset() Dan Carpenter
@ 2022-02-04 17:45 ` Andi Shyti
2022-02-04 21:46 ` [Intel-gfx] " Rodrigo Vivi
0 siblings, 1 reply; 3+ messages in thread
From: Andi Shyti @ 2022-02-04 17:45 UTC (permalink / raw)
To: Dan Carpenter
Cc: Jani Nikula, Matthew Brost, Joonas Lahtinen, Rodrigo Vivi,
Tvrtko Ursulin, David Airlie, Daniel Vetter, John Harrison,
Matt Roper, Thomas Hellstr?m, Zhihao Cheng, Lucas De Marchi,
Micha?? Winiarski, Maarten Lankhorst, Chris Wilson, Andi Shyti,
intel-gfx, kernel-janitors
Hi Dan,
> There were two error paths in __cancel_reset() which return success
> instead of a negative error code as expected.
>
> Fixes: 4e6835466771 ("drm/i915/selftests: Add a cancel request selftest that triggers a reset")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> >From static analysis. I am not 100% sure this. Please review extra
> carefully!
>
> drivers/gpu/drm/i915/selftests/i915_request.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c
> index 2a99dd7c2fe8..05e9f977757b 100644
> --- a/drivers/gpu/drm/i915/selftests/i915_request.c
> +++ b/drivers/gpu/drm/i915/selftests/i915_request.c
> @@ -809,7 +809,8 @@ static int __cancel_reset(struct drm_i915_private *i915,
> preempt_timeout_ms = engine->props.preempt_timeout_ms;
> engine->props.preempt_timeout_ms = 100;
>
> - if (igt_spinner_init(&spin, engine->gt))
> + err = igt_spinner_init(&spin, engine->gt);
> + if (err)
> goto out_restore;
>
> ce = intel_context_create(engine);
> @@ -838,8 +839,10 @@ static int __cancel_reset(struct drm_i915_private *i915,
> }
>
> nop = intel_context_create_request(ce);
> - if (IS_ERR(nop))
> + if (IS_ERR(nop)) {
> + err = PTR_ERR(nop);
> goto out_rq;
> + }
Looks correct to me:
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Thank you,
Andi
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/selftests: fix some error codes in __cancel_reset()
2022-02-04 17:45 ` Andi Shyti
@ 2022-02-04 21:46 ` Rodrigo Vivi
0 siblings, 0 replies; 3+ messages in thread
From: Rodrigo Vivi @ 2022-02-04 21:46 UTC (permalink / raw)
To: Andi Shyti
Cc: Dan Carpenter, kernel-janitors, Micha?? Winiarski,
Thomas Hellstr?m, David Airlie, Zhihao Cheng, intel-gfx,
Lucas De Marchi, Chris Wilson
On Fri, Feb 04, 2022 at 06:45:51PM +0100, Andi Shyti wrote:
> Hi Dan,
>
> > There were two error paths in __cancel_reset() which return success
> > instead of a negative error code as expected.
> >
> > Fixes: 4e6835466771 ("drm/i915/selftests: Add a cancel request selftest that triggers a reset")
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > ---
> > >From static analysis. I am not 100% sure this. Please review extra
> > carefully!
> >
> > drivers/gpu/drm/i915/selftests/i915_request.c | 7 +++++--
> > 1 file changed, 5 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c
> > index 2a99dd7c2fe8..05e9f977757b 100644
> > --- a/drivers/gpu/drm/i915/selftests/i915_request.c
> > +++ b/drivers/gpu/drm/i915/selftests/i915_request.c
> > @@ -809,7 +809,8 @@ static int __cancel_reset(struct drm_i915_private *i915,
> > preempt_timeout_ms = engine->props.preempt_timeout_ms;
> > engine->props.preempt_timeout_ms = 100;
> >
> > - if (igt_spinner_init(&spin, engine->gt))
> > + err = igt_spinner_init(&spin, engine->gt);
> > + if (err)
> > goto out_restore;
> >
> > ce = intel_context_create(engine);
> > @@ -838,8 +839,10 @@ static int __cancel_reset(struct drm_i915_private *i915,
> > }
> >
> > nop = intel_context_create_request(ce);
> > - if (IS_ERR(nop))
> > + if (IS_ERR(nop)) {
> > + err = PTR_ERR(nop);
> > goto out_rq;
> > + }
>
> Looks correct to me:
>
> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
We need a rebased version to be sent...
Sorry for the delay here...
>
> Thank you,
> Andi
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-04 21:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-27 8:49 [PATCH] drm/i915/selftests: fix some error codes in __cancel_reset() Dan Carpenter
2022-02-04 17:45 ` Andi Shyti
2022-02-04 21:46 ` [Intel-gfx] " Rodrigo Vivi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).