[igt-dev] [PATCH i-g-t 1/2] drm-uapi: Update i915_drm.h for I915_CONTEXT_PARAM_RECOVERABLE

[igt-dev] [PATCH i-g-t 1/2] drm-uapi: Update i915_drm.h for I915_CONTEXT_PARAM_RECOVERABLE

[Chris Wilson]

Copying i915_drm.h from

commit ba4fda620a5f7db521aa9e0262cf49854c1b1d9c (HEAD -> drm-intel-next-queued, drm-intel/drm-intel-next-queued)
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Mon Feb 18 10:58:21 2019 +0000

    drm/i915: Optionally disable automatic recovery after a GPU reset

in order to expose the I915_CONTEXT_PARAM_RECOVERABLE for testing.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 include/drm-uapi/i915_drm.h | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/include/drm-uapi/i915_drm.h b/include/drm-uapi/i915_drm.h
index d2792ab36..43fb8ede2 100644
--- a/include/drm-uapi/i915_drm.h
+++ b/include/drm-uapi/i915_drm.h
@@ -1491,6 +1491,26 @@ struct drm_i915_gem_context_param {
 	 * drm_i915_gem_context_param_sseu.
 	 */
 #define I915_CONTEXT_PARAM_SSEU		0x7
+
+/*
+ * Not all clients may want to attempt automatic recover of a context after
+ * a hang (for example, some clients may only submit very small incremental
+ * batches relying on known logical state of previous batches which will never
+ * recover correctly and each attempt will hang), and so would prefer that
+ * the context is forever banned instead.
+ *
+ * If set to false (0), after a reset, subsequent (and in flight) rendering
+ * from this context is discarded, and the client will need to create a new
+ * context to use instead.
+ *
+ * If set to true (1), the kernel will automatically attempt to recover the
+ * context by skipping the hanging batch and executing the next batch starting
+ * from the default context state (discarding the incomplete logical context
+ * state lost due to the reset).
+ *
+ * On creation, all new contexts are marked as recoverable.
+ */
+#define I915_CONTEXT_PARAM_RECOVERABLE	0x8
 	__u64 value;
 };
 
-- 
2.20.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] [PATCH i-g-t 2/2] igt/gem_ctx_exec: Exercise I915_CONTEXT_PARAM_RECOVERABLE

[Chris Wilson]

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/i915/gem_ctx_exec.c | 48 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/tests/i915/gem_ctx_exec.c b/tests/i915/gem_ctx_exec.c
index 908b59af2..760b58d81 100644
--- a/tests/i915/gem_ctx_exec.c
+++ b/tests/i915/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 = I915_CONTEXT_PARAM_RECOVERABLE
+	};
+
+	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 = I915_CONTEXT_PARAM_RECOVERABLE,
+			.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;
 
-- 
2.20.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [Intel-gfx] [PATCH i-g-t 2/2] igt/gem_ctx_exec: Exercise I915_CONTEXT_PARAM_RECOVERABLE

[Mika Kuoppala]

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>

Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>

Not a topic for this testcase but just brought up thoughts
that we could reap ppgtt and some selected bits in driver
when we ban. Perhaps a future exercise.


> ---
>  tests/i915/gem_ctx_exec.c | 48 +++++++++++++++++++++++++++++++++++++++
>  1 file changed, 48 insertions(+)
>
> diff --git a/tests/i915/gem_ctx_exec.c b/tests/i915/gem_ctx_exec.c
> index 908b59af2..760b58d81 100644
> --- a/tests/i915/gem_ctx_exec.c
> +++ b/tests/i915/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 = I915_CONTEXT_PARAM_RECOVERABLE
> +	};
> +
> +	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 = I915_CONTEXT_PARAM_RECOVERABLE,
> +			.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;
>  
> -- 
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [Intel-gfx] [PATCH i-g-t 2/2] igt/gem_ctx_exec: Exercise I915_CONTEXT_PARAM_RECOVERABLE

[Chris Wilson]

Quoting Mika Kuoppala (2019-02-18 12:49:31)
> 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>
> 
> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> 
> Not a topic for this testcase but just brought up thoughts
> that we could reap ppgtt and some selected bits in driver
> when we ban. Perhaps a future exercise.

Interesting thought. What I would suggest is that you replace the
file_priv->context_idr entry with a stub and then the old context and
gubbins will die naturally as soon as the requests disappear.

As you can't acquire the lock inside reset, you would need to queue a
worker to fixup the idr later.
-Chris
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/2] drm-uapi: Update i915_drm.h for I915_CONTEXT_PARAM_RECOVERABLE

[Patchwork]

== Series Details ==

Series: series starting with [i-g-t,1/2] drm-uapi: Update i915_drm.h for I915_CONTEXT_PARAM_RECOVERABLE
URL   : https://patchwork.freedesktop.org/series/56841/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_5625 -> IGTPW_2435
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/56841/revisions/1/mbox/

Known issues
------------

  Here are the changes found in IGTPW_2435 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@i915_module_load@reload:
    - fi-blb-e6850:       NOTRUN -> INCOMPLETE [fdo#107718]

  
#### Possible fixes ####

  * igt@i915_selftest@live_execlists:
    - fi-apl-guc:         INCOMPLETE [fdo#103927] -> PASS
    - {fi-icl-y}:         INCOMPLETE [fdo#109567] -> PASS

  * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
    - fi-byt-clapper:     FAIL [fdo#103191] / [fdo#107362] -> PASS +1

  * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
    - fi-blb-e6850:       INCOMPLETE [fdo#107718] -> PASS

  * igt@pm_rpm@basic-pci-d3-state:
    - fi-bsw-kefka:       {SKIP} [fdo#109271] -> PASS

  * igt@pm_rpm@basic-rte:
    - fi-bsw-kefka:       FAIL [fdo#108800] -> PASS

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
  [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
  [fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
  [fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
  [fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
  [fdo#108800]: https://bugs.freedesktop.org/show_bug.cgi?id=108800
  [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
  [fdo#109567]: https://bugs.freedesktop.org/show_bug.cgi?id=109567


Participating hosts (46 -> 40)
------------------------------

  Additional (1): fi-icl-u3 
  Missing    (7): fi-ilk-m540 fi-hsw-4200u fi-skl-6770hq fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-gdg-551 


Build changes
-------------

    * IGT: IGT_4834 -> IGTPW_2435

  CI_DRM_5625: de5ff4bca0978ede380791d39b7afa8812622469 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_2435: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2435/
  IGT_4834: 6727e17c00b2ad0a801f96fc8a2afe404b95ec88 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools



== Testlist changes ==

+igt@gem_ctx_exec@norecovery

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2435/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✓ Fi.CI.IGT: success for series starting with [i-g-t,1/2] drm-uapi: Update i915_drm.h for I915_CONTEXT_PARAM_RECOVERABLE

[Patchwork]

== Series Details ==

Series: series starting with [i-g-t,1/2] drm-uapi: Update i915_drm.h for I915_CONTEXT_PARAM_RECOVERABLE
URL   : https://patchwork.freedesktop.org/series/56841/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_5625_full -> IGTPW_2435_full
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/56841/revisions/1/mbox/

Known issues
------------

  Here are the changes found in IGTPW_2435_full that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-a:
    - shard-hsw:          NOTRUN -> DMESG-WARN [fdo#107956]

  * igt@kms_color@pipe-a-degamma:
    - shard-apl:          PASS -> FAIL [fdo#104782] / [fdo#108145]

  * igt@kms_color@pipe-a-gamma:
    - shard-kbl:          NOTRUN -> FAIL [fdo#104782]

  * igt@kms_cursor_crc@cursor-128x128-dpms:
    - shard-kbl:          PASS -> FAIL [fdo#103232] +3

  * igt@kms_cursor_crc@cursor-128x128-random:
    - shard-apl:          NOTRUN -> FAIL [fdo#103232]

  * igt@kms_cursor_crc@cursor-128x128-suspend:
    - shard-apl:          PASS -> FAIL [fdo#103191] / [fdo#103232]
    - shard-kbl:          PASS -> FAIL [fdo#103191] / [fdo#103232]

  * igt@kms_cursor_crc@cursor-256x256-dpms:
    - shard-glk:          NOTRUN -> FAIL [fdo#103232]

  * igt@kms_cursor_crc@cursor-256x256-random:
    - shard-apl:          PASS -> FAIL [fdo#103232] +4

  * igt@kms_cursor_crc@cursor-alpha-opaque:
    - shard-apl:          PASS -> FAIL [fdo#109350]

  * igt@kms_flip@2x-flip-vs-expired-vblank:
    - shard-glk:          PASS -> FAIL [fdo#105363]

  * igt@kms_flip@flip-vs-expired-vblank:
    - shard-glk:          PASS -> FAIL [fdo#102887] / [fdo#105363]

  * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
    - shard-apl:          PASS -> FAIL [fdo#103167] +2

  * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-wc:
    - shard-glk:          PASS -> FAIL [fdo#103167] +2
    - shard-kbl:          PASS -> FAIL [fdo#103167]

  * igt@kms_plane_alpha_blend@pipe-a-alpha-basic:
    - shard-kbl:          NOTRUN -> FAIL [fdo#108145] / [fdo#108590]

  * igt@kms_plane_alpha_blend@pipe-a-constant-alpha-max:
    - shard-apl:          NOTRUN -> FAIL [fdo#108145]

  * igt@kms_plane_multiple@atomic-pipe-a-tiling-y:
    - shard-glk:          PASS -> FAIL [fdo#103166] +4

  * igt@kms_plane_multiple@atomic-pipe-c-tiling-yf:
    - shard-apl:          PASS -> FAIL [fdo#103166] +3
    - shard-kbl:          PASS -> FAIL [fdo#103166] +1

  * igt@prime_busy@wait-before-bsd:
    - shard-apl:          PASS -> INCOMPLETE [fdo#103927]

  
#### Possible fixes ####

  * igt@kms_color@pipe-a-legacy-gamma:
    - shard-kbl:          FAIL [fdo#104782] / [fdo#108145] -> PASS
    - shard-apl:          FAIL [fdo#104782] / [fdo#108145] -> PASS

  * igt@kms_cursor_crc@cursor-128x42-offscreen:
    - shard-hsw:          INCOMPLETE [fdo#103540] -> PASS

  * igt@kms_cursor_crc@cursor-256x256-dpms:
    - shard-apl:          FAIL [fdo#103232] -> PASS

  * igt@kms_cursor_crc@cursor-256x256-suspend:
    - shard-apl:          FAIL [fdo#103191] / [fdo#103232] -> PASS

  * igt@kms_cursor_crc@cursor-64x64-sliding:
    - shard-kbl:          FAIL [fdo#103232] -> PASS +1

  * igt@kms_cursor_legacy@2x-long-flip-vs-cursor-atomic:
    - shard-glk:          FAIL [fdo#104873] -> PASS

  * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-pwrite:
    - shard-kbl:          FAIL [fdo#103167] -> PASS +1

  * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-cpu:
    - shard-apl:          FAIL [fdo#103167] -> PASS

  * igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-draw-pwrite:
    - shard-glk:          FAIL [fdo#103167] -> PASS +1

  * igt@kms_plane_multiple@atomic-pipe-a-tiling-y:
    - shard-apl:          FAIL [fdo#103166] -> PASS +2

  * igt@kms_rotation_crc@multiplane-rotation-cropping-top:
    - shard-kbl:          FAIL [fdo#109016] -> PASS +1

  * igt@kms_universal_plane@universal-plane-pipe-c-functional:
    - shard-glk:          FAIL [fdo#103166] -> PASS +2

  * igt@kms_vblank@pipe-c-ts-continuation-suspend:
    - shard-apl:          FAIL [fdo#104894] -> PASS +1
    - shard-kbl:          FAIL [fdo#104894] -> PASS +1

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [fdo#102887]: https://bugs.freedesktop.org/show_bug.cgi?id=102887
  [fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
  [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
  [fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
  [fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
  [fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
  [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
  [fdo#104782]: https://bugs.freedesktop.org/show_bug.cgi?id=104782
  [fdo#104873]: https://bugs.freedesktop.org/show_bug.cgi?id=104873
  [fdo#104894]: https://bugs.freedesktop.org/show_bug.cgi?id=104894
  [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
  [fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956
  [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
  [fdo#108590]: https://bugs.freedesktop.org/show_bug.cgi?id=108590
  [fdo#109016]: https://bugs.freedesktop.org/show_bug.cgi?id=109016
  [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
  [fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
  [fdo#109350]: https://bugs.freedesktop.org/show_bug.cgi?id=109350


Participating hosts (7 -> 5)
------------------------------

  Missing    (2): shard-skl shard-iclb 


Build changes
-------------

    * IGT: IGT_4834 -> IGTPW_2435
    * Piglit: piglit_4509 -> None

  CI_DRM_5625: de5ff4bca0978ede380791d39b7afa8812622469 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_2435: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2435/
  IGT_4834: 6727e17c00b2ad0a801f96fc8a2afe404b95ec88 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2435/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev