* [PATCH] drm/i915/selftests: fix error handling in __live_lrc_indirect_ctx_bb()
@ 2020-04-29 13:24 Dan Carpenter
2020-04-29 13:53 ` Chris Wilson
2020-04-29 14:04 ` Andi Shyti
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2020-04-29 13:24 UTC (permalink / raw)
To: Jani Nikula
Cc: David Airlie, intel-gfx, kernel-janitors, Chris Wilson,
Matthew Auld
If intel_context_create() fails then it leads to an error pointer
dereference. I shuffled things around to make error handling easier.
Fixes: 1dd47b54baea ("drm/i915: Add live selftests for indirect ctx batchbuffers")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/gpu/drm/i915/gt/selftest_lrc.c | 30 +++++++++++++++-----------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/selftest_lrc.c b/drivers/gpu/drm/i915/gt/selftest_lrc.c
index d3fa91aed7dee..c4bfad5c49dea 100644
--- a/drivers/gpu/drm/i915/gt/selftest_lrc.c
+++ b/drivers/gpu/drm/i915/gt/selftest_lrc.c
@@ -5795,26 +5795,29 @@ static int indirect_ctx_bb_check(struct intel_context *ce)
static int __live_lrc_indirect_ctx_bb(struct intel_engine_cs *engine)
{
struct intel_context *a, *b;
- int err = 0;
+ int err;
a = intel_context_create(engine);
- b = intel_context_create(engine);
-
+ if (IS_ERR(a))
+ return PTR_ERR(a);
err = intel_context_pin(a);
if (err)
- return err;
+ goto put_a;
- err = intel_context_pin(b);
- if (err) {
- intel_context_put(a);
- return err;
+ b = intel_context_create(engine);
+ if (IS_ERR(b)) {
+ err = PTR_ERR(b);
+ goto unpin_a;
}
+ err = intel_context_pin(b);
+ if (err)
+ goto put_b;
/* We use the already reserved extra page in context state */
if (!a->wa_bb_page) {
GEM_BUG_ON(b->wa_bb_page);
GEM_BUG_ON(INTEL_GEN(engine->i915) = 12);
- goto out;
+ goto unpin_b;
}
/*
@@ -5829,14 +5832,17 @@ static int __live_lrc_indirect_ctx_bb(struct intel_engine_cs *engine)
err = indirect_ctx_bb_check(a);
if (err)
- goto out;
+ goto unpin_b;
err = indirect_ctx_bb_check(b);
-out:
+
+unpin_b:
intel_context_unpin(b);
+put_b:
intel_context_put(b);
-
+unpin_a:
intel_context_unpin(a);
+put_a:
intel_context_put(a);
return err;
--
2.26.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915/selftests: fix error handling in __live_lrc_indirect_ctx_bb()
2020-04-29 13:24 [PATCH] drm/i915/selftests: fix error handling in __live_lrc_indirect_ctx_bb() Dan Carpenter
@ 2020-04-29 13:53 ` Chris Wilson
2020-04-29 14:04 ` Andi Shyti
1 sibling, 0 replies; 3+ messages in thread
From: Chris Wilson @ 2020-04-29 13:53 UTC (permalink / raw)
To: Dan Carpenter, Jani Nikula
Cc: David Airlie, intel-gfx, kernel-janitors, Matthew Auld
Quoting Dan Carpenter (2020-04-29 14:24:25)
> If intel_context_create() fails then it leads to an error pointer
> dereference. I shuffled things around to make error handling easier.
>
> Fixes: 1dd47b54baea ("drm/i915: Add live selftests for indirect ctx batchbuffers")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> drivers/gpu/drm/i915/gt/selftest_lrc.c | 30 +++++++++++++++-----------
> 1 file changed, 18 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/selftest_lrc.c b/drivers/gpu/drm/i915/gt/selftest_lrc.c
> index d3fa91aed7dee..c4bfad5c49dea 100644
> --- a/drivers/gpu/drm/i915/gt/selftest_lrc.c
> +++ b/drivers/gpu/drm/i915/gt/selftest_lrc.c
> @@ -5795,26 +5795,29 @@ static int indirect_ctx_bb_check(struct intel_context *ce)
> static int __live_lrc_indirect_ctx_bb(struct intel_engine_cs *engine)
> {
> struct intel_context *a, *b;
> - int err = 0;
> + int err;
>
> a = intel_context_create(engine);
> - b = intel_context_create(engine);
> -
> + if (IS_ERR(a))
> + return PTR_ERR(a);
> err = intel_context_pin(a);
> if (err)
> - return err;
> + goto put_a;
>
> - err = intel_context_pin(b);
> - if (err) {
> - intel_context_put(a);
> - return err;
> + b = intel_context_create(engine);
> + if (IS_ERR(b)) {
> + err = PTR_ERR(b);
> + goto unpin_a;
> }
> + err = intel_context_pin(b);
> + if (err)
> + goto put_b;
>
> /* We use the already reserved extra page in context state */
> if (!a->wa_bb_page) {
> GEM_BUG_ON(b->wa_bb_page);
> GEM_BUG_ON(INTEL_GEN(engine->i915) = 12);
> - goto out;
> + goto unpin_b;
> }
>
> /*
> @@ -5829,14 +5832,17 @@ static int __live_lrc_indirect_ctx_bb(struct intel_engine_cs *engine)
>
> err = indirect_ctx_bb_check(a);
> if (err)
> - goto out;
> + goto unpin_b;
>
> err = indirect_ctx_bb_check(b);
> -out:
> +
> +unpin_b:
> intel_context_unpin(b);
> +put_b:
> intel_context_put(b);
> -
> +unpin_a:
> intel_context_unpin(a);
> +put_a:
> intel_context_put(a);
Onion looks correct, and there should not be any issue with this
sequence of create/pin.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915/selftests: fix error handling in __live_lrc_indirect_ctx_bb()
2020-04-29 13:24 [PATCH] drm/i915/selftests: fix error handling in __live_lrc_indirect_ctx_bb() Dan Carpenter
2020-04-29 13:53 ` Chris Wilson
@ 2020-04-29 14:04 ` Andi Shyti
1 sibling, 0 replies; 3+ messages in thread
From: Andi Shyti @ 2020-04-29 14:04 UTC (permalink / raw)
To: Dan Carpenter
Cc: David Airlie, intel-gfx, kernel-janitors, Chris Wilson,
Matthew Auld
Hi Dan,
On Wed, Apr 29, 2020 at 04:24:25PM +0300, Dan Carpenter wrote:
> If intel_context_create() fails then it leads to an error pointer
> dereference. I shuffled things around to make error handling easier.
>
> Fixes: 1dd47b54baea ("drm/i915: Add live selftests for indirect ctx batchbuffers")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Andi Shyti <andi.shyti@intel.com>
Thanks,
Andi
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-29 14:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-29 13:24 [PATCH] drm/i915/selftests: fix error handling in __live_lrc_indirect_ctx_bb() Dan Carpenter
2020-04-29 13:53 ` Chris Wilson
2020-04-29 14:04 ` Andi Shyti
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).