[PATCH] drm/i915: Consolidate reporting of "missed breadcrumbs"

[PATCH] drm/i915: Consolidate reporting of "missed breadcrumbs"

[Chris Wilson]

Move the setting of gpu_error->missed_irq_ring bit to a common function
so that we can get the debug logging for either path.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
 drivers/gpu/drm/i915/intel_breadcrumbs.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_breadcrumbs.c b/drivers/gpu/drm/i915/intel_breadcrumbs.c
index 7c7867d65a39..695ecec52d50 100644
--- a/drivers/gpu/drm/i915/intel_breadcrumbs.c
+++ b/drivers/gpu/drm/i915/intel_breadcrumbs.c
@@ -59,6 +59,16 @@ static unsigned long wait_timeout(void)
 	return round_jiffies_up(jiffies + DRM_I915_HANGCHECK_JIFFIES);
 }
 
+static void missed_breadcrumb(struct intel_engine_cs *engine)
+{
+	DRM_DEBUG_DRIVER("%s missed breadcrumb, irq posted? %s\n",
+			 engine->name,
+			 yesno(test_bit(ENGINE_IRQ_BREADCRUMB,
+					&engine->irq_posted)));
+
+	set_bit(engine->id, &engine->i915->gpu_error.missed_irq_rings);
+}
+
 static void intel_breadcrumbs_hangcheck(unsigned long data)
 {
 	struct intel_engine_cs *engine = (struct intel_engine_cs *)data;
@@ -86,8 +96,7 @@ static void intel_breadcrumbs_hangcheck(unsigned long data)
 	 * DRM_I915_HANGCHECK_JIFFIES [1.5s]!
 	 */
 	if (intel_engine_wakeup(engine) & ENGINE_WAKEUP_ASLEEP) {
-		DRM_DEBUG("Hangcheck timer elapsed... %s idle\n", engine->name);
-		set_bit(engine->id, &engine->i915->gpu_error.missed_irq_rings);
+		missed_breadcrumb(engine);
 		mod_timer(&engine->breadcrumbs.fake_irq, jiffies + 1);
 	} else {
 		mod_timer(&b->hangcheck, wait_timeout());
@@ -180,7 +189,7 @@ void intel_engine_disarm_breadcrumbs(struct intel_engine_cs *engine)
 	 * completion.
 	 */
 	if (__intel_breadcrumbs_wakeup(b) & ENGINE_WAKEUP_ASLEEP)
-		set_bit(engine->id, &engine->i915->gpu_error.missed_irq_rings);
+		missed_breadcrumb(engine);
 
 	__intel_engine_disarm_breadcrumbs(engine);
 
-- 
2.11.0

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

✗ Fi.CI.BAT: failure for drm/i915: Consolidate reporting of "missed breadcrumbs"

[Patchwork]

== Series Details ==

Series: drm/i915: Consolidate reporting of "missed breadcrumbs"
URL   : https://patchwork.freedesktop.org/series/20330/
State : failure

== Summary ==

Series 20330v1 drm/i915: Consolidate reporting of "missed breadcrumbs"
https://patchwork.freedesktop.org/api/1.0/series/20330/revisions/1/mbox/

Test gem_exec_flush:
        Subgroup basic-batch-kernel-default-uc:
                pass       -> FAIL       (fi-snb-2600)
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-a:
                pass       -> DMESG-WARN (fi-byt-n2820)

fi-bdw-5557u     total:278  pass:267  dwarn:0   dfail:0   fail:0   skip:11 
fi-bsw-n3050     total:278  pass:239  dwarn:0   dfail:0   fail:0   skip:39 
fi-bxt-j4205     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19 
fi-bxt-t5700     total:108  pass:95   dwarn:0   dfail:0   fail:0   skip:12 
fi-byt-j1900     total:278  pass:251  dwarn:0   dfail:0   fail:0   skip:27 
fi-byt-n2820     total:278  pass:246  dwarn:1   dfail:0   fail:0   skip:31 
fi-hsw-4770      total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16 
fi-hsw-4770r     total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16 
fi-ilk-650       total:278  pass:228  dwarn:0   dfail:0   fail:0   skip:50 
fi-ivb-3520m     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18 
fi-ivb-3770      total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18 
fi-kbl-7500u     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18 
fi-skl-6260u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10 
fi-skl-6700hq    total:278  pass:261  dwarn:0   dfail:0   fail:0   skip:17 
fi-skl-6700k     total:278  pass:256  dwarn:4   dfail:0   fail:0   skip:18 
fi-skl-6770hq    total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10 
fi-snb-2520m     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28 
fi-snb-2600      total:278  pass:248  dwarn:0   dfail:0   fail:1   skip:29 

1a8bd0fb40e5d02f827f925b7702ed6f64fadce2 drm-tip: 2017y-02m-27d-22h-04m-19s UTC integration manifest
d382435 drm/i915: Consolidate reporting of "missed breadcrumbs"

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3990/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Consolidate reporting of "missed breadcrumbs"

[Tvrtko Ursulin]

On 27/02/2017 23:41, Chris Wilson wrote:
> Move the setting of gpu_error->missed_irq_ring bit to a common function
> so that we can get the debug logging for either path.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_breadcrumbs.c | 15 ++++++++++++---
>  1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_breadcrumbs.c b/drivers/gpu/drm/i915/intel_breadcrumbs.c
> index 7c7867d65a39..695ecec52d50 100644
> --- a/drivers/gpu/drm/i915/intel_breadcrumbs.c
> +++ b/drivers/gpu/drm/i915/intel_breadcrumbs.c
> @@ -59,6 +59,16 @@ static unsigned long wait_timeout(void)
>  	return round_jiffies_up(jiffies + DRM_I915_HANGCHECK_JIFFIES);
>  }
>
> +static void missed_breadcrumb(struct intel_engine_cs *engine)
> +{
> +	DRM_DEBUG_DRIVER("%s missed breadcrumb, irq posted? %s\n",
> +			 engine->name,
> +			 yesno(test_bit(ENGINE_IRQ_BREADCRUMB,
> +					&engine->irq_posted)));
> +
> +	set_bit(engine->id, &engine->i915->gpu_error.missed_irq_rings);
> +}
> +
>  static void intel_breadcrumbs_hangcheck(unsigned long data)
>  {
>  	struct intel_engine_cs *engine = (struct intel_engine_cs *)data;
> @@ -86,8 +96,7 @@ static void intel_breadcrumbs_hangcheck(unsigned long data)
>  	 * DRM_I915_HANGCHECK_JIFFIES [1.5s]!
>  	 */
>  	if (intel_engine_wakeup(engine) & ENGINE_WAKEUP_ASLEEP) {
> -		DRM_DEBUG("Hangcheck timer elapsed... %s idle\n", engine->name);
> -		set_bit(engine->id, &engine->i915->gpu_error.missed_irq_rings);
> +		missed_breadcrumb(engine);
>  		mod_timer(&engine->breadcrumbs.fake_irq, jiffies + 1);
>  	} else {
>  		mod_timer(&b->hangcheck, wait_timeout());
> @@ -180,7 +189,7 @@ void intel_engine_disarm_breadcrumbs(struct intel_engine_cs *engine)
>  	 * completion.
>  	 */
>  	if (__intel_breadcrumbs_wakeup(b) & ENGINE_WAKEUP_ASLEEP)
> -		set_bit(engine->id, &engine->i915->gpu_error.missed_irq_rings);
> +		missed_breadcrumb(engine);
>
>  	__intel_engine_disarm_breadcrumbs(engine);
>
>

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Regards,

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

Re: [PATCH] drm/i915: Consolidate reporting of "missed breadcrumbs"

[Chris Wilson]

On Tue, Feb 28, 2017 at 07:42:50AM +0000, Tvrtko Ursulin wrote:
> 
> On 27/02/2017 23:41, Chris Wilson wrote:
> >Move the setting of gpu_error->missed_irq_ring bit to a common function
> >so that we can get the debug logging for either path.
> >
> >Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> >Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> >---
> > drivers/gpu/drm/i915/intel_breadcrumbs.c | 15 ++++++++++++---
> > 1 file changed, 12 insertions(+), 3 deletions(-)
> >
> >diff --git a/drivers/gpu/drm/i915/intel_breadcrumbs.c b/drivers/gpu/drm/i915/intel_breadcrumbs.c
> >index 7c7867d65a39..695ecec52d50 100644
> >--- a/drivers/gpu/drm/i915/intel_breadcrumbs.c
> >+++ b/drivers/gpu/drm/i915/intel_breadcrumbs.c
> >@@ -59,6 +59,16 @@ static unsigned long wait_timeout(void)
> > 	return round_jiffies_up(jiffies + DRM_I915_HANGCHECK_JIFFIES);
> > }
> >
> >+static void missed_breadcrumb(struct intel_engine_cs *engine)
> >+{
> >+	DRM_DEBUG_DRIVER("%s missed breadcrumb, irq posted? %s\n",
> >+			 engine->name,
> >+			 yesno(test_bit(ENGINE_IRQ_BREADCRUMB,
> >+					&engine->irq_posted)));
> >+
> >+	set_bit(engine->id, &engine->i915->gpu_error.missed_irq_rings);
> >+}
> >+
> > static void intel_breadcrumbs_hangcheck(unsigned long data)
> > {
> > 	struct intel_engine_cs *engine = (struct intel_engine_cs *)data;
> >@@ -86,8 +96,7 @@ static void intel_breadcrumbs_hangcheck(unsigned long data)
> > 	 * DRM_I915_HANGCHECK_JIFFIES [1.5s]!
> > 	 */
> > 	if (intel_engine_wakeup(engine) & ENGINE_WAKEUP_ASLEEP) {
> >-		DRM_DEBUG("Hangcheck timer elapsed... %s idle\n", engine->name);
> >-		set_bit(engine->id, &engine->i915->gpu_error.missed_irq_rings);
> >+		missed_breadcrumb(engine);
> > 		mod_timer(&engine->breadcrumbs.fake_irq, jiffies + 1);
> > 	} else {
> > 		mod_timer(&b->hangcheck, wait_timeout());
> >@@ -180,7 +189,7 @@ void intel_engine_disarm_breadcrumbs(struct intel_engine_cs *engine)
> > 	 * completion.
> > 	 */
> > 	if (__intel_breadcrumbs_wakeup(b) & ENGINE_WAKEUP_ASLEEP)
> >-		set_bit(engine->id, &engine->i915->gpu_error.missed_irq_rings);
> >+		missed_breadcrumb(engine);
> >
> > 	__intel_engine_disarm_breadcrumbs(engine);
> >
> >
> 
> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Would you mind if I added a noinline "%pF", __builtin_return_address(0)?
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Consolidate reporting of "missed breadcrumbs"

[Tvrtko Ursulin]

On 28/02/2017 08:35, Chris Wilson wrote:
> On Tue, Feb 28, 2017 at 07:42:50AM +0000, Tvrtko Ursulin wrote:
>>
>> On 27/02/2017 23:41, Chris Wilson wrote:
>>> Move the setting of gpu_error->missed_irq_ring bit to a common function
>>> so that we can get the debug logging for either path.
>>>
>>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>>> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>>> ---
>>> drivers/gpu/drm/i915/intel_breadcrumbs.c | 15 ++++++++++++---
>>> 1 file changed, 12 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/intel_breadcrumbs.c b/drivers/gpu/drm/i915/intel_breadcrumbs.c
>>> index 7c7867d65a39..695ecec52d50 100644
>>> --- a/drivers/gpu/drm/i915/intel_breadcrumbs.c
>>> +++ b/drivers/gpu/drm/i915/intel_breadcrumbs.c
>>> @@ -59,6 +59,16 @@ static unsigned long wait_timeout(void)
>>> 	return round_jiffies_up(jiffies + DRM_I915_HANGCHECK_JIFFIES);
>>> }
>>>
>>> +static void missed_breadcrumb(struct intel_engine_cs *engine)
>>> +{
>>> +	DRM_DEBUG_DRIVER("%s missed breadcrumb, irq posted? %s\n",
>>> +			 engine->name,
>>> +			 yesno(test_bit(ENGINE_IRQ_BREADCRUMB,
>>> +					&engine->irq_posted)));
>>> +
>>> +	set_bit(engine->id, &engine->i915->gpu_error.missed_irq_rings);
>>> +}
>>> +
>>> static void intel_breadcrumbs_hangcheck(unsigned long data)
>>> {
>>> 	struct intel_engine_cs *engine = (struct intel_engine_cs *)data;
>>> @@ -86,8 +96,7 @@ static void intel_breadcrumbs_hangcheck(unsigned long data)
>>> 	 * DRM_I915_HANGCHECK_JIFFIES [1.5s]!
>>> 	 */
>>> 	if (intel_engine_wakeup(engine) & ENGINE_WAKEUP_ASLEEP) {
>>> -		DRM_DEBUG("Hangcheck timer elapsed... %s idle\n", engine->name);
>>> -		set_bit(engine->id, &engine->i915->gpu_error.missed_irq_rings);
>>> +		missed_breadcrumb(engine);
>>> 		mod_timer(&engine->breadcrumbs.fake_irq, jiffies + 1);
>>> 	} else {
>>> 		mod_timer(&b->hangcheck, wait_timeout());
>>> @@ -180,7 +189,7 @@ void intel_engine_disarm_breadcrumbs(struct intel_engine_cs *engine)
>>> 	 * completion.
>>> 	 */
>>> 	if (__intel_breadcrumbs_wakeup(b) & ENGINE_WAKEUP_ASLEEP)
>>> -		set_bit(engine->id, &engine->i915->gpu_error.missed_irq_rings);
>>> +		missed_breadcrumb(engine);
>>>
>>> 	__intel_engine_disarm_breadcrumbs(engine);
>>>
>>>
>>
>> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> Would you mind if I added a noinline "%pF", __builtin_return_address(0)?

Wouldn't mind. Was thinking along those lines myself but thought the 
source will be inferable from the preceding messages. But even better if 
it is explicit.

Regards,

Tvrtko




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

Re: [PATCH] drm/i915: Consolidate reporting of "missed breadcrumbs"

[Chris Wilson]

On Tue, Feb 28, 2017 at 08:47:17AM +0000, Chris Wilson wrote:
> Move the setting of gpu_error->missed_irq_ring bit to a common function
> so that we can get the debug logging for either path.

Ignore me, bad git send-email before coffee.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH] drm/i915: Consolidate reporting of "missed breadcrumbs"

[Chris Wilson]

Move the setting of gpu_error->missed_irq_ring bit to a common function
so that we can get the debug logging for either path.

v2: Add %pF caller

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
 drivers/gpu/drm/i915/intel_breadcrumbs.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_breadcrumbs.c b/drivers/gpu/drm/i915/intel_breadcrumbs.c
index 7c7867d65a39..ce32186f8cb1 100644
--- a/drivers/gpu/drm/i915/intel_breadcrumbs.c
+++ b/drivers/gpu/drm/i915/intel_breadcrumbs.c
@@ -59,6 +59,16 @@ static unsigned long wait_timeout(void)
 	return round_jiffies_up(jiffies + DRM_I915_HANGCHECK_JIFFIES);
 }
 
+noinline static void missed_breadcrumb(struct intel_engine_cs *engine)
+{
+	DRM_DEBUG_DRIVER("%s missed breadcrumb at %pF, irq posted? %s\n",
+			 engine->name, __builtin_return_address(0),
+			 yesno(test_bit(ENGINE_IRQ_BREADCRUMB,
+					&engine->irq_posted)));
+
+	set_bit(engine->id, &engine->i915->gpu_error.missed_irq_rings);
+}
+
 static void intel_breadcrumbs_hangcheck(unsigned long data)
 {
 	struct intel_engine_cs *engine = (struct intel_engine_cs *)data;
@@ -86,8 +96,7 @@ static void intel_breadcrumbs_hangcheck(unsigned long data)
 	 * DRM_I915_HANGCHECK_JIFFIES [1.5s]!
 	 */
 	if (intel_engine_wakeup(engine) & ENGINE_WAKEUP_ASLEEP) {
-		DRM_DEBUG("Hangcheck timer elapsed... %s idle\n", engine->name);
-		set_bit(engine->id, &engine->i915->gpu_error.missed_irq_rings);
+		missed_breadcrumb(engine);
 		mod_timer(&engine->breadcrumbs.fake_irq, jiffies + 1);
 	} else {
 		mod_timer(&b->hangcheck, wait_timeout());
@@ -180,7 +189,7 @@ void intel_engine_disarm_breadcrumbs(struct intel_engine_cs *engine)
 	 * completion.
 	 */
 	if (__intel_breadcrumbs_wakeup(b) & ENGINE_WAKEUP_ASLEEP)
-		set_bit(engine->id, &engine->i915->gpu_error.missed_irq_rings);
+		missed_breadcrumb(engine);
 
 	__intel_engine_disarm_breadcrumbs(engine);
 
-- 
2.11.0

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

[PATCH] drm/i915: Consolidate reporting of "missed breadcrumbs"

[Chris Wilson]

Move the setting of gpu_error->missed_irq_ring bit to a common function
so that we can get the debug logging for either path.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
 drivers/gpu/drm/i915/intel_breadcrumbs.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_breadcrumbs.c b/drivers/gpu/drm/i915/intel_breadcrumbs.c
index 7c7867d65a39..695ecec52d50 100644
--- a/drivers/gpu/drm/i915/intel_breadcrumbs.c
+++ b/drivers/gpu/drm/i915/intel_breadcrumbs.c
@@ -59,6 +59,16 @@ static unsigned long wait_timeout(void)
 	return round_jiffies_up(jiffies + DRM_I915_HANGCHECK_JIFFIES);
 }
 
+static void missed_breadcrumb(struct intel_engine_cs *engine)
+{
+	DRM_DEBUG_DRIVER("%s missed breadcrumb, irq posted? %s\n",
+			 engine->name,
+			 yesno(test_bit(ENGINE_IRQ_BREADCRUMB,
+					&engine->irq_posted)));
+
+	set_bit(engine->id, &engine->i915->gpu_error.missed_irq_rings);
+}
+
 static void intel_breadcrumbs_hangcheck(unsigned long data)
 {
 	struct intel_engine_cs *engine = (struct intel_engine_cs *)data;
@@ -86,8 +96,7 @@ static void intel_breadcrumbs_hangcheck(unsigned long data)
 	 * DRM_I915_HANGCHECK_JIFFIES [1.5s]!
 	 */
 	if (intel_engine_wakeup(engine) & ENGINE_WAKEUP_ASLEEP) {
-		DRM_DEBUG("Hangcheck timer elapsed... %s idle\n", engine->name);
-		set_bit(engine->id, &engine->i915->gpu_error.missed_irq_rings);
+		missed_breadcrumb(engine);
 		mod_timer(&engine->breadcrumbs.fake_irq, jiffies + 1);
 	} else {
 		mod_timer(&b->hangcheck, wait_timeout());
@@ -180,7 +189,7 @@ void intel_engine_disarm_breadcrumbs(struct intel_engine_cs *engine)
 	 * completion.
 	 */
 	if (__intel_breadcrumbs_wakeup(b) & ENGINE_WAKEUP_ASLEEP)
-		set_bit(engine->id, &engine->i915->gpu_error.missed_irq_rings);
+		missed_breadcrumb(engine);
 
 	__intel_engine_disarm_breadcrumbs(engine);
 
-- 
2.11.0

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