summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAntonio Argenziano <antonio.argenziano@intel.com>2017-12-04 15:45:40 -0800
committerChris Wilson <chris@chris-wilson.co.uk>2017-12-10 14:26:58 +0000
commit40e8e50a1e4a5bf71cb2b5ad1a6629646872f9ff (patch)
tree33acccdece2a175548f1134f102b2967d46a03b7 /tests
parent37339e7171ee0bd6b45abf8cfef593ed9d8bf750 (diff)
tests/gem_exec_schedule: Add reset on failed preemption test.
This patch adds a test where a low priority batch is going to be declared hung while a preemption is pending. The test wants to verify that a 'hanging' low priority batch will not disrupt the execution of a high priority context and that the driver does due diligence in managing a reset while a preemption is pending. -v2: - Use igt_hang_ctx to hang the engine (Chris) - Enable/Process engine reset using IGT libs (Chris) - Create new subtest_group for the test (Chris) Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Michal Winiarski <michal.winiarski@intel.com> Signed-off-by: Antonio Argenziano <antonio.argenziano@intel.com> Reviewed-by: MichaƂ Winiarski <michal.winiarski@intel.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/gem_exec_schedule.c28
1 files changed, 27 insertions, 1 deletions
diff --git a/tests/gem_exec_schedule.c b/tests/gem_exec_schedule.c
index a2f4419a..d0f85b3e 100644
--- a/tests/gem_exec_schedule.c
+++ b/tests/gem_exec_schedule.c
@@ -356,13 +356,15 @@ static void promotion(int fd, unsigned ring)
munmap(ptr, 4096);
}
-#define NEW_CTX 0x1
+#define NEW_CTX (0x1 << 0)
+#define HANG_LP (0x1 << 1)
static void preempt(int fd, unsigned ring, unsigned flags)
{
uint32_t result = gem_create(fd, 4096);
uint32_t *ptr = gem_mmap__gtt(fd, result, 4096, PROT_READ);
igt_spin_t *spin[16];
uint32_t ctx[2];
+ igt_hang_t hang;
ctx[LO] = gem_context_create(fd);
gem_context_set_priority(fd, ctx[LO], MIN_PRIO);
@@ -370,6 +372,9 @@ static void preempt(int fd, unsigned ring, unsigned flags)
ctx[HI] = gem_context_create(fd);
gem_context_set_priority(fd, ctx[HI], MAX_PRIO);
+ if (flags & HANG_LP)
+ hang = igt_hang_ctx(fd, ctx[LO], ring, 0, NULL);
+
for (int n = 0; n < 16; n++) {
if (flags & NEW_CTX) {
gem_context_destroy(fd, ctx[LO]);
@@ -389,6 +394,9 @@ static void preempt(int fd, unsigned ring, unsigned flags)
for (int n = 0; n < 16; n++)
igt_spin_batch_free(fd, spin[n]);
+ if (flags & HANG_LP)
+ igt_post_hang_ring(fd, hang);
+
gem_context_destroy(fd, ctx[LO]);
gem_context_destroy(fd, ctx[HI]);
@@ -1023,6 +1031,24 @@ igt_main
igt_subtest_f("preempt-self-%s", e->name)
preempt_self(fd, e->exec_id | e->flags);
+
+ igt_subtest_group {
+ igt_hang_t hang;
+
+ igt_fixture {
+ igt_stop_hang_detector();
+ hang = igt_allow_hang(fd, 0, 0);
+ }
+
+ igt_subtest_f("preempt-hang-%s", e->name) {
+ preempt(fd, e->exec_id | e->flags, NEW_CTX | HANG_LP);
+ }
+
+ igt_fixture {
+ igt_disallow_hang(fd, hang);
+ igt_fork_hang_detector(fd);
+ }
+ }
}
igt_subtest_f("deep-%s", e->name)