Skip to content

Commit

Permalink
drm/i915/selftest: Bump selftest timeouts for hangcheck
Browse files Browse the repository at this point in the history
Some testing environments and some heavier tests are slower than
previous limits allowed for. For example, it can take multiple seconds
for the 'context has been reset' notification handler to reach the
'kill the requests' code in the 'active' version of the 'reset
engines' test. During which time the selftest gets bored, gives up
waiting and fails the test.

There is also an async thread that the selftest uses to pump work
through the hardware in parallel to the context that is marked for
reset. That also could get bored waiting for completions and kill the
test off.

Lastly, the flush at the of various test sections can also see
timeouts due to the large amount of work backed up. This is also true
of the live_hwsp_read test.

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210727002348.97202-32-matthew.brost@intel.com
  • Loading branch information
John Harrison authored and John Harrison committed Jul 28, 2021
1 parent 617e87c commit 3a7b726
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/gt/selftest_hangcheck.c
Original file line number Diff line number Diff line change
@@ -879,7 +879,7 @@ static int active_request_put(struct i915_request *rq)
if (!rq)
return 0;

if (i915_request_wait(rq, 0, 5 * HZ) < 0) {
if (i915_request_wait(rq, 0, 10 * HZ) < 0) {
GEM_TRACE("%s timed out waiting for completion of fence %llx:%lld\n",
rq->engine->name,
rq->fence.context,
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/selftests/igt_flush_test.c
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ int igt_flush_test(struct drm_i915_private *i915)

cond_resched();

if (intel_gt_wait_for_idle(gt, HZ / 5) == -ETIME) {
if (intel_gt_wait_for_idle(gt, HZ) == -ETIME) {
pr_err("%pS timed out, cancelling all further testing.\n",
__builtin_return_address(0));

2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@

#define REDUCED_TIMESLICE 5
#define REDUCED_PREEMPT 10
#define WAIT_FOR_RESET_TIME 1000
#define WAIT_FOR_RESET_TIME 10000

int intel_selftest_modify_policy(struct intel_engine_cs *engine,
struct intel_selftest_saved_policy *saved,

0 comments on commit 3a7b726

Please sign in to comment.