From patchwork Mon Mar 6 10:15:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9605607 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 69706602B4 for ; Mon, 6 Mar 2017 10:15:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 702E327317 for ; Mon, 6 Mar 2017 10:15:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 646A727F90; Mon, 6 Mar 2017 10:15:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E32FA27317 for ; Mon, 6 Mar 2017 10:15:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 66DE76E3FC; Mon, 6 Mar 2017 10:15:46 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 397D96E3FB for ; Mon, 6 Mar 2017 10:15:45 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id z63so10677996wmg.2 for ; Mon, 06 Mar 2017 02:15:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=C23ubgoIt8VhdOfSW2KJ5RskVNE+0A8UHcXM3hjY1pk=; b=rJYAJo/P+BalBkoEAMzE4lCCfGHsiEkQ7iLoAJSn3DvOBiRSAyloYAAGa2vYCceutO 9WKndiIgeDgoPgkdCxsVGoV57/l1EQJytiaHe7LALJpqIPD21AnA0027jgdHVXrqgzxd f8wNbPoFzGOSlx7RTehf+7dIRHtMdGZSlRuAF/nQBy0AWSd23mS/bXkYCeBrl2JYnbCD vd+b5fvO/jf4OHUpL/+KRF4MbphCpLG/jMvzKUnaVBHE1kTme/h/96GHILDDPEbxE8N/ 5x6HizXT7m5M8cOPJGEEACqmOxEgZc2Ehu0XH9jRumx1YSoxywE4bj0rEW0bPjQex9q8 TvtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=C23ubgoIt8VhdOfSW2KJ5RskVNE+0A8UHcXM3hjY1pk=; b=im7MJfrvIOiG9/hFOnGuaHa2IMlQ7U79gNn8YqMdt2ovbWnNJkZkjOGkl1Dz8fJD/M LusXwDfZbFmzy31TwnrdXIvaTuvlO40YIAlCTwRWAKQ91WtiVT/UFONvj3NoiANlpfPb fMQ7CAGzH7iYsJ2zhpJd26l6Hu8Ct+lPfxL6NpefWU7Nk/o+IzYNY97pWUH9I/eGY7Ro /E1jcduzuqAUBOSvwluI9US0yh1bMo8c0vCGNUaGUzfyHZ4mZcYItqQZNzRCNrWUqagW 3zfmqHkAQSXeHY3TYLBLF3+6og3TSuRSgDnXBKWRgV7jm0rgU8H8CL3lnsRdS8BAb5u0 e2Ow== X-Gm-Message-State: AMke39mxkylp2cWv81j7Ls0EXHWCKKwhvMzN+QJDFt/Hquk9TRFMM4TxvPYzBMUJHwfKpw== X-Received: by 10.28.179.7 with SMTP id c7mr12650553wmf.128.1488795343873; Mon, 06 Mar 2017 02:15:43 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id 189sm5916828wmm.31.2017.03.06.02.15.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Mar 2017 02:15:43 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Mon, 6 Mar 2017 10:15:41 +0000 Message-Id: <20170306101541.26171-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170306095726.20060-1-chris@chris-wilson.co.uk> References: <20170306095726.20060-1-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH v2] drm/i915: Flush idle work when changing missed-irq fault injection X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP In order for the missed-irq update to take effect, the device must be idle. So when the user updates the fault injection via debugfs, idle the device. v2: Idle is explicitly required for setting test_irq, and good behaviour for clearing the missed_irq. Testcase: igt/drv_missed_irq Signed-off-by: Chris Wilson Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/i915_debugfs.c | 55 +++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 4a3e5b9552f8..511d3541d3d5 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -4138,6 +4138,39 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_wedged_fops, "%llu\n"); static int +fault_irq_set(struct drm_i915_private *i915, unsigned long *irq, u64 val) +{ + int err; + + err = mutex_lock_interruptible(&i915->drm.struct_mutex); + if (err) + return err; + + err = i915_gem_wait_for_idle(i915, + I915_WAIT_LOCKED | + I915_WAIT_INTERRUPTIBLE); + if (err) + goto err_unlock; + + /* Retire to kick idle work */ + i915_gem_retire_requests(i915); + GEM_BUG_ON(i915->gt.active_requests); + + *irq = val & INTEL_INFO(i915)->ring_mask; + mutex_unlock(&i915->drm.struct_mutex); + + /* Flush idle worker to disarm irq */ + while (flush_delayed_work(&i915->gt.idle_work)) + ; + + return 0; + +err_unlock: + mutex_unlock(&i915->drm.struct_mutex); + return err; +} + +static int i915_ring_missed_irq_get(void *data, u64 *val) { struct drm_i915_private *dev_priv = data; @@ -4149,18 +4182,8 @@ i915_ring_missed_irq_get(void *data, u64 *val) static int i915_ring_missed_irq_set(void *data, u64 val) { - struct drm_i915_private *dev_priv = data; - struct drm_device *dev = &dev_priv->drm; - int ret; - - /* Lock against concurrent debugfs callers */ - ret = mutex_lock_interruptible(&dev->struct_mutex); - if (ret) - return ret; - dev_priv->gpu_error.missed_irq_rings = val; - mutex_unlock(&dev->struct_mutex); - - return 0; + struct drm_i915_private *i915 = data; + return fault_irq_set(i915, &i915->gpu_error.missed_irq_rings, val); } DEFINE_SIMPLE_ATTRIBUTE(i915_ring_missed_irq_fops, @@ -4180,13 +4203,11 @@ i915_ring_test_irq_get(void *data, u64 *val) static int i915_ring_test_irq_set(void *data, u64 val) { - struct drm_i915_private *dev_priv = data; + struct drm_i915_private *i915 = data; - val &= INTEL_INFO(dev_priv)->ring_mask; + val &= INTEL_INFO(i915)->ring_mask; DRM_DEBUG_DRIVER("Masking interrupts on rings 0x%08llx\n", val); - dev_priv->gpu_error.test_irq_rings = val; - - return 0; + return fault_irq_set(i915, &i915->gpu_error.test_irq_rings, val); } DEFINE_SIMPLE_ATTRIBUTE(i915_ring_test_irq_fops,