When RECOVERABLE is set, the kernel will attempt to automatically recover
a context after a hang. But if it is unset, the kernel will ban the
guilty context on a hang, preventing subsequent execution.

Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
---
 tests/gem_ctx_exec.c | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/tests/gem_ctx_exec.c b/tests/gem_ctx_exec.c
index 908b59af..1cd3b20e 100644
--- a/tests/gem_ctx_exec.c
+++ b/tests/gem_ctx_exec.c
@@ -147,6 +147,41 @@ static void invalid_context(int fd, unsigned ring, 
uint32_t handle)
        igt_assert_eq(__gem_execbuf(fd, &execbuf), -ENOENT);
 }
 
+static void norecovery(int i915)
+{
+       for (int pass = 1; pass >= 0; pass--) {
+               struct drm_i915_gem_context_param param = {
+                       .ctx_id = gem_context_create(i915),
+                       .param = 0x7,
+                       .value = pass,
+               };
+               int expect = pass == 0 ? -EIO : 0;
+               igt_spin_t *spin;
+
+               if (pass)
+                       igt_require(__gem_context_set_param(i915, &param) == 0);
+               else
+                       gem_context_set_param(i915, &param);
+               gem_context_get_param(i915, &param);
+               igt_assert_eq(param.value, pass);
+
+               spin = __igt_spin_batch_new(i915,
+                                           .ctx = param.ctx_id,
+                                           .flags = IGT_SPIN_POLL_RUN);
+               igt_assert(spin->running);
+
+               while (!READ_ONCE(*spin->running))
+                       ;
+               igt_force_gpu_reset(i915);
+
+               igt_spin_batch_end(spin);
+               igt_assert_eq(__gem_execbuf(i915, &spin->execbuf), expect);
+               igt_spin_batch_free(i915, spin);
+
+               gem_context_destroy(i915, param.ctx_id);
+       }
+}
+
 igt_main
 {
        const uint32_t batch[2] = { 0, MI_BATCH_BUFFER_END };
@@ -190,6 +225,9 @@ igt_main
        igt_subtest("eviction")
                big_exec(fd, handle, 0);
 
+       igt_subtest("norecovery")
+               norecovery(fd);
+
        igt_subtest("reset-pin-leak") {
                int i;
 
-- 
2.19.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to