From patchwork Sun Apr 3 13:14:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 8734181 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 231B99F39A for ; Sun, 3 Apr 2016 13:14:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0D071201F4 for ; Sun, 3 Apr 2016 13:14:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 8F581201F2 for ; Sun, 3 Apr 2016 13:14:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 706F16E3F7; Sun, 3 Apr 2016 13:14:38 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-lb0-x233.google.com (mail-lb0-x233.google.com [IPv6:2a00:1450:4010:c04::233]) by gabe.freedesktop.org (Postfix) with ESMTPS id 262A56E3F7 for ; Sun, 3 Apr 2016 13:14:36 +0000 (UTC) Received: by mail-lb0-x233.google.com with SMTP id bc4so123444320lbc.2 for ; Sun, 03 Apr 2016 06:14:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=9IrYyYDkllKLX0frC+NTQ6QtSa4eQvZNbUjpL+p34bo=; b=QHqkWNtcbzJIeKlg32Ook3HvNzfxexI+uhIsJW1nWNYUQJSvRlu3RELXt5wDpLRv8n eIPcd9/FZ8rBFi12jhiidkRi2ID7CkWLwEvYtFwE1sV8c+sKFgIQmx/vZ+r81+EimatY M9Lrr8w11miCVtRZR6GhvWBIy7V+3vjOMF/zun8vv4oG757aHcK3lGitiqoBrwYLLV30 W+ZkvNaMCcyrpV1aXHMn4mByyM6GmQ2qiwqAjnL9ndaPq9r5KX6Yh/zmT2ozziWX81VS O9TrVEbFnHIxZYu94n6+wBpRiave+TI+A8HAzPtFMTp64RaGGqS7t0toX8Wbp75ZipJw 5TBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=9IrYyYDkllKLX0frC+NTQ6QtSa4eQvZNbUjpL+p34bo=; b=ipuqjwxaB+TMuUBy+avWqE2bny6DO1CEg3uiKD+RBTMaJ961yax+db3YdFi7jY1Y0N Xw7c42xm34n98Ruij6dwBQSwqHUoyE+FxivLy5wofcb+HNWBP/6qATWES99xjTyUmsdM gNCw8zPH6FdYlmW/sRRqvY8Yo6AHjuAH9BJFp8cTVrcIDZpYfm4w60qAyzWYpeVXgJOb Yvj4U2rzM/+GgDkwGBIvmKjgqle6zjCtlgRwZzqzeVQNRs3RBLIVVOT1Pi/LZJo4TrDU bTCy3RjsYhPG1iTqLHX4VbC0mO+j3nqMUoBV9N5HYoFV+t/xgNabZdOUuXgDy8JoiMj1 Qy4A== X-Gm-Message-State: AD7BkJJOBufkGJW+2Ih9V8hu21Bv8Fu9fx8+dW73UOzjRnEKYV2WuFYXnnwWwaPNY2H0mg== X-Received: by 10.28.170.137 with SMTP id t131mr7557246wme.32.1459689273761; Sun, 03 Apr 2016 06:14:33 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id gt7sm23787673wjc.1.2016.04.03.06.14.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 03 Apr 2016 06:14:32 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Sun, 3 Apr 2016 14:14:20 +0100 Message-Id: <1459689261-7920-1-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.0.rc3 Subject: [Intel-gfx] [CI 1/2] drm/i915: Add struct_mutex locking for debugs/i915_gem_framebuffer 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-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since describe_obj() looks at state guarded by the struct_mutex, we need to be holding it. [ 580.201054] drv_suspend: starting subtest debugfs-reader [ 580.239652] ------------[ cut here ]------------ [ 580.239696] WARNING: CPU: 0 PID: 920 at include/linux/list_check.h:25 describe_obj+0x419/0x440() [ 580.239725] CPU: 0 PID: 920 Comm: cat Not tainted 4.5.0-rc6+ #835 [ 580.239745] Hardware name: /NUC5CPYB, BIOS PYBSWCEL.86A.0027.2015.0507.1758 05/07/2015 [ 580.239767] 0000000000000000 ffff88027554fcf8 ffffffff812c1135 0000000000000000 [ 580.239815] ffffffff8193dc42 ffff88027554fd30 ffffffff8107419d ffff880071727c00 [ 580.239858] ffff8802757d8000 ffffffff818f693c ffffffff818f693c ffff8802757b9048 [ 580.239896] Call Trace: [ 580.239917] [] dump_stack+0x67/0x92 [ 580.239939] [] warn_slowpath_common+0x7d/0xb0 [ 580.239959] [] warn_slowpath_null+0x1a/0x20 [ 580.239981] [] describe_obj+0x419/0x440 [ 580.240006] [] i915_gem_framebuffer_info+0xa2/0x100 [ 580.240033] [] seq_read+0xe6/0x3b0 [ 580.240059] [] __vfs_read+0x28/0xd0 [ 580.240085] [] ? SyS_fadvise64+0x228/0x2c0 [ 580.240112] [] vfs_read+0x82/0x110 [ 580.240137] [] SyS_read+0x49/0xa0 [ 580.240162] [] entry_SYSCALL_64_fastpath+0x12/0x6b [ 580.240187] ---[ end trace 3e2cbf34576c9878 ]--- [ 580.281900] ------------[ cut here ]------------ Signed-off-by: Chris Wilson Reviewed-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_debugfs.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 74f227415765..6b384d7738f1 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -134,6 +134,8 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) int pin_count = 0; enum intel_engine_id id; + lockdep_assert_held(&obj->base.dev->struct_mutex); + seq_printf(m, "%pK: %s%s%s%s %8zdKiB %02x %02x [ ", &obj->base, obj->active ? "*" : " ", @@ -1894,6 +1896,11 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data) struct drm_device *dev = node->minor->dev; struct intel_framebuffer *fbdev_fb = NULL; struct drm_framebuffer *drm_fb; + int ret; + + ret = mutex_lock_interruptible(&dev->struct_mutex); + if (ret) + return ret; #ifdef CONFIG_DRM_FBDEV_EMULATION if (to_i915(dev)->fbdev) { @@ -1928,6 +1935,7 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data) seq_putc(m, '\n'); } mutex_unlock(&dev->mode_config.fb_lock); + mutex_unlock(&dev->struct_mutex); return 0; }