korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-11 08:14:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915/selftests: Be a little more lenient for reset workers

Browse Source 
Give the reset worker a kick before losing help when waiting for hang
recovery, as the CPU scheduler is a little unreliable.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200227085723.1961649-15-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2020-02-27 08:57:18 +00:00
parent 834c6bb7ae
commit 280e285dc7
1 changed files with 53 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
drivers/gpu/drm/i915/gt/selftest_lrc.c
View File

@ -90,6 +90,49 @@ static int wait_for_submit(struct intel_engine_cs *engine,
return -ETIME; return -ETIME;
} }
static int wait_for_reset(struct intel_engine_cs *engine,
struct i915_request *rq,
unsigned long timeout)
{
timeout += jiffies;
do {
cond_resched();
intel_engine_flush_submission(engine);
if (READ_ONCE(engine->execlists.pending[0]))
continue;
if (i915_request_completed(rq))
break;
if (READ_ONCE(rq->fence.error))
break;
} while (time_before(jiffies, timeout));
flush_scheduled_work();
if (rq->fence.error != -EIO) {
pr_err("%s: hanging request %llx:%lld not reset\n",
engine->name,
rq->fence.context,
rq->fence.seqno);
return -EINVAL;
}
/* Give the request a jiffie to complete after flushing the worker */
if (i915_request_wait(rq, 0,
max(0l, (long)(timeout - jiffies)) + 1) < 0) {
pr_err("%s: hanging request %llx:%lld did not complete\n",
engine->name,
rq->fence.context,
rq->fence.seqno);
return -ETIME;
}
return 0;
}
static int live_sanitycheck(void *arg) static int live_sanitycheck(void *arg)
{ {
struct intel_gt *gt = arg; struct intel_gt *gt = arg;
@ -1805,14 +1848,9 @@ static int __cancel_active0(struct live_preempt_cancel *arg)
if (err) if (err)
goto out; goto out;
if (i915_request_wait(rq, 0, HZ / 5) < 0) { err = wait_for_reset(arg->engine, rq, HZ / 2);
err = -EIO; if (err) {
goto out; pr_err("Cancelled inflight0 request did not reset\n");
}
if (rq->fence.error != -EIO) {
pr_err("Cancelled inflight0 request did not report -EIO\n");
err = -EINVAL;
goto out; goto out;
} }
@ -1870,10 +1908,9 @@ static int __cancel_active1(struct live_preempt_cancel *arg)
goto out; goto out;
igt_spinner_end(&arg->a.spin); igt_spinner_end(&arg->a.spin);
if (i915_request_wait(rq[1], 0, HZ / 5) < 0) { err = wait_for_reset(arg->engine, rq[1], HZ / 2);
err = -EIO; if (err)
goto out; goto out;
}
if (rq[0]->fence.error != 0) { if (rq[0]->fence.error != 0) {
pr_err("Normal inflight0 request did not complete\n"); pr_err("Normal inflight0 request did not complete\n");
@ -1953,10 +1990,9 @@ static int __cancel_queued(struct live_preempt_cancel *arg)
if (err) if (err)
goto out; goto out;
if (i915_request_wait(rq[2], 0, HZ / 5) < 0) { err = wait_for_reset(arg->engine, rq[2], HZ / 2);
err = -EIO; if (err)
goto out; goto out;
}
if (rq[0]->fence.error != -EIO) { if (rq[0]->fence.error != -EIO) {
pr_err("Cancelled inflight0 request did not report -EIO\n"); pr_err("Cancelled inflight0 request did not report -EIO\n");
@ -2014,14 +2050,9 @@ static int __cancel_hostile(struct live_preempt_cancel *arg)
if (err) if (err)
goto out; goto out;
if (i915_request_wait(rq, 0, HZ / 5) < 0) { err = wait_for_reset(arg->engine, rq, HZ / 2);
err = -EIO; if (err) {
goto out; pr_err("Cancelled inflight0 request did not reset\n");
}
if (rq->fence.error != -EIO) {
pr_err("Cancelled inflight0 request did not report -EIO\n");
err = -EINVAL;
goto out; goto out;
} }