[PATCH] drm/i915/selftests: Return to kernel context after each test

[PATCH] drm/i915/selftests: Return to kernel context after each test

[Chris Wilson]

As we flush each test and wait for idle before the next, also switch
back to the kernel context. This helps limit the amount of collateral
damage a test may cause by resetting to the default state each time (and
also helps clean up temporaries used by the test).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
---
 drivers/gpu/drm/i915/selftests/igt_flush_test.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/i915/selftests/igt_flush_test.c b/drivers/gpu/drm/i915/selftests/igt_flush_test.c
index abff2f04ea84..7f35bddc2e95 100644
--- a/drivers/gpu/drm/i915/selftests/igt_flush_test.c
+++ b/drivers/gpu/drm/i915/selftests/igt_flush_test.c
@@ -57,6 +57,11 @@ int igt_flush_test(struct drm_i915_private *i915, unsigned int flags)
 
 	cond_resched();
 
+	if (i915_gem_switch_to_kernel_context(i915)) {
+		pr_err("Failed to switch back to kernel context; declaring wedged\n");
+		i915_gem_set_wedged(i915);
+	}
+
 	wedge_on_timeout(&w, i915, HZ)
 		i915_gem_wait_for_idle(i915, flags);
 
-- 
2.17.0

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

Re: [PATCH] drm/i915/selftests: Return to kernel context after each test

[Mika Kuoppala]

Chris Wilson <chris@chris-wilson.co.uk> writes:

> As we flush each test and wait for idle before the next, also switch
> back to the kernel context. This helps limit the amount of collateral
> damage a test may cause by resetting to the default state each time (and
> also helps clean up temporaries used by the test).
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/selftests/igt_flush_test.c | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/selftests/igt_flush_test.c b/drivers/gpu/drm/i915/selftests/igt_flush_test.c
> index abff2f04ea84..7f35bddc2e95 100644
> --- a/drivers/gpu/drm/i915/selftests/igt_flush_test.c
> +++ b/drivers/gpu/drm/i915/selftests/igt_flush_test.c
> @@ -57,6 +57,11 @@ int igt_flush_test(struct drm_i915_private *i915, unsigned int flags)
>  
>  	cond_resched();
>  
> +	if (i915_gem_switch_to_kernel_context(i915)) {
> +		pr_err("Failed to switch back to kernel context; declaring wedged\n");
> +		i915_gem_set_wedged(i915);

You don't want to give the error code? It comes from request_alloc.
Also if the test already wedged itself we would wedge again.

-Mika


> +	}
> +
>  	wedge_on_timeout(&w, i915, HZ)
>  		i915_gem_wait_for_idle(i915, flags);
>  
> -- 
> 2.17.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/selftests: Return to kernel context after each test

[Chris Wilson]

