Attachment 80335 Details for Bug 65394 – Don't count semaphore waits towards a hang

[patch] Don't count semaphore waits towards a hang

0002-drm-i915-Don-t-count-semaphore-waits-towards-a-stuck.patch (text/plain), 4.47 KB, created by Chris Wilson on 2013-06-05 09:46:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2013-06-05 09:46:40 UTC

Size: 4.47 KB

patch

obsolete

>From 31a38f59a9a57f610941073f5aff043414df6212 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Wed, 5 Jun 2013 10:08:35 +0100
>Subject: [PATCH 2/2] drm/i915: Don't count semaphore waits towards a stuck
> ring
>
>If we detect a ring is in a valid wait for another, just let it be.
>Eventually it will either begin to progress again, or the entire system
>will come grinding to a halt and then hangcheck will fire as soon as the
>deadlock is detected.
>
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/i915_irq.c         |   66 +++++++++++++++++++++++--------
> drivers/gpu/drm/i915/intel_ringbuffer.h |    1 +
> 2 files changed, 51 insertions(+), 16 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>index e936fde..aa9cb6e 100644
>--- a/drivers/gpu/drm/i915/i915_irq.c
>+++ b/drivers/gpu/drm/i915/i915_irq.c
>@@ -2331,21 +2331,21 @@ static bool i915_hangcheck_ring_idle(struct intel_ring_buffer *ring,
> 	return false;
> }
> 
>-static bool semaphore_passed(struct intel_ring_buffer *ring)
>+static struct intel_ring_buffer *
>+semaphore_waits_for(struct intel_ring_buffer *ring, u32 *seqno)
> {
> 	struct drm_i915_private *dev_priv = ring->dev->dev_private;
>-	u32 acthd = intel_ring_get_active_head(ring) & HEAD_ADDR;
>-	struct intel_ring_buffer *signaller;
>-	u32 cmd, ipehr, acthd_min;
>+	u32 cmd, ipehr, acthd, acthd_min;
> 
> 	ipehr = I915_READ(RING_IPEHR(ring->mmio_base));
> 	if ((ipehr & ~(0x3 << 16)) !=
> 	    (MI_SEMAPHORE_MBOX | MI_SEMAPHORE_COMPARE | MI_SEMAPHORE_REGISTER))
>-		return false;
>+		return NULL;
> 
> 	/* ACTHD is likely pointing to the dword after the actual command,
> 	 * so scan backwards until we find the MBOX.
> 	 */
>+	acthd = intel_ring_get_active_head(ring) & HEAD_ADDR;
> 	acthd_min = max((int)acthd - 3 * 4, 0);
> 	do {
> 		cmd = ioread32(ring->virtual_start + acthd);
>@@ -2354,12 +2354,40 @@ static bool semaphore_passed(struct intel_ring_buffer *ring)
> 
> 		acthd -= 4;
> 		if (acthd < acthd_min)
>-			return false;
>+			return NULL;
> 	} while (1);
> 
>-	signaller = &dev_priv->ring[(ring->id + (((ipehr >> 17) & 1) + 1)) % 3];
>-	return i915_seqno_passed(signaller->get_seqno(signaller, false),
>-				 ioread32(ring->virtual_start+acthd+4)+1);
>+	*seqno = ioread32(ring->virtual_start+acthd+4)+1;
>+	return &dev_priv->ring[(ring->id + (((ipehr >> 17) & 1) + 1)) % 3];
>+}
>+
>+static int semaphore_passed(struct intel_ring_buffer *ring)
>+{
>+	struct drm_i915_private *dev_priv = ring->dev->dev_private;
>+	struct intel_ring_buffer *signaller;
>+	u32 seqno, ctl;
>+
>+	ring->hangcheck.deadlock = true;
>+
>+	signaller = semaphore_waits_for(ring, &seqno);
>+	if (signaller == NULL || signaller->hangcheck.deadlock)
>+		return -1;
>+
>+	/* cursory check for an unkickable deadlock */
>+	ctl = I915_READ_CTL(signaller);
>+	if (ctl & RING_WAIT_SEMAPHORE && semaphore_passed(signaller) < 0)
>+		return -1;
>+
>+	return i915_seqno_passed(signaller->get_seqno(signaller, false), seqno);
>+}
>+
>+static void semaphore_clear_deadlocks(struct drm_i915_private *dev_priv)
>+{
>+	struct intel_ring_buffer *ring;
>+	int i;
>+
>+	for_each_ring(ring, dev_priv, i)
>+		ring->hangcheck.deadlock = false;
> }
> 
> static bool kick_ring(struct intel_ring_buffer *ring)
>@@ -2374,13 +2402,17 @@ static bool kick_ring(struct intel_ring_buffer *ring)
> 		return true;
> 	}
> 
>-	if (INTEL_INFO(dev)->gen >= 6 &&
>-	    tmp & RING_WAIT_SEMAPHORE &&
>-	    semaphore_passed(ring)) {
>-		DRM_ERROR("Kicking stuck semaphore on %s\n",
>-			  ring->name);
>-		I915_WRITE_CTL(ring, tmp);
>-		return true;
>+	if (INTEL_INFO(dev)->gen >= 6 && tmp & RING_WAIT_SEMAPHORE) {
>+		switch (semaphore_passed(ring)) {
>+		default:
>+			return false;
>+		case 1:
>+			DRM_ERROR("Kicking stuck semaphore on %s\n",
>+				  ring->name);
>+			I915_WRITE_CTL(ring, tmp);
>+		case 0:
>+			return true;
>+		}
> 	}
> 	return false;
> }
>@@ -2422,6 +2454,8 @@ void i915_hangcheck_elapsed(unsigned long data)
> 		u32 seqno, acthd;
> 		bool idle, err = false;
> 
>+		semaphore_clear_deadlocks(dev_priv);
>+
> 		seqno = ring->get_seqno(ring, false);
> 		acthd = intel_ring_get_active_head(ring);
> 		idle = i915_hangcheck_ring_idle(ring, seqno, &err);
>diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
>index efc403d..a3e9610 100644
>--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
>+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
>@@ -38,6 +38,7 @@ struct  intel_hw_status_page {
> #define I915_READ_SYNC_1(ring) I915_READ(RING_SYNC_1((ring)->mmio_base))
> 
> struct intel_ring_hangcheck {
>+	bool deadlock;
> 	u32 seqno;
> 	u32 acthd;
> 	int score;
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 65394: 80326 | 80331 | 80333 | 80335

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.