[v2] igt/gem_ctx_exec: Exercise I915_CONTEXT_PARAM_RECOVERABLE

Submitted by Chris Wilson on Oct. 4, 2018, 3:30 p.m.

Details

Message ID 20181004153012.4145-1-chris@chris-wilson.co.uk
State New
Series "igt/gem_ctx_exec: Exercise I915_CONTEXT_PARAM_RECOVERABLE"
Headers show

Commit Message

Chris Wilson Oct. 4, 2018, 3:30 p.m.
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.

v2: Create a has_recoverable_param()

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
---
 tests/gem_ctx_exec.c | 48 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

Patch hide | download patch | download mbox

diff --git a/tests/gem_ctx_exec.c b/tests/gem_ctx_exec.c
index 908b59af..44e6ec2b 100644
--- a/tests/gem_ctx_exec.c
+++ b/tests/gem_ctx_exec.c
@@ -147,6 +147,51 @@  static void invalid_context(int fd, unsigned ring, uint32_t handle)
 	igt_assert_eq(__gem_execbuf(fd, &execbuf), -ENOENT);
 }
 
+static bool has_recoverable_param(int i915)
+{
+	struct drm_i915_gem_context_param param = {
+		.param = 0x7,
+	};
+
+	return __gem_context_get_param(i915, &param) == 0;
+}
+
+static void norecovery(int i915)
+{
+	igt_require(has_recoverable_param(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;
+
+		gem_context_set_param(i915, &param);
+
+		param.value = !pass;
+		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 +235,9 @@  igt_main
 	igt_subtest("eviction")
 		big_exec(fd, handle, 0);
 
+	igt_subtest("norecovery")
+		norecovery(fd);
+
 	igt_subtest("reset-pin-leak") {
 		int i;
 

Comments

Mika Kuoppala Oct. 5, 2018, 1:18 p.m.
Chris Wilson <chris@chris-wilson.co.uk> writes:

> 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.
>
> v2: Create a has_recoverable_param()
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala@intel.com>
> ---
>  tests/gem_ctx_exec.c | 48 ++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 48 insertions(+)
>
> diff --git a/tests/gem_ctx_exec.c b/tests/gem_ctx_exec.c
> index 908b59af..44e6ec2b 100644
> --- a/tests/gem_ctx_exec.c
> +++ b/tests/gem_ctx_exec.c
> @@ -147,6 +147,51 @@ static void invalid_context(int fd, unsigned ring, uint32_t handle)
>  	igt_assert_eq(__gem_execbuf(fd, &execbuf), -ENOENT);
>  }
>  
> +static bool has_recoverable_param(int i915)
> +{
> +	struct drm_i915_gem_context_param param = {
> +		.param = 0x7,
> +	};
> +
> +	return __gem_context_get_param(i915, &param) == 0;
> +}
> +
> +static void norecovery(int i915)
> +{
> +	igt_require(has_recoverable_param(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,
> +		};

Now it springs into mind that s/pass/recover would
have added readability.

But not enough for respin imo,
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>

> +		int expect = pass == 0 ? -EIO : 0;
> +		igt_spin_t *spin;
> +
> +		gem_context_set_param(i915, &param);
> +
> +		param.value = !pass;
> +		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 +235,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