From 40e8e50a1e4a5bf71cb2b5ad1a6629646872f9ff Mon Sep 17 00:00:00 2001 From: Antonio Argenziano Date: Mon, 4 Dec 2017 15:45:40 -0800 Subject: tests/gem_exec_schedule: Add reset on failed preemption test. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Cc: Michal Winiarski Signed-off-by: Antonio Argenziano Reviewed-by: Michał Winiarski --- tests/gem_exec_schedule.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'tests') 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) -- cgit v1.2.3