From: Matthew Brost <matthew.brost@intel.com> To: <intel-gfx@lists.freedesktop.org>, <dri-devel@lists.freedesktop.org> Cc: <daniel.vetter@ffwll.ch> Subject: [PATCH 08/27] drm/i915/selftests: Add a cancel request selftest that triggers a reset Date: Wed, 18 Aug 2021 23:16:20 -0700 [thread overview] Message-ID: <20210819061639.21051-9-matthew.brost@intel.com> (raw) In-Reply-To: <20210819061639.21051-1-matthew.brost@intel.com> Add a cancel request selftest that results in an engine reset to cancel the request as it is non-preemptable. Also insert a NOP request after the cancelled request and confirm that it completely successfully. Signed-off-by: Matthew Brost <matthew.brost@intel.com> --- drivers/gpu/drm/i915/selftests/i915_request.c | 100 ++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c index d67710d10615..e2c5db77f087 100644 --- a/drivers/gpu/drm/i915/selftests/i915_request.c +++ b/drivers/gpu/drm/i915/selftests/i915_request.c @@ -772,6 +772,98 @@ static int __cancel_completed(struct intel_engine_cs *engine) return err; } +static int __cancel_reset(struct intel_engine_cs *engine) +{ + struct intel_context *ce; + struct igt_spinner spin; + struct i915_request *rq, *nop; + unsigned long preempt_timeout_ms; + int err = 0; + + preempt_timeout_ms = engine->props.preempt_timeout_ms; + engine->props.preempt_timeout_ms = 100; + + if (igt_spinner_init(&spin, engine->gt)) + goto out_restore; + + ce = intel_context_create(engine); + if (IS_ERR(ce)) { + err = PTR_ERR(ce); + goto out_spin; + } + + rq = igt_spinner_create_request(&spin, ce, MI_NOOP); + if (IS_ERR(rq)) { + err = PTR_ERR(rq); + goto out_ce; + } + + pr_debug("%s: Cancelling active request\n", engine->name); + i915_request_get(rq); + i915_request_add(rq); + if (!igt_wait_for_spinner(&spin, rq)) { + struct drm_printer p = drm_info_printer(engine->i915->drm.dev); + + pr_err("Failed to start spinner on %s\n", engine->name); + intel_engine_dump(engine, &p, "%s\n", engine->name); + err = -ETIME; + goto out_rq; + } + + nop = intel_context_create_request(ce); + if (IS_ERR(nop)) + goto out_nop; + i915_request_get(nop); + i915_request_add(nop); + + i915_request_cancel(rq, -EINTR); + + if (i915_request_wait(rq, 0, HZ) < 0) { + struct drm_printer p = drm_info_printer(engine->i915->drm.dev); + + pr_err("%s: Failed to cancel hung request\n", engine->name); + intel_engine_dump(engine, &p, "%s\n", engine->name); + err = -ETIME; + goto out_nop; + } + + if (rq->fence.error != -EINTR) { + pr_err("%s: fence not cancelled (%u)\n", + engine->name, rq->fence.error); + err = -EINVAL; + goto out_nop; + } + + if (i915_request_wait(nop, 0, HZ) < 0) { + struct drm_printer p = drm_info_printer(engine->i915->drm.dev); + + pr_err("%s: Failed to complete nop request\n", engine->name); + intel_engine_dump(engine, &p, "%s\n", engine->name); + err = -ETIME; + goto out_nop; + } + + if (nop->fence.error != 0) { + pr_err("%s: Nop request errored (%u)\n", + engine->name, nop->fence.error); + err = -EINVAL; + } + +out_nop: + i915_request_put(nop); +out_rq: + i915_request_put(rq); +out_ce: + intel_context_put(ce); +out_spin: + igt_spinner_fini(&spin); +out_restore: + engine->props.preempt_timeout_ms = preempt_timeout_ms; + if (err) + pr_err("%s: %s error %d\n", __func__, engine->name, err); + return err; +} + static int live_cancel_request(void *arg) { struct drm_i915_private *i915 = arg; @@ -804,6 +896,14 @@ static int live_cancel_request(void *arg) return err; if (err2) return err2; + + /* Expects reset so call outside of igt_live_test_* */ + err = __cancel_reset(engine); + if (err) + return err; + + if (igt_flush_test(i915)) + return -EIO; } return 0; -- 2.32.0
WARNING: multiple messages have this Message-ID (diff)
From: Matthew Brost <matthew.brost@intel.com> To: <intel-gfx@lists.freedesktop.org>, <dri-devel@lists.freedesktop.org> Cc: <daniel.vetter@ffwll.ch> Subject: [Intel-gfx] [PATCH 08/27] drm/i915/selftests: Add a cancel request selftest that triggers a reset Date: Wed, 18 Aug 2021 23:16:20 -0700 [thread overview] Message-ID: <20210819061639.21051-9-matthew.brost@intel.com> (raw) In-Reply-To: <20210819061639.21051-1-matthew.brost@intel.com> Add a cancel request selftest that results in an engine reset to cancel the request as it is non-preemptable. Also insert a NOP request after the cancelled request and confirm that it completely successfully. Signed-off-by: Matthew Brost <matthew.brost@intel.com> --- drivers/gpu/drm/i915/selftests/i915_request.c | 100 ++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c index d67710d10615..e2c5db77f087 100644 --- a/drivers/gpu/drm/i915/selftests/i915_request.c +++ b/drivers/gpu/drm/i915/selftests/i915_request.c @@ -772,6 +772,98 @@ static int __cancel_completed(struct intel_engine_cs *engine) return err; } +static int __cancel_reset(struct intel_engine_cs *engine) +{ + struct intel_context *ce; + struct igt_spinner spin; + struct i915_request *rq, *nop; + unsigned long preempt_timeout_ms; + int err = 0; + + preempt_timeout_ms = engine->props.preempt_timeout_ms; + engine->props.preempt_timeout_ms = 100; + + if (igt_spinner_init(&spin, engine->gt)) + goto out_restore; + + ce = intel_context_create(engine); + if (IS_ERR(ce)) { + err = PTR_ERR(ce); + goto out_spin; + } + + rq = igt_spinner_create_request(&spin, ce, MI_NOOP); + if (IS_ERR(rq)) { + err = PTR_ERR(rq); + goto out_ce; + } + + pr_debug("%s: Cancelling active request\n", engine->name); + i915_request_get(rq); + i915_request_add(rq); + if (!igt_wait_for_spinner(&spin, rq)) { + struct drm_printer p = drm_info_printer(engine->i915->drm.dev); + + pr_err("Failed to start spinner on %s\n", engine->name); + intel_engine_dump(engine, &p, "%s\n", engine->name); + err = -ETIME; + goto out_rq; + } + + nop = intel_context_create_request(ce); + if (IS_ERR(nop)) + goto out_nop; + i915_request_get(nop); + i915_request_add(nop); + + i915_request_cancel(rq, -EINTR); + + if (i915_request_wait(rq, 0, HZ) < 0) { + struct drm_printer p = drm_info_printer(engine->i915->drm.dev); + + pr_err("%s: Failed to cancel hung request\n", engine->name); + intel_engine_dump(engine, &p, "%s\n", engine->name); + err = -ETIME; + goto out_nop; + } + + if (rq->fence.error != -EINTR) { + pr_err("%s: fence not cancelled (%u)\n", + engine->name, rq->fence.error); + err = -EINVAL; + goto out_nop; + } + + if (i915_request_wait(nop, 0, HZ) < 0) { + struct drm_printer p = drm_info_printer(engine->i915->drm.dev); + + pr_err("%s: Failed to complete nop request\n", engine->name); + intel_engine_dump(engine, &p, "%s\n", engine->name); + err = -ETIME; + goto out_nop; + } + + if (nop->fence.error != 0) { + pr_err("%s: Nop request errored (%u)\n", + engine->name, nop->fence.error); + err = -EINVAL; + } + +out_nop: + i915_request_put(nop); +out_rq: + i915_request_put(rq); +out_ce: + intel_context_put(ce); +out_spin: + igt_spinner_fini(&spin); +out_restore: + engine->props.preempt_timeout_ms = preempt_timeout_ms; + if (err) + pr_err("%s: %s error %d\n", __func__, engine->name, err); + return err; +} + static int live_cancel_request(void *arg) { struct drm_i915_private *i915 = arg; @@ -804,6 +896,14 @@ static int live_cancel_request(void *arg) return err; if (err2) return err2; + + /* Expects reset so call outside of igt_live_test_* */ + err = __cancel_reset(engine); + if (err) + return err; + + if (igt_flush_test(i915)) + return -EIO; } return 0; -- 2.32.0
next prev parent reply other threads:[~2021-08-19 6:22 UTC|newest] Thread overview: 119+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-19 6:16 [PATCH 00/27] Clean up GuC CI failures, simplify locking, and kernel DOC Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-19 6:16 ` [PATCH 01/27] drm/i915/guc: Fix blocked context accounting Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-24 23:24 ` Daniele Ceraolo Spurio 2021-08-24 23:24 ` [Intel-gfx] " Daniele Ceraolo Spurio 2021-08-19 6:16 ` [PATCH 02/27] drm/i915/guc: Fix outstanding G2H accounting Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-19 21:31 ` Daniele Ceraolo Spurio 2021-08-19 21:30 ` Matthew Brost 2021-08-19 6:16 ` [PATCH 03/27] drm/i915/guc: Unwind context requests in reverse order Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-19 23:54 ` Daniele Ceraolo Spurio 2021-08-19 23:53 ` Matthew Brost 2021-08-20 0:03 ` Daniele Ceraolo Spurio 2021-08-19 6:16 ` [PATCH 04/27] drm/i915/guc: Don't drop ce->guc_active.lock when unwinding context Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-20 0:01 ` Daniele Ceraolo Spurio 2021-08-19 23:58 ` Matthew Brost 2021-08-19 6:16 ` [PATCH 05/27] drm/i915/guc: Process all G2H message at once in work queue Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-20 0:06 ` Daniele Ceraolo Spurio 2021-08-20 0:06 ` [Intel-gfx] " Daniele Ceraolo Spurio 2021-08-19 6:16 ` [PATCH 06/27] drm/i915/guc: Workaround reset G2H is received after schedule done G2H Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-24 23:31 ` Daniele Ceraolo Spurio 2021-08-25 4:05 ` Matthew Brost 2021-08-19 6:16 ` [PATCH 07/27] Revert "drm/i915/gt: Propagate change in error status to children on unhold" Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-20 19:47 ` Jason Ekstrand 2021-08-20 19:47 ` [Intel-gfx] " Jason Ekstrand 2021-08-19 6:16 ` Matthew Brost [this message] 2021-08-19 6:16 ` [Intel-gfx] [PATCH 08/27] drm/i915/selftests: Add a cancel request selftest that triggers a reset Matthew Brost 2021-08-19 6:16 ` [PATCH 09/27] drm/i915/guc: Kick tasklet after queuing a request Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-20 18:31 ` Daniele Ceraolo Spurio 2021-08-20 18:36 ` Matthew Brost 2021-08-19 6:16 ` [PATCH 10/27] drm/i915/guc: Don't enable scheduling on a banned context, guc_id invalid, not registered Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-20 18:42 ` Daniele Ceraolo Spurio 2021-08-20 18:42 ` Matthew Brost 2021-08-19 6:16 ` [PATCH 11/27] drm/i915/selftests: Fix memory corruption in live_lrc_isolation Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-25 0:07 ` Daniele Ceraolo Spurio 2021-08-25 20:03 ` Matthew Brost 2021-08-19 6:16 ` [PATCH 12/27] drm/i915/selftests: Add initial GuC selftest for scrubbing lost G2H Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-25 0:58 ` Daniele Ceraolo Spurio 2021-08-25 0:58 ` [Intel-gfx] " Daniele Ceraolo Spurio 2021-08-19 6:16 ` [PATCH 13/27] drm/i915/guc: Take context ref when cancelling request Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-21 0:07 ` Daniele Ceraolo Spurio 2021-08-21 0:07 ` [Intel-gfx] " Daniele Ceraolo Spurio 2021-08-24 15:42 ` Matthew Brost 2021-08-24 15:42 ` [Intel-gfx] " Matthew Brost 2021-08-25 1:21 ` Daniele Ceraolo Spurio 2021-08-25 1:21 ` [Intel-gfx] " Daniele Ceraolo Spurio 2021-08-19 6:16 ` [PATCH 14/27] drm/i915/guc: Don't touch guc_state.sched_state without a lock Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-25 1:20 ` Daniele Ceraolo Spurio 2021-08-25 1:44 ` Matthew Brost 2021-08-25 1:51 ` Daniele Ceraolo Spurio 2021-08-19 6:16 ` [PATCH 15/27] drm/i915/guc: Reset LRC descriptor if register returns -ENODEV Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-21 0:14 ` Daniele Ceraolo Spurio 2021-08-21 0:14 ` [Intel-gfx] " Daniele Ceraolo Spurio 2021-08-19 6:16 ` [PATCH 16/27] drm/i915: Allocate error capture in nowait context Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-19 6:16 ` [PATCH 17/27] drm/i915/guc: Flush G2H work queue during reset Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-21 0:25 ` Daniele Ceraolo Spurio 2021-08-21 0:25 ` Daniele Ceraolo Spurio 2021-08-24 15:44 ` Matthew Brost 2021-08-24 15:44 ` [Intel-gfx] " Matthew Brost 2021-08-25 1:22 ` Daniele Ceraolo Spurio 2021-08-25 1:22 ` [Intel-gfx] " Daniele Ceraolo Spurio 2021-08-19 6:16 ` [PATCH 18/27] drm/i915/guc: Release submit fence from an irq_work Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-25 1:44 ` Daniele Ceraolo Spurio 2021-08-19 6:16 ` [PATCH 19/27] drm/i915/guc: Move guc_blocked fence to struct guc_state Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-21 0:30 ` Daniele Ceraolo Spurio 2021-08-21 0:30 ` [Intel-gfx] " Daniele Ceraolo Spurio 2021-08-19 6:16 ` [PATCH 20/27] drm/i915/guc: Rework and simplify locking Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-25 16:52 ` Daniele Ceraolo Spurio 2021-08-25 19:22 ` Matthew Brost 2021-08-19 6:16 ` [PATCH 21/27] drm/i915/guc: Proper xarray usage for contexts_lookup Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-26 0:44 ` Daniele Ceraolo Spurio 2021-08-26 0:41 ` Matthew Brost 2021-08-26 0:48 ` Daniele Ceraolo Spurio 2021-08-19 6:16 ` [PATCH 22/27] drm/i915/guc: Drop pin count check trick between sched_disable and re-pin Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-26 0:50 ` Daniele Ceraolo Spurio 2021-08-26 0:50 ` [Intel-gfx] " Daniele Ceraolo Spurio 2021-08-19 6:16 ` [PATCH 23/27] drm/i915/guc: Move GuC priority fields in context under guc_active Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-25 21:51 ` Daniele Ceraolo Spurio 2021-08-25 22:53 ` Matthew Brost 2021-08-25 23:04 ` Matthew Brost 2021-08-19 6:16 ` [PATCH 24/27] drm/i915/guc: Move fields protected by guc->contexts_lock into sub structure Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-25 2:00 ` Daniele Ceraolo Spurio 2021-08-25 2:00 ` [Intel-gfx] " Daniele Ceraolo Spurio 2021-08-19 6:16 ` [PATCH 25/27] drm/i915/guc: Drop guc_active move everything into guc_state Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-26 0:54 ` Daniele Ceraolo Spurio 2021-08-26 0:54 ` [Intel-gfx] " Daniele Ceraolo Spurio 2021-08-19 6:16 ` [PATCH 26/27] drm/i915/guc: Add GuC kernel doc Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-26 1:03 ` Daniele Ceraolo Spurio 2021-08-19 6:16 ` [PATCH 27/27] drm/i915/guc: Drop static inline functions intel_guc_submission.c Matthew Brost 2021-08-19 6:16 ` [Intel-gfx] " Matthew Brost 2021-08-19 7:18 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Clean up GuC CI failures, simplify locking, and kernel DOC (rev3) Patchwork 2021-08-19 7:20 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2021-08-19 7:51 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2021-08-19 9:08 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork 2021-08-26 3:23 [PATCH 00/27] Clean up GuC CI failures, simplify locking, and kernel DOC Matthew Brost 2021-08-26 3:23 ` [PATCH 08/27] drm/i915/selftests: Add a cancel request selftest that triggers a reset Matthew Brost
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210819061639.21051-9-matthew.brost@intel.com \ --to=matthew.brost@intel.com \ --cc=daniel.vetter@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.