Quoting Mika Kuoppala (2018-05-08 13:34:49)
> Chris Wilson <chris@chris-wilson.co.uk> writes:
> 
> > As we flush each test and wait for idle before the next, also switch
> > back to the kernel context. This helps limit the amount of collateral
> > damage a test may cause by resetting to the default state each time (and
> > also helps clean up temporaries used by the test).
> >
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> > ---
> >  drivers/gpu/drm/i915/selftests/igt_flush_test.c | 5 +++++
> >  1 file changed, 5 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/i915/selftests/igt_flush_test.c b/drivers/gpu/drm/i915/selftests/igt_flush_test.c
> > index abff2f04ea84..7f35bddc2e95 100644
> > --- a/drivers/gpu/drm/i915/selftests/igt_flush_test.c
> > +++ b/drivers/gpu/drm/i915/selftests/igt_flush_test.c
> > @@ -57,6 +57,11 @@ int igt_flush_test(struct drm_i915_private *i915, unsigned int flags)
> >  
> >       cond_resched();
> >  
> > +     if (i915_gem_switch_to_kernel_context(i915)) {
> > +             pr_err("Failed to switch back to kernel context; declaring wedged\n");
> > +             i915_gem_set_wedged(i915);
> 
> You don't want to give the error code? It comes from request_alloc.

We are setting wedged, so we end up with returning -EIO.

> Also if the test already wedged itself we would wedge again.

Trickier. But at that moment, doubling up on the error messages isn't
the worst thing after hitting a terminal error.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/selftests: Return to kernel context after each test

[Chris Wilson]

Quoting Chris Wilson (2018-05-08 13:38:09)
> Quoting Mika Kuoppala (2018-05-08 13:34:49)
> > Chris Wilson <chris@chris-wilson.co.uk> writes:
> > 
> > > As we flush each test and wait for idle before the next, also switch
> > > back to the kernel context. This helps limit the amount of collateral
> > > damage a test may cause by resetting to the default state each time (and
> > > also helps clean up temporaries used by the test).
> > >
> > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> > > ---
> > >  drivers/gpu/drm/i915/selftests/igt_flush_test.c | 5 +++++
> > >  1 file changed, 5 insertions(+)
> > >
> > > diff --git a/drivers/gpu/drm/i915/selftests/igt_flush_test.c b/drivers/gpu/drm/i915/selftests/igt_flush_test.c
> > > index abff2f04ea84..7f35bddc2e95 100644
> > > --- a/drivers/gpu/drm/i915/selftests/igt_flush_test.c
> > > +++ b/drivers/gpu/drm/i915/selftests/igt_flush_test.c
> > > @@ -57,6 +57,11 @@ int igt_flush_test(struct drm_i915_private *i915, unsigned int flags)
> > >  
> > >       cond_resched();
> > >  
> > > +     if (i915_gem_switch_to_kernel_context(i915)) {
> > > +             pr_err("Failed to switch back to kernel context; declaring wedged\n");
> > > +             i915_gem_set_wedged(i915);
> > 
> > You don't want to give the error code? It comes from request_alloc.
> 
> We are setting wedged, so we end up with returning -EIO.
> 
> > Also if the test already wedged itself we would wedge again.
> 
> Trickier. But at that moment, doubling up on the error messages isn't
> the worst thing after hitting a terminal error.

It's the kind of distraction one tackles after hitting the terminal
error so that you can ignore the underlying problem for a bit while you
think ;)
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/selftests: Return to kernel context after each test

[Mika Kuoppala]

Chris Wilson <chris@chris-wilson.co.uk> writes:

> Quoting Chris Wilson (2018-05-08 13:38:09)
>> Quoting Mika Kuoppala (2018-05-08 13:34:49)
>> > Chris Wilson <chris@chris-wilson.co.uk> writes:
>> > 
>> > > As we flush each test and wait for idle before the next, also switch
>> > > back to the kernel context. This helps limit the amount of collateral
>> > > damage a test may cause by resetting to the default state each time (and
>> > > also helps clean up temporaries used by the test).
>> > >
>> > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>> > > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
>> > > ---
>> > >  drivers/gpu/drm/i915/selftests/igt_flush_test.c | 5 +++++
>> > >  1 file changed, 5 insertions(+)
>> > >
>> > > diff --git a/drivers/gpu/drm/i915/selftests/igt_flush_test.c b/drivers/gpu/drm/i915/selftests/igt_flush_test.c
>> > > index abff2f04ea84..7f35bddc2e95 100644
>> > > --- a/drivers/gpu/drm/i915/selftests/igt_flush_test.c
>> > > +++ b/drivers/gpu/drm/i915/selftests/igt_flush_test.c
>> > > @@ -57,6 +57,11 @@ int igt_flush_test(struct drm_i915_private *i915, unsigned int flags)
>> > >  
>> > >       cond_resched();
>> > >  
>> > > +     if (i915_gem_switch_to_kernel_context(i915)) {
>> > > +             pr_err("Failed to switch back to kernel context; declaring wedged\n");
>> > > +             i915_gem_set_wedged(i915);
>> > 
>> > You don't want to give the error code? It comes from request_alloc.
>> 
>> We are setting wedged, so we end up with returning -EIO.
>> 
>> > Also if the test already wedged itself we would wedge again.
>> 
>> Trickier. But at that moment, doubling up on the error messages isn't
>> the worst thing after hitting a terminal error.
>
> It's the kind of distraction one tackles after hitting the terminal
> error so that you can ignore the underlying problem for a bit while you
> think ;)

Yeah it the test manages to wedge we would get EIO so nothing
to see there.

Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for drm/i915/selftests: Return to kernel context after each test

[Patchwork]

== Series Details ==

Series: drm/i915/selftests: Return to kernel context after each test
URL   : https://patchwork.freedesktop.org/series/42872/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4156 -> Patchwork_8940 =

== Summary - WARNING ==

  Minor unknown changes coming with Patchwork_8940 need to be verified
  manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_8940, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

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

== Possible new issues ==

  Here are the unknown changes that may have been introduced in Patchwork_8940:

  === IGT changes ===

    ==== Warnings ====

    igt@kms_force_connector_basic@force-edid:
      fi-ivb-3520m:       SKIP -> PASS +3

    
== Known issues ==

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

  === IGT changes ===

    ==== Issues hit ====

    igt@debugfs_test@read_all_entries:
      fi-snb-2520m:       PASS -> INCOMPLETE (fdo#103713)

    igt@drv_module_reload@basic-no-display:
      fi-bsw-n3050:       PASS -> DMESG-FAIL (fdo#106373)

    igt@kms_flip@basic-flip-vs-wf_vblank:
      fi-cfl-8700k:       PASS -> FAIL (fdo#103928)

    
  fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
  fdo#103928 https://bugs.freedesktop.org/show_bug.cgi?id=103928
  fdo#106373 https://bugs.freedesktop.org/show_bug.cgi?id=106373


== Participating hosts (41 -> 37) ==

  Missing    (4): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-skl-6700hq 


== Build changes ==

    * Linux: CI_DRM_4156 -> Patchwork_8940

  CI_DRM_4156: 1b7320affa4b0e87033171001f1bd14c9c09eb8b @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4464: 1bb318b32db003a377da14715c7b80675a712b6b @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_8940: 93a2c9248bfcdc64221caf1e9a746d33f406ea8d @ git://anongit.freedesktop.org/gfx-ci/linux
  piglit_4464: 33e58d5583eb7ed3966a1b905f875a1dfa959f6b @ git://anongit.freedesktop.org/piglit


== Linux commits ==

93a2c9248bfc drm/i915/selftests: Return to kernel context after each test

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8940/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.IGT: success for drm/i915/selftests: Return to kernel context after each test

[Patchwork]

== Series Details ==

Series: drm/i915/selftests: Return to kernel context after each test
URL   : https://patchwork.freedesktop.org/series/42872/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4156_full -> Patchwork_8940_full =

== Summary - WARNING ==

  Minor unknown changes coming with Patchwork_8940_full need to be verified
  manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_8940_full, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

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

== Possible new issues ==

  Here are the unknown changes that may have been introduced in Patchwork_8940_full:

  === IGT changes ===

    ==== Warnings ====

    igt@gem_mocs_settings@mocs-rc6-blt:
      shard-kbl:          SKIP -> PASS

    
== Known issues ==

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

  === IGT changes ===

    ==== Issues hit ====

    igt@kms_cursor_crc@cursor-128x42-sliding:
      shard-kbl:          PASS -> DMESG-WARN (fdo#103558, fdo#105602) +4

    igt@kms_flip@absolute-wf_vblank-interruptible:
      shard-glk:          PASS -> FAIL (fdo#106087)

    igt@kms_flip@modeset-vs-vblank-race:
      shard-glk:          PASS -> FAIL (fdo#103060)
      shard-apl:          PASS -> FAIL (fdo#103060)

    igt@kms_flip@plain-flip-fb-recreate-interruptible:
      shard-hsw:          PASS -> FAIL (fdo#100368)

    igt@kms_flip@wf_vblank-ts-check-interruptible:
      shard-apl:          PASS -> FAIL (fdo#100368)

    igt@kms_vblank@pipe-b-ts-continuation-idle-hang:
      shard-glk:          PASS -> DMESG-WARN (fdo#106247)

    
    ==== Possible fixes ====

    igt@kms_cursor_legacy@2x-long-flip-vs-cursor-atomic:
      shard-hsw:          FAIL (fdo#104873) -> PASS

    igt@kms_cursor_legacy@all-pipes-single-move:
      shard-apl:          INCOMPLETE (fdo#103927) -> PASS

    igt@kms_flip@2x-dpms-vs-vblank-race:
      shard-hsw:          FAIL (fdo#103060) -> PASS

    igt@kms_flip@absolute-wf_vblank-interruptible:
      shard-apl:          FAIL (fdo#106087) -> PASS

    igt@kms_flip@plain-flip-ts-check-interruptible:
      shard-hsw:          FAIL (fdo#100368) -> PASS

    igt@kms_flip@wf_vblank-ts-check-interruptible:
      shard-glk:          FAIL (fdo#100368) -> PASS +1

    igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite:
      shard-apl:          FAIL (fdo#103167, fdo#104724) -> PASS

    igt@pm_rpm@fences-dpms:
      shard-kbl:          DMESG-WARN (fdo#103558, fdo#105602) -> PASS +3

    
  fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
  fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
  fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
  fdo#103558 https://bugs.freedesktop.org/show_bug.cgi?id=103558
  fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
  fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
  fdo#104873 https://bugs.freedesktop.org/show_bug.cgi?id=104873
  fdo#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602
  fdo#106087 https://bugs.freedesktop.org/show_bug.cgi?id=106087
  fdo#106247 https://bugs.freedesktop.org/show_bug.cgi?id=106247


== Participating hosts (5 -> 5) ==

  No changes in participating hosts


== Build changes ==

    * Linux: CI_DRM_4156 -> Patchwork_8940

  CI_DRM_4156: 1b7320affa4b0e87033171001f1bd14c9c09eb8b @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4464: 1bb318b32db003a377da14715c7b80675a712b6b @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_8940: 93a2c9248bfcdc64221caf1e9a746d33f406ea8d @ git://anongit.freedesktop.org/gfx-ci/linux
  piglit_4464: 33e58d5583eb7ed3966a1b905f875a1dfa959f6b @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8940/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/selftests: Return to kernel context after each test

[Chris Wilson]

Quoting Mika Kuoppala (2018-05-08 13:57:23)
> Chris Wilson <chris@chris-wilson.co.uk> writes:
> 
> > Quoting Chris Wilson (2018-05-08 13:38:09)
> >> Quoting Mika Kuoppala (2018-05-08 13:34:49)
> >> > Chris Wilson <chris@chris-wilson.co.uk> writes:
> >> > 
> >> > > As we flush each test and wait for idle before the next, also switch
> >> > > back to the kernel context. This helps limit the amount of collateral
> >> > > damage a test may cause by resetting to the default state each time (and
> >> > > also helps clean up temporaries used by the test).
> >> > >
> >> > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> >> > > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> >> > > ---
> >> > >  drivers/gpu/drm/i915/selftests/igt_flush_test.c | 5 +++++
> >> > >  1 file changed, 5 insertions(+)
> >> > >
> >> > > diff --git a/drivers/gpu/drm/i915/selftests/igt_flush_test.c b/drivers/gpu/drm/i915/selftests/igt_flush_test.c
> >> > > index abff2f04ea84..7f35bddc2e95 100644
> >> > > --- a/drivers/gpu/drm/i915/selftests/igt_flush_test.c
> >> > > +++ b/drivers/gpu/drm/i915/selftests/igt_flush_test.c
> >> > > @@ -57,6 +57,11 @@ int igt_flush_test(struct drm_i915_private *i915, unsigned int flags)
> >> > >  
> >> > >       cond_resched();
> >> > >  
> >> > > +     if (i915_gem_switch_to_kernel_context(i915)) {
> >> > > +             pr_err("Failed to switch back to kernel context; declaring wedged\n");
> >> > > +             i915_gem_set_wedged(i915);
> >> > 
> >> > You don't want to give the error code? It comes from request_alloc.
> >> 
> >> We are setting wedged, so we end up with returning -EIO.
> >> 
> >> > Also if the test already wedged itself we would wedge again.
> >> 
> >> Trickier. But at that moment, doubling up on the error messages isn't
> >> the worst thing after hitting a terminal error.
> >
> > It's the kind of distraction one tackles after hitting the terminal
> > error so that you can ignore the underlying problem for a bit while you
> > think ;)
> 
> Yeah it the test manages to wedge we would get EIO so nothing
> to see there.
> 
> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>

Applied, thanks for the review. If we ever feel upset about the double
message in practice, then is the time to fix it ;)
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx