summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMika Kuoppala <mika.kuoppala@intel.com>2014-11-07 15:33:34 +0200
committerMika Kuoppala <mika.kuoppala@intel.com>2014-11-11 17:38:46 +0200
commit50d539efebbd71b4f5499e69d0768e69dceae09a (patch)
tree1d9bea9baf5a7c127a34ddde28d9ae0094bf7fb8
parentc049c39f357295ecfc4d0795b5b3b1e35b04ac58 (diff)
tests/gem_reset_stats: add defer-hangcheck test
to see if one can fool hangcheck by keeping non hanging ring busy v2: break from loop instead of return (Daniel Vetter) Cc: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
-rw-r--r--tests/gem_reset_stats.c43
1 files changed, 43 insertions, 0 deletions
diff --git a/tests/gem_reset_stats.c b/tests/gem_reset_stats.c
index 3f5a01f8..ab8728a3 100644
--- a/tests/gem_reset_stats.c
+++ b/tests/gem_reset_stats.c
@@ -1019,6 +1019,45 @@ static void test_params(void)
}
+static void defer_hangcheck(int ring_num)
+{
+ int fd, count_start, count_end;
+ int seconds = 30;
+ const struct target_ring *next_ring;
+ fd = drm_open_any();
+ igt_assert(fd >= 0);
+
+ do {
+ next_ring = &rings[(++ring_num) % NUM_RINGS];
+
+ if (next_ring->present(fd))
+ break;
+
+ } while(next_ring != current_ring);
+
+ igt_skip_on(next_ring == current_ring);
+
+ count_start = get_reset_count(fd, 0);
+ igt_assert(count_start >= 0);
+
+ igt_assert(inject_hang_ring(fd, 0, current_ring->exec, true));
+ while (--seconds) {
+ igt_assert(exec_valid_ring(fd, 0, next_ring->exec));
+
+ count_end = get_reset_count(fd, 0);
+ igt_assert(count_end >= 0);
+
+ if (count_end > count_start)
+ break;
+
+ sleep(1);
+ }
+
+ igt_assert(count_end > count_start);
+
+ close(fd);
+}
+
static bool gem_has_hw_contexts(int fd)
{
struct local_drm_i915_gem_context_create create;
@@ -1159,5 +1198,9 @@ igt_main
igt_subtest_f("close-pending-fork-reverse-%s", name)
RUN_TEST(test_close_pending_fork(true));
+
+ igt_subtest_f("defer-hangcheck-%s", name)
+ RUN_TEST(defer_hangcheck(i));
+
}
}