* [PATCH 0/2] Remove some hacks required for GuC 62.0.0
@ 2022-01-13 18:13 ` Matthew Brost
0 siblings, 0 replies; 16+ messages in thread
From: Matthew Brost @ 2022-01-13 18:13 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: john.c.harrison
Remove a hack required because schedule disable done G2H was received
before context reset G2H in GuC firmware 62.0.0. Since we have upgraded
69.0.3, this is no longer required.
Also revive selftest which proves this works before / after change.
v2:
- Address John Harrion's comments
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Matthew Brost (2):
drm/i915/selftests: Add a cancel request selftest that triggers a
reset
drm/i915/guc: Remove hacks for reset and schedule disable G2H being
received out of order
.../gpu/drm/i915/gt/uc/intel_guc_submission.c | 30 +----
drivers/gpu/drm/i915/selftests/i915_request.c | 117 ++++++++++++++++++
2 files changed, 119 insertions(+), 28 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Intel-gfx] [PATCH 0/2] Remove some hacks required for GuC 62.0.0
@ 2022-01-13 18:13 ` Matthew Brost
0 siblings, 0 replies; 16+ messages in thread
From: Matthew Brost @ 2022-01-13 18:13 UTC (permalink / raw)
To: intel-gfx, dri-devel
Remove a hack required because schedule disable done G2H was received
before context reset G2H in GuC firmware 62.0.0. Since we have upgraded
69.0.3, this is no longer required.
Also revive selftest which proves this works before / after change.
v2:
- Address John Harrion's comments
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Matthew Brost (2):
drm/i915/selftests: Add a cancel request selftest that triggers a
reset
drm/i915/guc: Remove hacks for reset and schedule disable G2H being
received out of order
.../gpu/drm/i915/gt/uc/intel_guc_submission.c | 30 +----
drivers/gpu/drm/i915/selftests/i915_request.c | 117 ++++++++++++++++++
2 files changed, 119 insertions(+), 28 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 1/2] drm/i915/selftests: Add a cancel request selftest that triggers a reset
2022-01-13 18:13 ` [Intel-gfx] " Matthew Brost
@ 2022-01-13 18:13 ` Matthew Brost
-1 siblings, 0 replies; 16+ messages in thread
From: Matthew Brost @ 2022-01-13 18:13 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: john.c.harrison
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 completes successfully.
v2:
(Tvrtko)
- Skip test if preemption timeout compiled out
- Skip test if engine reset isn't supported
- Update debug prints to be more descriptive
v3:
- Add comment explaining test
v4:
(John Harrison)
- Fix typos in comment explaining test
- goto out_rq is NOP creation fails
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
---
drivers/gpu/drm/i915/selftests/i915_request.c | 117 ++++++++++++++++++
1 file changed, 117 insertions(+)
---
drivers/gpu/drm/i915/selftests/i915_request.c | 117 ++++++++++++++++++
1 file changed, 117 insertions(+)
diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c
index 7f66f6d299b26..2a99dd7c2fe8a 100644
--- a/drivers/gpu/drm/i915/selftests/i915_request.c
+++ b/drivers/gpu/drm/i915/selftests/i915_request.c
@@ -782,6 +782,115 @@ static int __cancel_completed(struct intel_engine_cs *engine)
return err;
}
+/*
+ * Test to prove a non-preemptable request can be cancelled and a subsequent
+ * request on the same context can successfully complete after cancellation.
+ *
+ * Testing methodology is to create a non-preemptible request and submit it,
+ * wait for spinner to start, create a NOP request and submit it, cancel the
+ * spinner, wait for spinner to complete and verify it failed with an error,
+ * finally wait for NOP request to complete verify it succeeded without an
+ * error. Preemption timeout also reduced / restored so test runs in a timely
+ * maner.
+ */
+static int __cancel_reset(struct drm_i915_private *i915,
+ 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;
+
+ if (!CONFIG_DRM_I915_PREEMPT_TIMEOUT ||
+ !intel_has_reset_engine(engine->gt))
+ return 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 non-preemptable 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_rq;
+ 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;
@@ -814,6 +923,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(i915, engine);
+ if (err)
+ return err;
+
+ if (igt_flush_test(i915))
+ return -EIO;
}
return 0;
--
2.34.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Intel-gfx] [PATCH 1/2] drm/i915/selftests: Add a cancel request selftest that triggers a reset
@ 2022-01-13 18:13 ` Matthew Brost
0 siblings, 0 replies; 16+ messages in thread
From: Matthew Brost @ 2022-01-13 18:13 UTC (permalink / raw)
To: intel-gfx, dri-devel
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 completes successfully.
v2:
(Tvrtko)
- Skip test if preemption timeout compiled out
- Skip test if engine reset isn't supported
- Update debug prints to be more descriptive
v3:
- Add comment explaining test
v4:
(John Harrison)
- Fix typos in comment explaining test
- goto out_rq is NOP creation fails
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
---
drivers/gpu/drm/i915/selftests/i915_request.c | 117 ++++++++++++++++++
1 file changed, 117 insertions(+)
---
drivers/gpu/drm/i915/selftests/i915_request.c | 117 ++++++++++++++++++
1 file changed, 117 insertions(+)
diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c
index 7f66f6d299b26..2a99dd7c2fe8a 100644
--- a/drivers/gpu/drm/i915/selftests/i915_request.c
+++ b/drivers/gpu/drm/i915/selftests/i915_request.c
@@ -782,6 +782,115 @@ static int __cancel_completed(struct intel_engine_cs *engine)
return err;
}
+/*
+ * Test to prove a non-preemptable request can be cancelled and a subsequent
+ * request on the same context can successfully complete after cancellation.
+ *
+ * Testing methodology is to create a non-preemptible request and submit it,
+ * wait for spinner to start, create a NOP request and submit it, cancel the
+ * spinner, wait for spinner to complete and verify it failed with an error,
+ * finally wait for NOP request to complete verify it succeeded without an
+ * error. Preemption timeout also reduced / restored so test runs in a timely
+ * maner.
+ */
+static int __cancel_reset(struct drm_i915_private *i915,
+ 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;
+
+ if (!CONFIG_DRM_I915_PREEMPT_TIMEOUT ||
+ !intel_has_reset_engine(engine->gt))
+ return 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 non-preemptable 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_rq;
+ 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;
@@ -814,6 +923,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(i915, engine);
+ if (err)
+ return err;
+
+ if (igt_flush_test(i915))
+ return -EIO;
}
return 0;
--
2.34.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 2/2] drm/i915/guc: Remove hacks for reset and schedule disable G2H being received out of order
2022-01-13 18:13 ` [Intel-gfx] " Matthew Brost
@ 2022-01-13 18:13 ` Matthew Brost
-1 siblings, 0 replies; 16+ messages in thread
From: Matthew Brost @ 2022-01-13 18:13 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: john.c.harrison
In the i915 there are several hacks in place to make request cancellation
work with an old version of the GuC which delivered the G2H indicating
schedule disable is done before G2H indicating a context reset. Version
69 fixes this, so we can remove these hacks.
v2:
(Checkpatch)
- s/cancelation/cancellation
Reviewed-by: John Harrison <John.C.Harrison@Intel.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
---
.../gpu/drm/i915/gt/uc/intel_guc_submission.c | 30 ++-----------------
1 file changed, 2 insertions(+), 28 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
index 23a40f10d376d..3918f1be114fa 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
@@ -1533,7 +1533,6 @@ static void __guc_reset_context(struct intel_context *ce, bool stalled)
unsigned long flags;
u32 head;
int i, number_children = ce->parallel.number_children;
- bool skip = false;
struct intel_context *parent = ce;
GEM_BUG_ON(intel_context_is_child(ce));
@@ -1544,23 +1543,10 @@ static void __guc_reset_context(struct intel_context *ce, bool stalled)
* GuC will implicitly mark the context as non-schedulable when it sends
* the reset notification. Make sure our state reflects this change. The
* context will be marked enabled on resubmission.
- *
- * XXX: If the context is reset as a result of the request cancellation
- * this G2H is received after the schedule disable complete G2H which is
- * wrong as this creates a race between the request cancellation code
- * re-submitting the context and this G2H handler. This is a bug in the
- * GuC but can be worked around in the meantime but converting this to a
- * NOP if a pending enable is in flight as this indicates that a request
- * cancellation has occurred.
*/
spin_lock_irqsave(&ce->guc_state.lock, flags);
- if (likely(!context_pending_enable(ce)))
- clr_context_enabled(ce);
- else
- skip = true;
+ clr_context_enabled(ce);
spin_unlock_irqrestore(&ce->guc_state.lock, flags);
- if (unlikely(skip))
- goto out_put;
/*
* For each context in the relationship find the hanging request
@@ -1592,7 +1578,6 @@ static void __guc_reset_context(struct intel_context *ce, bool stalled)
}
__unwind_incomplete_requests(parent);
-out_put:
intel_context_put(parent);
}
@@ -2531,12 +2516,6 @@ static void guc_context_cancel_request(struct intel_context *ce,
true);
}
- /*
- * XXX: Racey if context is reset, see comment in
- * __guc_reset_context().
- */
- flush_work(&ce_to_guc(ce)->ct.requests.worker);
-
guc_context_unblock(block_context);
intel_context_put(ce);
}
@@ -3971,12 +3950,7 @@ static void guc_handle_context_reset(struct intel_guc *guc,
{
trace_intel_context_reset(ce);
- /*
- * XXX: Racey if request cancellation has occurred, see comment in
- * __guc_reset_context().
- */
- if (likely(!intel_context_is_banned(ce) &&
- !context_blocked(ce))) {
+ if (likely(!intel_context_is_banned(ce))) {
capture_error_state(guc, ce);
guc_context_replay(ce);
} else {
--
2.34.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Intel-gfx] [PATCH 2/2] drm/i915/guc: Remove hacks for reset and schedule disable G2H being received out of order
@ 2022-01-13 18:13 ` Matthew Brost
0 siblings, 0 replies; 16+ messages in thread
From: Matthew Brost @ 2022-01-13 18:13 UTC (permalink / raw)
To: intel-gfx, dri-devel
In the i915 there are several hacks in place to make request cancellation
work with an old version of the GuC which delivered the G2H indicating
schedule disable is done before G2H indicating a context reset. Version
69 fixes this, so we can remove these hacks.
v2:
(Checkpatch)
- s/cancelation/cancellation
Reviewed-by: John Harrison <John.C.Harrison@Intel.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
---
.../gpu/drm/i915/gt/uc/intel_guc_submission.c | 30 ++-----------------
1 file changed, 2 insertions(+), 28 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
index 23a40f10d376d..3918f1be114fa 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
@@ -1533,7 +1533,6 @@ static void __guc_reset_context(struct intel_context *ce, bool stalled)
unsigned long flags;
u32 head;
int i, number_children = ce->parallel.number_children;
- bool skip = false;
struct intel_context *parent = ce;
GEM_BUG_ON(intel_context_is_child(ce));
@@ -1544,23 +1543,10 @@ static void __guc_reset_context(struct intel_context *ce, bool stalled)
* GuC will implicitly mark the context as non-schedulable when it sends
* the reset notification. Make sure our state reflects this change. The
* context will be marked enabled on resubmission.
- *
- * XXX: If the context is reset as a result of the request cancellation
- * this G2H is received after the schedule disable complete G2H which is
- * wrong as this creates a race between the request cancellation code
- * re-submitting the context and this G2H handler. This is a bug in the
- * GuC but can be worked around in the meantime but converting this to a
- * NOP if a pending enable is in flight as this indicates that a request
- * cancellation has occurred.
*/
spin_lock_irqsave(&ce->guc_state.lock, flags);
- if (likely(!context_pending_enable(ce)))
- clr_context_enabled(ce);
- else
- skip = true;
+ clr_context_enabled(ce);
spin_unlock_irqrestore(&ce->guc_state.lock, flags);
- if (unlikely(skip))
- goto out_put;
/*
* For each context in the relationship find the hanging request
@@ -1592,7 +1578,6 @@ static void __guc_reset_context(struct intel_context *ce, bool stalled)
}
__unwind_incomplete_requests(parent);
-out_put:
intel_context_put(parent);
}
@@ -2531,12 +2516,6 @@ static void guc_context_cancel_request(struct intel_context *ce,
true);
}
- /*
- * XXX: Racey if context is reset, see comment in
- * __guc_reset_context().
- */
- flush_work(&ce_to_guc(ce)->ct.requests.worker);
-
guc_context_unblock(block_context);
intel_context_put(ce);
}
@@ -3971,12 +3950,7 @@ static void guc_handle_context_reset(struct intel_guc *guc,
{
trace_intel_context_reset(ce);
- /*
- * XXX: Racey if request cancellation has occurred, see comment in
- * __guc_reset_context().
- */
- if (likely(!intel_context_is_banned(ce) &&
- !context_blocked(ce))) {
+ if (likely(!intel_context_is_banned(ce))) {
capture_error_state(guc, ce);
guc_context_replay(ce);
} else {
--
2.34.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] drm/i915/selftests: Add a cancel request selftest that triggers a reset
2022-01-13 18:13 ` [Intel-gfx] " Matthew Brost
@ 2022-01-13 18:37 ` John Harrison
-1 siblings, 0 replies; 16+ messages in thread
From: John Harrison @ 2022-01-13 18:37 UTC (permalink / raw)
To: Matthew Brost, intel-gfx, dri-devel
On 1/13/2022 10:13, Matthew Brost wrote:
> 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 completes successfully.
>
> v2:
> (Tvrtko)
> - Skip test if preemption timeout compiled out
> - Skip test if engine reset isn't supported
> - Update debug prints to be more descriptive
> v3:
> - Add comment explaining test
> v4:
> (John Harrison)
> - Fix typos in comment explaining test
> - goto out_rq is NOP creation fails
>
> Signed-off-by: Matthew Brost <matthew.brost@intel.com>
>
> ---
> drivers/gpu/drm/i915/selftests/i915_request.c | 117 ++++++++++++++++++
> 1 file changed, 117 insertions(+)
> ---
> drivers/gpu/drm/i915/selftests/i915_request.c | 117 ++++++++++++++++++
> 1 file changed, 117 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c
> index 7f66f6d299b26..2a99dd7c2fe8a 100644
> --- a/drivers/gpu/drm/i915/selftests/i915_request.c
> +++ b/drivers/gpu/drm/i915/selftests/i915_request.c
> @@ -782,6 +782,115 @@ static int __cancel_completed(struct intel_engine_cs *engine)
> return err;
> }
>
> +/*
> + * Test to prove a non-preemptable request can be cancelled and a subsequent
Oops - another 'preemptible'. Maybe fix that one during merge?
Reviewed-by: John Harrison <John.C.Harrison@Intel.com>
> + * request on the same context can successfully complete after cancellation.
> + *
> + * Testing methodology is to create a non-preemptible request and submit it,
> + * wait for spinner to start, create a NOP request and submit it, cancel the
> + * spinner, wait for spinner to complete and verify it failed with an error,
> + * finally wait for NOP request to complete verify it succeeded without an
> + * error. Preemption timeout also reduced / restored so test runs in a timely
> + * maner.
> + */
> +static int __cancel_reset(struct drm_i915_private *i915,
> + 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;
> +
> + if (!CONFIG_DRM_I915_PREEMPT_TIMEOUT ||
> + !intel_has_reset_engine(engine->gt))
> + return 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 non-preemptable 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_rq;
> + 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;
> @@ -814,6 +923,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(i915, engine);
> + if (err)
> + return err;
> +
> + if (igt_flush_test(i915))
> + return -EIO;
> }
>
> return 0;
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [Intel-gfx] [PATCH 1/2] drm/i915/selftests: Add a cancel request selftest that triggers a reset
@ 2022-01-13 18:37 ` John Harrison
0 siblings, 0 replies; 16+ messages in thread
From: John Harrison @ 2022-01-13 18:37 UTC (permalink / raw)
To: Matthew Brost, intel-gfx, dri-devel
On 1/13/2022 10:13, Matthew Brost wrote:
> 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 completes successfully.
>
> v2:
> (Tvrtko)
> - Skip test if preemption timeout compiled out
> - Skip test if engine reset isn't supported
> - Update debug prints to be more descriptive
> v3:
> - Add comment explaining test
> v4:
> (John Harrison)
> - Fix typos in comment explaining test
> - goto out_rq is NOP creation fails
>
> Signed-off-by: Matthew Brost <matthew.brost@intel.com>
>
> ---
> drivers/gpu/drm/i915/selftests/i915_request.c | 117 ++++++++++++++++++
> 1 file changed, 117 insertions(+)
> ---
> drivers/gpu/drm/i915/selftests/i915_request.c | 117 ++++++++++++++++++
> 1 file changed, 117 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c
> index 7f66f6d299b26..2a99dd7c2fe8a 100644
> --- a/drivers/gpu/drm/i915/selftests/i915_request.c
> +++ b/drivers/gpu/drm/i915/selftests/i915_request.c
> @@ -782,6 +782,115 @@ static int __cancel_completed(struct intel_engine_cs *engine)
> return err;
> }
>
> +/*
> + * Test to prove a non-preemptable request can be cancelled and a subsequent
Oops - another 'preemptible'. Maybe fix that one during merge?
Reviewed-by: John Harrison <John.C.Harrison@Intel.com>
> + * request on the same context can successfully complete after cancellation.
> + *
> + * Testing methodology is to create a non-preemptible request and submit it,
> + * wait for spinner to start, create a NOP request and submit it, cancel the
> + * spinner, wait for spinner to complete and verify it failed with an error,
> + * finally wait for NOP request to complete verify it succeeded without an
> + * error. Preemption timeout also reduced / restored so test runs in a timely
> + * maner.
> + */
> +static int __cancel_reset(struct drm_i915_private *i915,
> + 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;
> +
> + if (!CONFIG_DRM_I915_PREEMPT_TIMEOUT ||
> + !intel_has_reset_engine(engine->gt))
> + return 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 non-preemptable 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_rq;
> + 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;
> @@ -814,6 +923,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(i915, engine);
> + if (err)
> + return err;
> +
> + if (igt_flush_test(i915))
> + return -EIO;
> }
>
> return 0;
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Remove some hacks required for GuC 62.0.0 (rev2)
2022-01-13 18:13 ` [Intel-gfx] " Matthew Brost
` (2 preceding siblings ...)
(?)
@ 2022-01-13 19:17 ` Patchwork
-1 siblings, 0 replies; 16+ messages in thread
From: Patchwork @ 2022-01-13 19:17 UTC (permalink / raw)
To: Matthew Brost; +Cc: intel-gfx
== Series Details ==
Series: Remove some hacks required for GuC 62.0.0 (rev2)
URL : https://patchwork.freedesktop.org/series/98773/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
0bbf21e5b612 drm/i915/selftests: Add a cancel request selftest that triggers a reset
6c1f06c0b615 drm/i915/guc: Remove hacks for reset and schedule disable G2H being received out of order
-:14: WARNING:TYPO_SPELLING: 'cancelation' may be misspelled - perhaps 'cancellation'?
#14:
- s/cancelation/cancellation
^^^^^^^^^^^
total: 0 errors, 1 warnings, 0 checks, 63 lines checked
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for Remove some hacks required for GuC 62.0.0 (rev2)
2022-01-13 18:13 ` [Intel-gfx] " Matthew Brost
` (3 preceding siblings ...)
(?)
@ 2022-01-13 19:48 ` Patchwork
-1 siblings, 0 replies; 16+ messages in thread
From: Patchwork @ 2022-01-13 19:48 UTC (permalink / raw)
To: Matthew Brost; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 11155 bytes --]
== Series Details ==
Series: Remove some hacks required for GuC 62.0.0 (rev2)
URL : https://patchwork.freedesktop.org/series/98773/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_11079 -> Patchwork_21999
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/index.html
Participating hosts (40 -> 41)
------------------------------
Additional (6): fi-kbl-soraka bat-dg1-6 bat-adlp-6 bat-rpls-1 bat-jsl-2 bat-jsl-1
Missing (5): shard-tglu fi-bsw-cyan fi-pnv-d510 shard-rkl shard-dg1
Known issues
------------
Here are the changes found in Patchwork_21999 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@semaphore:
- fi-bdw-5557u: NOTRUN -> [SKIP][1] ([fdo#109271]) +31 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/fi-bdw-5557u/igt@amdgpu/amd_basic@semaphore.html
- fi-hsw-4770: NOTRUN -> [SKIP][2] ([fdo#109271] / [fdo#109315]) +17 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/fi-hsw-4770/igt@amdgpu/amd_basic@semaphore.html
* igt@fbdev@nullptr:
- bat-dg1-6: NOTRUN -> [SKIP][3] ([i915#2582]) +4 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/bat-dg1-6/igt@fbdev@nullptr.html
* igt@gem_exec_fence@basic-busy@bcs0:
- fi-kbl-soraka: NOTRUN -> [SKIP][4] ([fdo#109271]) +8 similar issues
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/fi-kbl-soraka/igt@gem_exec_fence@basic-busy@bcs0.html
* igt@gem_exec_gttfill@basic:
- bat-dg1-6: NOTRUN -> [SKIP][5] ([i915#4086])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/bat-dg1-6/igt@gem_exec_gttfill@basic.html
* igt@gem_huc_copy@huc-copy:
- fi-kbl-soraka: NOTRUN -> [SKIP][6] ([fdo#109271] / [i915#2190])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/fi-kbl-soraka/igt@gem_huc_copy@huc-copy.html
* igt@gem_lmem_swapping@parallel-random-engines:
- fi-kbl-soraka: NOTRUN -> [SKIP][7] ([fdo#109271] / [i915#4613]) +3 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/fi-kbl-soraka/igt@gem_lmem_swapping@parallel-random-engines.html
* igt@gem_mmap@basic:
- bat-dg1-6: NOTRUN -> [SKIP][8] ([i915#4083])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/bat-dg1-6/igt@gem_mmap@basic.html
* igt@gem_tiled_blits@basic:
- bat-dg1-6: NOTRUN -> [SKIP][9] ([i915#4077]) +2 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/bat-dg1-6/igt@gem_tiled_blits@basic.html
* igt@gem_tiled_pread_basic:
- bat-dg1-6: NOTRUN -> [SKIP][10] ([i915#4079]) +1 similar issue
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/bat-dg1-6/igt@gem_tiled_pread_basic.html
* igt@i915_pm_backlight@basic-brightness:
- bat-dg1-6: NOTRUN -> [SKIP][11] ([i915#1155])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/bat-dg1-6/igt@i915_pm_backlight@basic-brightness.html
* igt@i915_selftest@live@gt_pm:
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][12] ([i915#1886] / [i915#2291])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html
* igt@i915_selftest@live@hangcheck:
- bat-dg1-6: NOTRUN -> [DMESG-FAIL][13] ([i915#4494])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/bat-dg1-6/igt@i915_selftest@live@hangcheck.html
* igt@kms_addfb_basic@addfb25-x-tiled-legacy:
- bat-dg1-6: NOTRUN -> [SKIP][14] ([i915#4212]) +7 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/bat-dg1-6/igt@kms_addfb_basic@addfb25-x-tiled-legacy.html
* igt@kms_addfb_basic@basic-y-tiled-legacy:
- bat-dg1-6: NOTRUN -> [SKIP][15] ([i915#4215])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/bat-dg1-6/igt@kms_addfb_basic@basic-y-tiled-legacy.html
* igt@kms_busy@basic:
- bat-dg1-6: NOTRUN -> [SKIP][16] ([i915#4303])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/bat-dg1-6/igt@kms_busy@basic.html
* igt@kms_chamelium@dp-edid-read:
- fi-kbl-soraka: NOTRUN -> [SKIP][17] ([fdo#109271] / [fdo#111827]) +8 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/fi-kbl-soraka/igt@kms_chamelium@dp-edid-read.html
* igt@kms_chamelium@hdmi-edid-read:
- bat-dg1-6: NOTRUN -> [SKIP][18] ([fdo#111827]) +8 similar issues
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/bat-dg1-6/igt@kms_chamelium@hdmi-edid-read.html
* igt@kms_chamelium@vga-edid-read:
- fi-bdw-5557u: NOTRUN -> [SKIP][19] ([fdo#109271] / [fdo#111827]) +8 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/fi-bdw-5557u/igt@kms_chamelium@vga-edid-read.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- bat-dg1-6: NOTRUN -> [SKIP][20] ([i915#4103] / [i915#4213]) +1 similar issue
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/bat-dg1-6/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
* igt@kms_cursor_legacy@basic-flip-after-cursor-legacy:
- bat-dg1-6: NOTRUN -> [SKIP][21] ([i915#4078]) +24 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/bat-dg1-6/igt@kms_cursor_legacy@basic-flip-after-cursor-legacy.html
* igt@kms_force_connector_basic@force-load-detect:
- bat-dg1-6: NOTRUN -> [SKIP][22] ([fdo#109285])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/bat-dg1-6/igt@kms_force_connector_basic@force-load-detect.html
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- fi-kbl-soraka: NOTRUN -> [SKIP][23] ([fdo#109271] / [i915#533])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/fi-kbl-soraka/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d.html
* igt@kms_psr@cursor_plane_move:
- bat-dg1-6: NOTRUN -> [SKIP][24] ([i915#1072] / [i915#4078]) +3 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/bat-dg1-6/igt@kms_psr@cursor_plane_move.html
* igt@kms_psr@primary_page_flip:
- fi-skl-6600u: [PASS][25] -> [INCOMPLETE][26] ([i915#4547] / [i915#4838])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/fi-skl-6600u/igt@kms_psr@primary_page_flip.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/fi-skl-6600u/igt@kms_psr@primary_page_flip.html
* igt@prime_vgem@basic-fence-flip:
- bat-dg1-6: NOTRUN -> [SKIP][27] ([i915#3708]) +3 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/bat-dg1-6/igt@prime_vgem@basic-fence-flip.html
* igt@prime_vgem@basic-gtt:
- bat-dg1-6: NOTRUN -> [SKIP][28] ([i915#3708] / [i915#4077]) +1 similar issue
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/bat-dg1-6/igt@prime_vgem@basic-gtt.html
* igt@prime_vgem@basic-userptr:
- bat-dg1-6: NOTRUN -> [SKIP][29] ([i915#3708] / [i915#4873])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/bat-dg1-6/igt@prime_vgem@basic-userptr.html
* igt@runner@aborted:
- fi-skl-6600u: NOTRUN -> [FAIL][30] ([i915#2722] / [i915#4312])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/fi-skl-6600u/igt@runner@aborted.html
#### Possible fixes ####
* igt@i915_selftest@live@hangcheck:
- fi-hsw-4770: [INCOMPLETE][31] -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/fi-hsw-4770/igt@i915_selftest@live@hangcheck.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/fi-hsw-4770/igt@i915_selftest@live@hangcheck.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1155]: https://gitlab.freedesktop.org/drm/intel/issues/1155
[i915#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2291]: https://gitlab.freedesktop.org/drm/intel/issues/2291
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#2722]: https://gitlab.freedesktop.org/drm/intel/issues/2722
[i915#3003]: https://gitlab.freedesktop.org/drm/intel/issues/3003
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4086]: https://gitlab.freedesktop.org/drm/intel/issues/4086
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4213]: https://gitlab.freedesktop.org/drm/intel/issues/4213
[i915#4215]: https://gitlab.freedesktop.org/drm/intel/issues/4215
[i915#4303]: https://gitlab.freedesktop.org/drm/intel/issues/4303
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4494]: https://gitlab.freedesktop.org/drm/intel/issues/4494
[i915#4547]: https://gitlab.freedesktop.org/drm/intel/issues/4547
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4838]: https://gitlab.freedesktop.org/drm/intel/issues/4838
[i915#4873]: https://gitlab.freedesktop.org/drm/intel/issues/4873
[i915#4898]: https://gitlab.freedesktop.org/drm/intel/issues/4898
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
Build changes
-------------
* Linux: CI_DRM_11079 -> Patchwork_21999
CI-20190529: 20190529
CI_DRM_11079: fd69ca3bcb1f4080babbb2790de47dad5c14f358 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6326: ec75f64fcbcf4aac58fbf1bf629e8f59b19db4ce @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_21999: 6c1f06c0b615a3d67ea7c95693521ca72eca9498 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
6c1f06c0b615 drm/i915/guc: Remove hacks for reset and schedule disable G2H being received out of order
0bbf21e5b612 drm/i915/selftests: Add a cancel request selftest that triggers a reset
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/index.html
[-- Attachment #2: Type: text/html, Size: 13033 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Intel-gfx] ✗ Fi.CI.IGT: failure for Remove some hacks required for GuC 62.0.0 (rev2)
2022-01-13 18:13 ` [Intel-gfx] " Matthew Brost
` (4 preceding siblings ...)
(?)
@ 2022-01-13 20:53 ` Patchwork
-1 siblings, 0 replies; 16+ messages in thread
From: Patchwork @ 2022-01-13 20:53 UTC (permalink / raw)
To: Matthew Brost; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 30271 bytes --]
== Series Details ==
Series: Remove some hacks required for GuC 62.0.0 (rev2)
URL : https://patchwork.freedesktop.org/series/98773/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_11079_full -> Patchwork_21999_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_21999_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_21999_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_21999_full:
### IGT changes ###
#### Possible regressions ####
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-skl: NOTRUN -> [INCOMPLETE][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-skl9/igt@i915_suspend@fence-restore-tiled2untiled.html
Known issues
------------
Here are the changes found in Patchwork_21999_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@feature_discovery@psr2:
- shard-iclb: [PASS][2] -> [SKIP][3] ([i915#658])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-iclb2/igt@feature_discovery@psr2.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-iclb8/igt@feature_discovery@psr2.html
* igt@gem_eio@in-flight-contexts-immediate:
- shard-skl: [PASS][4] -> [TIMEOUT][5] ([i915#3063])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-skl10/igt@gem_eio@in-flight-contexts-immediate.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-skl5/igt@gem_eio@in-flight-contexts-immediate.html
* igt@gem_exec_balancer@parallel-keep-submit-fence:
- shard-iclb: [PASS][6] -> [SKIP][7] ([i915#4525]) +1 similar issue
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-iclb1/igt@gem_exec_balancer@parallel-keep-submit-fence.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-iclb7/igt@gem_exec_balancer@parallel-keep-submit-fence.html
* igt@gem_exec_capture@pi@rcs0:
- shard-skl: [PASS][8] -> [INCOMPLETE][9] ([i915#4547])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-skl4/igt@gem_exec_capture@pi@rcs0.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-skl7/igt@gem_exec_capture@pi@rcs0.html
* igt@gem_exec_fair@basic-none-rrul@rcs0:
- shard-iclb: NOTRUN -> [FAIL][10] ([i915#2842])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-iclb1/igt@gem_exec_fair@basic-none-rrul@rcs0.html
* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-apl: [PASS][11] -> [FAIL][12] ([i915#2842])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-apl4/igt@gem_exec_fair@basic-none-solo@rcs0.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-apl1/igt@gem_exec_fair@basic-none-solo@rcs0.html
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-tglb: NOTRUN -> [FAIL][13] ([i915#2842])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-tglb8/igt@gem_exec_fair@basic-pace-share@rcs0.html
* igt@gem_lmem_swapping@heavy-verify-random:
- shard-kbl: NOTRUN -> [SKIP][14] ([fdo#109271] / [i915#4613]) +2 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl7/igt@gem_lmem_swapping@heavy-verify-random.html
- shard-skl: NOTRUN -> [SKIP][15] ([fdo#109271] / [i915#4613])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-skl9/igt@gem_lmem_swapping@heavy-verify-random.html
* igt@gem_pread@exhaustion:
- shard-skl: NOTRUN -> [WARN][16] ([i915#2658])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-skl2/igt@gem_pread@exhaustion.html
* igt@gem_pwrite@basic-exhaustion:
- shard-kbl: NOTRUN -> [WARN][17] ([i915#2658])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl7/igt@gem_pwrite@basic-exhaustion.html
* igt@gem_pxp@reject-modify-context-protection-off-3:
- shard-tglb: NOTRUN -> [SKIP][18] ([i915#4270])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-tglb8/igt@gem_pxp@reject-modify-context-protection-off-3.html
* igt@gem_render_copy@y-tiled-mc-ccs-to-vebox-y-tiled:
- shard-iclb: NOTRUN -> [SKIP][19] ([i915#768])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-iclb1/igt@gem_render_copy@y-tiled-mc-ccs-to-vebox-y-tiled.html
* igt@gem_userptr_blits@dmabuf-sync:
- shard-iclb: NOTRUN -> [SKIP][20] ([i915#3323])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-iclb8/igt@gem_userptr_blits@dmabuf-sync.html
- shard-tglb: NOTRUN -> [SKIP][21] ([i915#3323])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-tglb8/igt@gem_userptr_blits@dmabuf-sync.html
* igt@gen9_exec_parse@shadow-peek:
- shard-tglb: NOTRUN -> [SKIP][22] ([i915#2527] / [i915#2856])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-tglb8/igt@gen9_exec_parse@shadow-peek.html
- shard-iclb: NOTRUN -> [SKIP][23] ([i915#2856])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-iclb8/igt@gen9_exec_parse@shadow-peek.html
* igt@i915_pm_rpm@modeset-pc8-residency-stress:
- shard-tglb: NOTRUN -> [SKIP][24] ([fdo#109506] / [i915#2411])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-tglb8/igt@i915_pm_rpm@modeset-pc8-residency-stress.html
* igt@kms_async_flips@crc:
- shard-skl: NOTRUN -> [FAIL][25] ([i915#4272])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-skl4/igt@kms_async_flips@crc.html
* igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-async-flip:
- shard-skl: NOTRUN -> [FAIL][26] ([i915#3743]) +1 similar issue
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-skl4/igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-async-flip.html
* igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-hflip:
- shard-kbl: NOTRUN -> [SKIP][27] ([fdo#109271] / [i915#3777]) +2 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl7/igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-hflip.html
- shard-skl: NOTRUN -> [SKIP][28] ([fdo#109271] / [i915#3777])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-skl9/igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-hflip.html
* igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-0-async-flip:
- shard-skl: NOTRUN -> [FAIL][29] ([i915#3763])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-skl4/igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-0-async-flip.html
* igt@kms_big_fb@yf-tiled-32bpp-rotate-0:
- shard-glk: [PASS][30] -> [DMESG-WARN][31] ([i915#118])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk3/igt@kms_big_fb@yf-tiled-32bpp-rotate-0.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-glk9/igt@kms_big_fb@yf-tiled-32bpp-rotate-0.html
* igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0:
- shard-tglb: NOTRUN -> [SKIP][32] ([fdo#111615])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-tglb8/igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0.html
* igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_mc_ccs:
- shard-kbl: NOTRUN -> [SKIP][33] ([fdo#109271] / [i915#3886]) +6 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl7/igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-b-bad-aux-stride-y_tiled_gen12_rc_ccs:
- shard-iclb: NOTRUN -> [SKIP][34] ([fdo#109278]) +2 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-iclb8/igt@kms_ccs@pipe-b-bad-aux-stride-y_tiled_gen12_rc_ccs.html
* igt@kms_ccs@pipe-c-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc:
- shard-skl: NOTRUN -> [SKIP][35] ([fdo#109271] / [i915#3886]) +3 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-skl4/igt@kms_ccs@pipe-c-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-c-random-ccs-data-yf_tiled_ccs:
- shard-tglb: NOTRUN -> [SKIP][36] ([fdo#111615] / [i915#3689])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-tglb8/igt@kms_ccs@pipe-c-random-ccs-data-yf_tiled_ccs.html
* igt@kms_chamelium@hdmi-mode-timings:
- shard-kbl: NOTRUN -> [SKIP][37] ([fdo#109271] / [fdo#111827]) +9 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl7/igt@kms_chamelium@hdmi-mode-timings.html
* igt@kms_chamelium@vga-hpd-after-suspend:
- shard-skl: NOTRUN -> [SKIP][38] ([fdo#109271] / [fdo#111827]) +7 similar issues
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-skl2/igt@kms_chamelium@vga-hpd-after-suspend.html
* igt@kms_color_chamelium@pipe-b-ctm-0-75:
- shard-tglb: NOTRUN -> [SKIP][39] ([fdo#109284] / [fdo#111827]) +1 similar issue
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-tglb8/igt@kms_color_chamelium@pipe-b-ctm-0-75.html
* igt@kms_color_chamelium@pipe-d-ctm-red-to-blue:
- shard-iclb: NOTRUN -> [SKIP][40] ([fdo#109278] / [fdo#109284] / [fdo#111827])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-iclb8/igt@kms_color_chamelium@pipe-d-ctm-red-to-blue.html
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-kbl: [PASS][41] -> [DMESG-WARN][42] ([i915#180]) +5 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-kbl4/igt@kms_cursor_crc@pipe-a-cursor-suspend.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl7/igt@kms_cursor_crc@pipe-a-cursor-suspend.html
* igt@kms_cursor_crc@pipe-b-cursor-32x10-sliding:
- shard-tglb: NOTRUN -> [SKIP][43] ([i915#3359]) +5 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-tglb5/igt@kms_cursor_crc@pipe-b-cursor-32x10-sliding.html
* igt@kms_cursor_crc@pipe-b-cursor-512x170-offscreen:
- shard-tglb: NOTRUN -> [SKIP][44] ([fdo#109279] / [i915#3359])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-tglb8/igt@kms_cursor_crc@pipe-b-cursor-512x170-offscreen.html
* igt@kms_flip@2x-flip-vs-panning-interruptible:
- shard-iclb: NOTRUN -> [SKIP][45] ([fdo#109274])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-iclb8/igt@kms_flip@2x-flip-vs-panning-interruptible.html
- shard-tglb: NOTRUN -> [SKIP][46] ([fdo#109274] / [fdo#111825])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-tglb8/igt@kms_flip@2x-flip-vs-panning-interruptible.html
* igt@kms_flip@flip-vs-suspend-interruptible@c-dp1:
- shard-apl: [PASS][47] -> [DMESG-WARN][48] ([i915#180]) +1 similar issue
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-apl2/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-apl4/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html
* igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile-downscaling:
- shard-tglb: NOTRUN -> [SKIP][49] ([i915#2587])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-tglb5/igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile-downscaling.html
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-kbl: NOTRUN -> [DMESG-WARN][50] ([i915#180]) +2 similar issues
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl7/igt@kms_frontbuffer_tracking@fbc-suspend.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-shrfb-fliptrack-mmap-gtt:
- shard-skl: NOTRUN -> [SKIP][51] ([fdo#109271]) +138 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-skl4/igt@kms_frontbuffer_tracking@fbcpsr-1p-shrfb-fliptrack-mmap-gtt.html
* igt@kms_frontbuffer_tracking@psr-2p-primscrn-spr-indfb-draw-mmap-gtt:
- shard-tglb: NOTRUN -> [SKIP][52] ([fdo#109280] / [fdo#111825]) +2 similar issues
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-tglb8/igt@kms_frontbuffer_tracking@psr-2p-primscrn-spr-indfb-draw-mmap-gtt.html
* igt@kms_frontbuffer_tracking@psr-2p-scndscrn-cur-indfb-draw-mmap-gtt:
- shard-iclb: NOTRUN -> [SKIP][53] ([fdo#109280])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-iclb1/igt@kms_frontbuffer_tracking@psr-2p-scndscrn-cur-indfb-draw-mmap-gtt.html
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- shard-skl: NOTRUN -> [SKIP][54] ([fdo#109271] / [i915#533]) +1 similar issue
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-skl2/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d.html
* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min:
- shard-skl: NOTRUN -> [FAIL][55] ([fdo#108145] / [i915#265])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-skl2/igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min.html
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][56] -> [FAIL][57] ([fdo#108145] / [i915#265])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-skl8/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-skl6/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
* igt@kms_plane_alpha_blend@pipe-c-alpha-7efc:
- shard-kbl: NOTRUN -> [FAIL][58] ([fdo#108145] / [i915#265])
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl7/igt@kms_plane_alpha_blend@pipe-c-alpha-7efc.html
* igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb:
- shard-kbl: NOTRUN -> [FAIL][59] ([i915#265])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl1/igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb.html
* igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping:
- shard-skl: NOTRUN -> [SKIP][60] ([fdo#109271] / [i915#2733])
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-skl4/igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping.html
* igt@kms_psr2_sf@plane-move-sf-dmg-area:
- shard-kbl: NOTRUN -> [SKIP][61] ([fdo#109271] / [i915#658])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl7/igt@kms_psr2_sf@plane-move-sf-dmg-area.html
* igt@kms_psr@psr2_cursor_blt:
- shard-iclb: [PASS][62] -> [SKIP][63] ([fdo#109441]) +1 similar issue
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-iclb2/igt@kms_psr@psr2_cursor_blt.html
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-iclb8/igt@kms_psr@psr2_cursor_blt.html
* igt@kms_psr@psr2_sprite_plane_onoff:
- shard-tglb: NOTRUN -> [FAIL][64] ([i915#132] / [i915#3467])
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-tglb8/igt@kms_psr@psr2_sprite_plane_onoff.html
* igt@kms_writeback@writeback-pixel-formats:
- shard-kbl: NOTRUN -> [SKIP][65] ([fdo#109271] / [i915#2437]) +1 similar issue
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl7/igt@kms_writeback@writeback-pixel-formats.html
* igt@perf@polling:
- shard-skl: [PASS][66] -> [FAIL][67] ([i915#1542])
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-skl8/igt@perf@polling.html
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-skl6/igt@perf@polling.html
* igt@perf@polling-parameterized:
- shard-skl: NOTRUN -> [FAIL][68] ([i915#1542])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-skl4/igt@perf@polling-parameterized.html
* igt@prime_nv_pcopy@test2:
- shard-kbl: NOTRUN -> [SKIP][69] ([fdo#109271]) +122 similar issues
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl7/igt@prime_nv_pcopy@test2.html
* igt@prime_nv_pcopy@test_semaphore:
- shard-tglb: NOTRUN -> [SKIP][70] ([fdo#109291])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-tglb5/igt@prime_nv_pcopy@test_semaphore.html
* igt@sysfs_clients@recycle-many:
- shard-tglb: NOTRUN -> [SKIP][71] ([i915#2994])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-tglb8/igt@sysfs_clients@recycle-many.html
* igt@sysfs_clients@split-25:
- shard-skl: NOTRUN -> [SKIP][72] ([fdo#109271] / [i915#2994]) +2 similar issues
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-skl9/igt@sysfs_clients@split-25.html
- shard-kbl: NOTRUN -> [SKIP][73] ([fdo#109271] / [i915#2994]) +1 similar issue
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl7/igt@sysfs_clients@split-25.html
#### Possible fixes ####
* igt@gem_eio@kms:
- shard-tglb: [TIMEOUT][74] ([i915#3063]) -> [PASS][75]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-tglb8/igt@gem_eio@kms.html
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-tglb7/igt@gem_eio@kms.html
* igt@gem_exec_balancer@parallel-contexts:
- shard-iclb: [SKIP][76] ([i915#4525]) -> [PASS][77]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-iclb8/igt@gem_exec_balancer@parallel-contexts.html
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-iclb1/igt@gem_exec_balancer@parallel-contexts.html
* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-iclb: [FAIL][78] ([i915#2842]) -> [PASS][79] +1 similar issue
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-iclb5/igt@gem_exec_fair@basic-none-share@rcs0.html
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-iclb8/igt@gem_exec_fair@basic-none-share@rcs0.html
- shard-tglb: [FAIL][80] ([i915#2842]) -> [PASS][81]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-tglb7/igt@gem_exec_fair@basic-none-share@rcs0.html
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-tglb2/igt@gem_exec_fair@basic-none-share@rcs0.html
* igt@gem_exec_fair@basic-none-vip@rcs0:
- shard-kbl: [FAIL][82] ([i915#2842]) -> [PASS][83]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-kbl7/igt@gem_exec_fair@basic-none-vip@rcs0.html
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl3/igt@gem_exec_fair@basic-none-vip@rcs0.html
* igt@gem_exec_fair@basic-none@vcs0:
- shard-apl: [FAIL][84] ([i915#2842]) -> [PASS][85]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-apl3/igt@gem_exec_fair@basic-none@vcs0.html
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-apl6/igt@gem_exec_fair@basic-none@vcs0.html
- shard-glk: [FAIL][86] ([i915#2842]) -> [PASS][87] +1 similar issue
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk4/igt@gem_exec_fair@basic-none@vcs0.html
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-glk3/igt@gem_exec_fair@basic-none@vcs0.html
* igt@i915_pm_dc@dc6-dpms:
- shard-iclb: [FAIL][88] ([i915#454]) -> [PASS][89] +1 similar issue
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-iclb3/igt@i915_pm_dc@dc6-dpms.html
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-iclb1/igt@i915_pm_dc@dc6-dpms.html
* igt@i915_pm_rpm@cursor-dpms:
- shard-tglb: [INCOMPLETE][90] ([i915#2411]) -> [PASS][91]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-tglb6/igt@i915_pm_rpm@cursor-dpms.html
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-tglb8/igt@i915_pm_rpm@cursor-dpms.html
* igt@i915_pm_rpm@gem-mmap-type@gtt:
- shard-iclb: [INCOMPLETE][92] -> [PASS][93]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-iclb4/igt@i915_pm_rpm@gem-mmap-type@gtt.html
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-iclb1/igt@i915_pm_rpm@gem-mmap-type@gtt.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1:
- shard-tglb: [FAIL][94] ([i915#79]) -> [PASS][95]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-tglb1/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1.html
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-tglb1/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1.html
* igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a2:
- shard-glk: [FAIL][96] ([i915#79]) -> [PASS][97]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk1/igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a2.html
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-glk2/igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a2.html
* igt@kms_flip@flip-vs-suspend@a-dp1:
- shard-apl: [DMESG-WARN][98] ([i915#180]) -> [PASS][99]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-apl1/igt@kms_flip@flip-vs-suspend@a-dp1.html
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-apl1/igt@kms_flip@flip-vs-suspend@a-dp1.html
* igt@kms_flip@flip-vs-suspend@d-edp1:
- shard-tglb: [DMESG-WARN][100] ([i915#2411] / [i915#2867]) -> [PASS][101]
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-tglb3/igt@kms_flip@flip-vs-suspend@d-edp1.html
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-tglb2/igt@kms_flip@flip-vs-suspend@d-edp1.html
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-upscaling:
- shard-glk: [FAIL][102] ([i915#4911]) -> [PASS][103] +1 similar issue
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk8/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-upscaling.html
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-glk5/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-upscaling.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-move:
- shard-glk: [FAIL][104] ([i915#2546]) -> [PASS][105]
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk9/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-move.html
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-glk4/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-move.html
* igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes:
- shard-kbl: [DMESG-WARN][106] ([i915#180]) -> [PASS][107] +6 similar issues
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-kbl4/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes.html
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl7/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes.html
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [FAIL][108] ([fdo#108145] / [i915#265]) -> [PASS][109]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-skl3/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-skl7/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
* igt@kms_setmode@basic:
- shard-glk: [FAIL][110] ([i915#31]) -> [PASS][111]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-glk4/igt@kms_setmode@basic.html
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-glk8/igt@kms_setmode@basic.html
* igt@perf_pmu@module-unload:
- shard-tglb: [DMESG-WARN][112] ([i915#262] / [i915#2867]) -> [PASS][113]
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-tglb3/igt@perf_pmu@module-unload.html
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-tglb2/igt@perf_pmu@module-unload.html
#### Warnings ####
* igt@gem_exec_balancer@parallel-ordering:
- shard-iclb: [SKIP][114] ([i915#4525]) -> [FAIL][115] ([i915#4916])
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-iclb5/igt@gem_exec_balancer@parallel-ordering.html
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-iclb4/igt@gem_exec_balancer@parallel-ordering.html
* igt@i915_pm_rc6_residency@rc6-idle:
- shard-iclb: [WARN][116] ([i915#2684]) -> [WARN][117] ([i915#1804] / [i915#2684])
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-iclb1/igt@i915_pm_rc6_residency@rc6-idle.html
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-iclb7/igt@i915_pm_rc6_residency@rc6-idle.html
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area:
- shard-iclb: [SKIP][118] ([i915#2920]) -> [SKIP][119] ([fdo#111068] / [i915#658])
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-iclb2/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area.html
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-iclb4/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area.html
* igt@kms_psr2_sf@plane-move-sf-dmg-area:
- shard-iclb: [SKIP][120] ([fdo#111068] / [i915#658]) -> [SKIP][121] ([i915#2920])
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-iclb4/igt@kms_psr2_sf@plane-move-sf-dmg-area.html
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-iclb2/igt@kms_psr2_sf@plane-move-sf-dmg-area.html
* igt@kms_psr2_su@page_flip-p010:
- shard-iclb: [SKIP][122] ([fdo#109642] / [fdo#111068] / [i915#658]) -> [FAIL][123] ([i915#4148])
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-iclb3/igt@kms_psr2_su@page_flip-p010.html
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-iclb2/igt@kms_psr2_su@page_flip-p010.html
* igt@runner@aborted:
- shard-kbl: ([FAIL][124], [FAIL][125], [FAIL][126], [FAIL][127], [FAIL][128], [FAIL][129], [FAIL][130], [FAIL][131], [FAIL][132], [FAIL][133], [FAIL][134], [FAIL][135]) ([i915#1436] / [i915#180] / [i915#1814] / [i915#4312] / [i915#602] / [i915#92]) -> ([FAIL][136], [FAIL][137], [FAIL][138], [FAIL][139], [FAIL][140], [FAIL][141], [FAIL][142], [FAIL][143], [FAIL][144], [FAIL][145], [FAIL][146], [FAIL][147]) ([fdo#109271] / [i915#180] / [i915#1814] / [i915#4312] / [i915#602] / [i915#92])
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-kbl4/igt@runner@aborted.html
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-kbl6/igt@runner@aborted.html
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-kbl4/igt@runner@aborted.html
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-kbl1/igt@runner@aborted.html
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-kbl4/igt@runner@aborted.html
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-kbl6/igt@runner@aborted.html
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-kbl1/igt@runner@aborted.html
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-kbl6/igt@runner@aborted.html
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-kbl1/igt@runner@aborted.html
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-kbl1/igt@runner@aborted.html
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-kbl6/igt@runner@aborted.html
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-kbl6/igt@runner@aborted.html
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl1/igt@runner@aborted.html
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl4/igt@runner@aborted.html
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl1/igt@runner@aborted.html
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl1/igt@runner@aborted.html
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl4/igt@runner@aborted.html
[141]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl6/igt@runner@aborted.html
[142]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl6/igt@runner@aborted.html
[143]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl7/igt@runner@aborted.html
[144]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl4/igt@runner@aborted.html
[145]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl7/igt@runner@aborted.html
[146]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl4/igt@runner@aborted.html
[147]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/shard-kbl7/igt@runner@aborted.html
- shard-apl: ([FAIL][148], [FAIL][149], [FAIL][150], [FAIL][151]) ([i915#180] / [i915#3002] / [i915#4312]) -> ([FAIL][152], [FAIL][153], [FAIL][154], [FAIL][155], [FAIL][156]) ([fdo#109271] / [i915#180] / [i915#3002] / [i915#4312])
[148]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11079/shard-apl2/igt@runner@aborted.html
[149]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DR
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21999/index.html
[-- Attachment #2: Type: text/html, Size: 33780 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] drm/i915/selftests: Add a cancel request selftest that triggers a reset
2022-01-13 17:59 ` John Harrison
@ 2022-01-13 18:01 ` Matthew Brost
0 siblings, 0 replies; 16+ messages in thread
From: Matthew Brost @ 2022-01-13 18:01 UTC (permalink / raw)
To: John Harrison; +Cc: intel-gfx, daniele.ceraolospurio, dri-devel
On Thu, Jan 13, 2022 at 09:59:35AM -0800, John Harrison wrote:
> On 1/13/2022 09:34, Matthew Brost wrote:
> > On Thu, Jan 13, 2022 at 09:33:12AM -0800, John Harrison wrote:
> > > On 1/11/2022 15:11, Matthew Brost wrote:
> > > > 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 completes successfully.
> > > >
> > > > v2:
> > > > (Tvrtko)
> > > > - Skip test if preemption timeout compiled out
> > > > - Skip test if engine reset isn't supported
> > > > - Update debug prints to be more descriptive
> > > > v3:
> > > > - Add comment explaining test
> > > >
> > > > Signed-off-by: Matthew Brost <matthew.brost@intel.com>
> > > > ---
> > > > drivers/gpu/drm/i915/selftests/i915_request.c | 117 ++++++++++++++++++
> > > > 1 file changed, 117 insertions(+)
> > > >
> > > > diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c
> > > > index 7f66f6d299b26..f78de99d5ae1e 100644
> > > > --- a/drivers/gpu/drm/i915/selftests/i915_request.c
> > > > +++ b/drivers/gpu/drm/i915/selftests/i915_request.c
> > > > @@ -782,6 +782,115 @@ static int __cancel_completed(struct intel_engine_cs *engine)
> > > > return err;
> > > > }
> > > > +/*
> > > > + * Test to prove a non-preemptable request can be cancelled and a subsequent
> > > > + * request on the same context can successfully complete after cancallation.
> > > cancellation
> > >
> > Yep.
> >
> > > > + *
> > > > + * Testing methodology is to create non-preemptable request and submit it,
> > > a non-preemptible
> > >
> > Yep.
> >
> > > > + * wait for spinner to start, create a NOP request and submit it, cancel the
> > > > + * spinner, wait for spinner to complete and verify it failed with an error,
> > > > + * finally wait for NOP request to complete verify it succeeded without an
> > > > + * error. Preemption timeout also reduced / restored so test runs in a timely
> > > > + * maner.
> > > > + */
> > > > +static int __cancel_reset(struct drm_i915_private *i915,
> > > > + 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;
> > > > +
> > > > + if (!CONFIG_DRM_I915_PREEMPT_TIMEOUT ||
> > > Does this matter? The test is overriding the default anyway.
> > >
> > Yes. Execlists don't try to preempt anything if
> > CONFIG_DRM_I915_PREEMPT_TIMEOUT is turned off. If we wan't to avoid the
> > cancelation doing a full GT reset, CONFIG_DRM_I915_PREEMPT_TIMEOUT
> > should be turned on.
> Hmm, I would read that as a bug. The description for the config parameter
> is:
> "This is adjustable via
> /sys/class/drm/card?/engine/*/preempt_timeout_ms
>
> May be 0 to disable the timeout.
>
> The compiled in default may get overridden at driver probe time on
> certain platforms and certain engines which will be reflected in
> the
> sysfs control."
>
> I would take that as meaning that even if the compiled in default is zero,
> the user or even the i915 driver itself could override that at runtime and
> enable pre-emption again. So having any code use this as a flag is broken.
> Indeed, any code other than 'engine->default_preempt_timeout =
> CONFIG_PREEMPT_TIMEOUT' is broken, IMHO.
>
Can't really argue against you here.
> But maybe that's for a different patch. If the driver is already behaving
> badly and doing the correct thing here will actually cause test failures
> then you can't really do much other than follow the existing bad behaviour.
>
Yea, agree it is out of scope this patch / series. We can cleanup the
execlists code in a follow up patch if needed + loop in an execlists
expert for a reviewer. Maybe there is a unknown reason that code is
doing this?
Matt
> John.
>
>
> > > > + !intel_has_reset_engine(engine->gt))
> > > > + return 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 non-preemptable 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;
> > > Should be out_rq?
> > >
> > Yes, it should.
> >
> > Matt
> >
> > > John.
> > >
> > >
> > > > + 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;
> > > > @@ -814,6 +923,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(i915, engine);
> > > > + if (err)
> > > > + return err;
> > > > +
> > > > + if (igt_flush_test(i915))
> > > > + return -EIO;
> > > > }
> > > > return 0;
>
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] drm/i915/selftests: Add a cancel request selftest that triggers a reset
2022-01-13 17:34 ` Matthew Brost
@ 2022-01-13 17:59 ` John Harrison
2022-01-13 18:01 ` Matthew Brost
0 siblings, 1 reply; 16+ messages in thread
From: John Harrison @ 2022-01-13 17:59 UTC (permalink / raw)
To: Matthew Brost; +Cc: intel-gfx, daniele.ceraolospurio, dri-devel
On 1/13/2022 09:34, Matthew Brost wrote:
> On Thu, Jan 13, 2022 at 09:33:12AM -0800, John Harrison wrote:
>> On 1/11/2022 15:11, Matthew Brost wrote:
>>> 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 completes successfully.
>>>
>>> v2:
>>> (Tvrtko)
>>> - Skip test if preemption timeout compiled out
>>> - Skip test if engine reset isn't supported
>>> - Update debug prints to be more descriptive
>>> v3:
>>> - Add comment explaining test
>>>
>>> Signed-off-by: Matthew Brost <matthew.brost@intel.com>
>>> ---
>>> drivers/gpu/drm/i915/selftests/i915_request.c | 117 ++++++++++++++++++
>>> 1 file changed, 117 insertions(+)
>>>
>>> diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c
>>> index 7f66f6d299b26..f78de99d5ae1e 100644
>>> --- a/drivers/gpu/drm/i915/selftests/i915_request.c
>>> +++ b/drivers/gpu/drm/i915/selftests/i915_request.c
>>> @@ -782,6 +782,115 @@ static int __cancel_completed(struct intel_engine_cs *engine)
>>> return err;
>>> }
>>> +/*
>>> + * Test to prove a non-preemptable request can be cancelled and a subsequent
>>> + * request on the same context can successfully complete after cancallation.
>> cancellation
>>
> Yep.
>
>>> + *
>>> + * Testing methodology is to create non-preemptable request and submit it,
>> a non-preemptible
>>
> Yep.
>
>>> + * wait for spinner to start, create a NOP request and submit it, cancel the
>>> + * spinner, wait for spinner to complete and verify it failed with an error,
>>> + * finally wait for NOP request to complete verify it succeeded without an
>>> + * error. Preemption timeout also reduced / restored so test runs in a timely
>>> + * maner.
>>> + */
>>> +static int __cancel_reset(struct drm_i915_private *i915,
>>> + 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;
>>> +
>>> + if (!CONFIG_DRM_I915_PREEMPT_TIMEOUT ||
>> Does this matter? The test is overriding the default anyway.
>>
> Yes. Execlists don't try to preempt anything if
> CONFIG_DRM_I915_PREEMPT_TIMEOUT is turned off. If we wan't to avoid the
> cancelation doing a full GT reset, CONFIG_DRM_I915_PREEMPT_TIMEOUT
> should be turned on.
>
Hmm, I would read that as a bug. The description for the config
parameter is:
"This is adjustable via
/sys/class/drm/card?/engine/*/preempt_timeout_ms
May be 0 to disable the timeout.
The compiled in default may get overridden at driver probe
time on
certain platforms and certain engines which will be reflected
in the
sysfs control."
I would take that as meaning that even if the compiled in default is
zero, the user or even the i915 driver itself could override that at
runtime and enable pre-emption again. So having any code use this as a
flag is broken. Indeed, any code other than
'engine->default_preempt_timeout = CONFIG_PREEMPT_TIMEOUT' is broken, IMHO.
But maybe that's for a different patch. If the driver is already
behaving badly and doing the correct thing here will actually cause test
failures then you can't really do much other than follow the existing
bad behaviour.
John.
>>> + !intel_has_reset_engine(engine->gt))
>>> + return 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 non-preemptable 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;
>> Should be out_rq?
>>
> Yes, it should.
>
> Matt
>
>> John.
>>
>>
>>> + 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;
>>> @@ -814,6 +923,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(i915, engine);
>>> + if (err)
>>> + return err;
>>> +
>>> + if (igt_flush_test(i915))
>>> + return -EIO;
>>> }
>>> return 0;
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] drm/i915/selftests: Add a cancel request selftest that triggers a reset
2022-01-13 17:33 ` John Harrison
@ 2022-01-13 17:34 ` Matthew Brost
2022-01-13 17:59 ` John Harrison
0 siblings, 1 reply; 16+ messages in thread
From: Matthew Brost @ 2022-01-13 17:34 UTC (permalink / raw)
To: John Harrison; +Cc: intel-gfx, daniele.ceraolospurio, dri-devel
On Thu, Jan 13, 2022 at 09:33:12AM -0800, John Harrison wrote:
> On 1/11/2022 15:11, Matthew Brost wrote:
> > 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 completes successfully.
> >
> > v2:
> > (Tvrtko)
> > - Skip test if preemption timeout compiled out
> > - Skip test if engine reset isn't supported
> > - Update debug prints to be more descriptive
> > v3:
> > - Add comment explaining test
> >
> > Signed-off-by: Matthew Brost <matthew.brost@intel.com>
> > ---
> > drivers/gpu/drm/i915/selftests/i915_request.c | 117 ++++++++++++++++++
> > 1 file changed, 117 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c
> > index 7f66f6d299b26..f78de99d5ae1e 100644
> > --- a/drivers/gpu/drm/i915/selftests/i915_request.c
> > +++ b/drivers/gpu/drm/i915/selftests/i915_request.c
> > @@ -782,6 +782,115 @@ static int __cancel_completed(struct intel_engine_cs *engine)
> > return err;
> > }
> > +/*
> > + * Test to prove a non-preemptable request can be cancelled and a subsequent
> > + * request on the same context can successfully complete after cancallation.
> cancellation
>
Yep.
> > + *
> > + * Testing methodology is to create non-preemptable request and submit it,
> a non-preemptible
>
Yep.
> > + * wait for spinner to start, create a NOP request and submit it, cancel the
> > + * spinner, wait for spinner to complete and verify it failed with an error,
> > + * finally wait for NOP request to complete verify it succeeded without an
> > + * error. Preemption timeout also reduced / restored so test runs in a timely
> > + * maner.
> > + */
> > +static int __cancel_reset(struct drm_i915_private *i915,
> > + 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;
> > +
> > + if (!CONFIG_DRM_I915_PREEMPT_TIMEOUT ||
> Does this matter? The test is overriding the default anyway.
>
Yes. Execlists don't try to preempt anything if
CONFIG_DRM_I915_PREEMPT_TIMEOUT is turned off. If we wan't to avoid the
cancelation doing a full GT reset, CONFIG_DRM_I915_PREEMPT_TIMEOUT
should be turned on.
> > + !intel_has_reset_engine(engine->gt))
> > + return 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 non-preemptable 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;
> Should be out_rq?
>
Yes, it should.
Matt
> John.
>
>
> > + 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;
> > @@ -814,6 +923,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(i915, engine);
> > + if (err)
> > + return err;
> > +
> > + if (igt_flush_test(i915))
> > + return -EIO;
> > }
> > return 0;
>
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2] drm/i915/selftests: Add a cancel request selftest that triggers a reset
2022-01-11 23:11 ` [PATCH 1/2] drm/i915/selftests: Add a cancel request selftest that triggers a reset Matthew Brost
@ 2022-01-13 17:33 ` John Harrison
2022-01-13 17:34 ` Matthew Brost
0 siblings, 1 reply; 16+ messages in thread
From: John Harrison @ 2022-01-13 17:33 UTC (permalink / raw)
To: Matthew Brost, intel-gfx, dri-devel; +Cc: daniele.ceraolospurio
On 1/11/2022 15:11, Matthew Brost wrote:
> 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 completes successfully.
>
> v2:
> (Tvrtko)
> - Skip test if preemption timeout compiled out
> - Skip test if engine reset isn't supported
> - Update debug prints to be more descriptive
> v3:
> - Add comment explaining test
>
> Signed-off-by: Matthew Brost <matthew.brost@intel.com>
> ---
> drivers/gpu/drm/i915/selftests/i915_request.c | 117 ++++++++++++++++++
> 1 file changed, 117 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c
> index 7f66f6d299b26..f78de99d5ae1e 100644
> --- a/drivers/gpu/drm/i915/selftests/i915_request.c
> +++ b/drivers/gpu/drm/i915/selftests/i915_request.c
> @@ -782,6 +782,115 @@ static int __cancel_completed(struct intel_engine_cs *engine)
> return err;
> }
>
> +/*
> + * Test to prove a non-preemptable request can be cancelled and a subsequent
> + * request on the same context can successfully complete after cancallation.
cancellation
> + *
> + * Testing methodology is to create non-preemptable request and submit it,
a non-preemptible
> + * wait for spinner to start, create a NOP request and submit it, cancel the
> + * spinner, wait for spinner to complete and verify it failed with an error,
> + * finally wait for NOP request to complete verify it succeeded without an
> + * error. Preemption timeout also reduced / restored so test runs in a timely
> + * maner.
> + */
> +static int __cancel_reset(struct drm_i915_private *i915,
> + 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;
> +
> + if (!CONFIG_DRM_I915_PREEMPT_TIMEOUT ||
Does this matter? The test is overriding the default anyway.
> + !intel_has_reset_engine(engine->gt))
> + return 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 non-preemptable 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;
Should be out_rq?
John.
> + 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;
> @@ -814,6 +923,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(i915, engine);
> + if (err)
> + return err;
> +
> + if (igt_flush_test(i915))
> + return -EIO;
> }
>
> return 0;
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 1/2] drm/i915/selftests: Add a cancel request selftest that triggers a reset
2022-01-11 23:11 [PATCH 0/2] Remove some hacks required for GuC 62.0.0 Matthew Brost
@ 2022-01-11 23:11 ` Matthew Brost
2022-01-13 17:33 ` John Harrison
0 siblings, 1 reply; 16+ messages in thread
From: Matthew Brost @ 2022-01-11 23:11 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: daniele.ceraolospurio, john.c.harrison
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 completes successfully.
v2:
(Tvrtko)
- Skip test if preemption timeout compiled out
- Skip test if engine reset isn't supported
- Update debug prints to be more descriptive
v3:
- Add comment explaining test
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
---
drivers/gpu/drm/i915/selftests/i915_request.c | 117 ++++++++++++++++++
1 file changed, 117 insertions(+)
diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c
index 7f66f6d299b26..f78de99d5ae1e 100644
--- a/drivers/gpu/drm/i915/selftests/i915_request.c
+++ b/drivers/gpu/drm/i915/selftests/i915_request.c
@@ -782,6 +782,115 @@ static int __cancel_completed(struct intel_engine_cs *engine)
return err;
}
+/*
+ * Test to prove a non-preemptable request can be cancelled and a subsequent
+ * request on the same context can successfully complete after cancallation.
+ *
+ * Testing methodology is to create non-preemptable request and submit it,
+ * wait for spinner to start, create a NOP request and submit it, cancel the
+ * spinner, wait for spinner to complete and verify it failed with an error,
+ * finally wait for NOP request to complete verify it succeeded without an
+ * error. Preemption timeout also reduced / restored so test runs in a timely
+ * maner.
+ */
+static int __cancel_reset(struct drm_i915_private *i915,
+ 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;
+
+ if (!CONFIG_DRM_I915_PREEMPT_TIMEOUT ||
+ !intel_has_reset_engine(engine->gt))
+ return 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 non-preemptable 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;
@@ -814,6 +923,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(i915, engine);
+ if (err)
+ return err;
+
+ if (igt_flush_test(i915))
+ return -EIO;
}
return 0;
--
2.34.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2022-01-13 20:53 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-13 18:13 [PATCH 0/2] Remove some hacks required for GuC 62.0.0 Matthew Brost
2022-01-13 18:13 ` [Intel-gfx] " Matthew Brost
2022-01-13 18:13 ` [PATCH 1/2] drm/i915/selftests: Add a cancel request selftest that triggers a reset Matthew Brost
2022-01-13 18:13 ` [Intel-gfx] " Matthew Brost
2022-01-13 18:37 ` John Harrison
2022-01-13 18:37 ` [Intel-gfx] " John Harrison
2022-01-13 18:13 ` [PATCH 2/2] drm/i915/guc: Remove hacks for reset and schedule disable G2H being received out of order Matthew Brost
2022-01-13 18:13 ` [Intel-gfx] " Matthew Brost
2022-01-13 19:17 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Remove some hacks required for GuC 62.0.0 (rev2) Patchwork
2022-01-13 19:48 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-01-13 20:53 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2022-01-11 23:11 [PATCH 0/2] Remove some hacks required for GuC 62.0.0 Matthew Brost
2022-01-11 23:11 ` [PATCH 1/2] drm/i915/selftests: Add a cancel request selftest that triggers a reset Matthew Brost
2022-01-13 17:33 ` John Harrison
2022-01-13 17:34 ` Matthew Brost
2022-01-13 17:59 ` John Harrison
2022-01-13 18:01 ` Matthew Brost
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.