[Intel-gfx] [PATCH i-g-t 1/2] i915/gem_ctx_isolation: Protect inject_reset_context() from banning

[Intel-gfx] [PATCH i-g-t 1/2] i915/gem_ctx_isolation: Protect inject_reset_context() from banning

[Chris Wilson]

Disable banning as we deliberately inject GPU resets to test isolation.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Venkata Ramana Nayana <venkata.ramana.nayana@intel.com>
---
 tests/i915/gem_ctx_isolation.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/tests/i915/gem_ctx_isolation.c b/tests/i915/gem_ctx_isolation.c
index 58a35b487..4f1742685 100644
--- a/tests/i915/gem_ctx_isolation.c
+++ b/tests/i915/gem_ctx_isolation.c
@@ -762,10 +762,21 @@ static void isolation(int fd,
 #define S4 (4 << 8)
 #define SLEEP_MASK (0xf << 8)
 
+static uint32_t create_reset_context(int i915)
+{
+	struct drm_i915_gem_context_param param = {
+		.ctx_id = gem_context_clone_with_engines(i915, 0),
+		.param = I915_CONTEXT_PARAM_BANNABLE,
+	};
+
+	gem_context_set_param(i915, &param);
+	return param.ctx_id;
+}
+
 static void inject_reset_context(int fd, const struct intel_execution_engine2 *e)
 {
 	struct igt_spin_factory opts = {
-		.ctx = gem_context_clone_with_engines(fd, 0),
+		.ctx = create_reset_context(fd),
 		.engine = e->flags,
 		.flags = IGT_SPIN_FAST,
 	};
-- 
2.30.0

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

[Intel-gfx] [PATCH i-g-t 2/2] i915/gem_ctx_exec: Protect norecovery from being banned

[Chris Wilson]

Disable banning as we deliberately inject GPU resets to test norecovery
handling.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Venkata Ramana Nayana <venkata.ramana.nayana@intel.com>
---
 tests/i915/gem_ctx_exec.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/i915/gem_ctx_exec.c b/tests/i915/gem_ctx_exec.c
index 897761856..c80a98473 100644
--- a/tests/i915/gem_ctx_exec.c
+++ b/tests/i915/gem_ctx_exec.c
@@ -171,14 +171,16 @@ 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 = I915_CONTEXT_PARAM_RECOVERABLE,
-			.value = pass,
+			.param = I915_CONTEXT_PARAM_BANNABLE,
 		};
 		int expect = pass == 0 ? -EIO : 0;
 		igt_spin_t *spin;
 
 		gem_context_set_param(i915, &param);
 
+		param.param = I915_CONTEXT_PARAM_RECOVERABLE;
+		param.value = pass;
+		gem_context_set_param(i915, &param);
 		param.value = !pass;
 		gem_context_get_param(i915, &param);
 		igt_assert_eq(param.value, pass);
-- 
2.30.0

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

Re: [Intel-gfx] [PATCH i-g-t 1/2] i915/gem_ctx_isolation: Protect inject_reset_context() from banning

[Chris Wilson]

Quoting Chris Wilson (2021-01-05 11:19:26)
> Disable banning as we deliberately inject GPU resets to test isolation.
> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Venkata Ramana Nayana <venkata.ramana.nayana@intel.com>
> ---
>  tests/i915/gem_ctx_isolation.c | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/i915/gem_ctx_isolation.c b/tests/i915/gem_ctx_isolation.c
> index 58a35b487..4f1742685 100644
> --- a/tests/i915/gem_ctx_isolation.c
> +++ b/tests/i915/gem_ctx_isolation.c
> @@ -762,10 +762,21 @@ static void isolation(int fd,
>  #define S4 (4 << 8)
>  #define SLEEP_MASK (0xf << 8)
>  
> +static uint32_t create_reset_context(int i915)
> +{
> +       struct drm_i915_gem_context_param param = {
> +               .ctx_id = gem_context_clone_with_engines(i915, 0),

An alternative is that we pass CLONE_FLAGS to
gem_context_clone_with_engines(). Danger is context_clone_with_engines
is widely used.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH i-g-t 1/2] i915/gem_ctx_isolation: Protect inject_reset_context() from banning

[Nayana, Venkata Ramana]

> -----Original Message-----
> From: Chris Wilson <chris@chris-wilson.co.uk>
> Sent: Tuesday, January 5, 2021 4:56 PM
> To: intel-gfx@lists.freedesktop.org
> Cc: igt-dev@lists.freedesktop.org; Chris Wilson <chris@chris-wilson.co.uk>;
> Nayana, Venkata Ramana <venkata.ramana.nayana@intel.com>
> Subject: [PATCH i-g-t 1/2] i915/gem_ctx_isolation: Protect
> inject_reset_context() from banning
> 
> Disable banning as we deliberately inject GPU resets to test isolation.
> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Venkata Ramana Nayana <venkata.ramana.nayana@intel.com>
> ---
>  tests/i915/gem_ctx_isolation.c | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/i915/gem_ctx_isolation.c b/tests/i915/gem_ctx_isolation.c
> index 58a35b487..4f1742685 100644
> --- a/tests/i915/gem_ctx_isolation.c
> +++ b/tests/i915/gem_ctx_isolation.c
> @@ -762,10 +762,21 @@ static void isolation(int fd,  #define S4 (4 << 8)
> #define SLEEP_MASK (0xf << 8)
> 
> +static uint32_t create_reset_context(int i915) {
> +	struct drm_i915_gem_context_param param = {
> +		.ctx_id = gem_context_clone_with_engines(i915, 0),
> +		.param = I915_CONTEXT_PARAM_BANNABLE,
> +	};
> +
> +	gem_context_set_param(i915, &param);
> +	return param.ctx_id;
> +}
> +
>  static void inject_reset_context(int fd, const struct intel_execution_engine2
> *e)  {
>  	struct igt_spin_factory opts = {
> -		.ctx = gem_context_clone_with_engines(fd, 0),
> +		.ctx = create_reset_context(fd),
>  		.engine = e->flags,
>  		.flags = IGT_SPIN_FAST,
>  	};
> --
> 2.30.0

Reviewed-by:  Venkata Ramana Nayana <venkata.ramana.nayana@intel.com>

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

[Intel-gfx] [PATCH i-g-t 1/2] i915/gem_ctx_isolation: Protect inject_reset_context() from banning

[Chris Wilson]

Disable banning as we deliberately inject GPU resets to test isolation.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Venkata Ramana Nayana <venkata.ramana.nayana@intel.com>
---
 tests/i915/gem_ctx_isolation.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/tests/i915/gem_ctx_isolation.c b/tests/i915/gem_ctx_isolation.c
index 58a35b487..4f1742685 100644
--- a/tests/i915/gem_ctx_isolation.c
+++ b/tests/i915/gem_ctx_isolation.c
@@ -762,10 +762,21 @@ static void isolation(int fd,
 #define S4 (4 << 8)
 #define SLEEP_MASK (0xf << 8)
 
+static uint32_t create_reset_context(int i915)
+{
+	struct drm_i915_gem_context_param param = {
+		.ctx_id = gem_context_clone_with_engines(i915, 0),
+		.param = I915_CONTEXT_PARAM_BANNABLE,
+	};
+
+	gem_context_set_param(i915, &param);
+	return param.ctx_id;
+}
+
 static void inject_reset_context(int fd, const struct intel_execution_engine2 *e)
 {
 	struct igt_spin_factory opts = {
-		.ctx = gem_context_clone_with_engines(fd, 0),
+		.ctx = create_reset_context(fd),
 		.engine = e->flags,
 		.flags = IGT_SPIN_FAST,
 	};
-- 
2.30.0

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