From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH] drm/i915: Fix deadlock during driver init
 on ILK
Date: Fri, 25 Apr 2014 22:32:03 +0200
Message-ID: <20140425203203.GA26374@phenom.ffwll.local>
References: <1398453111-9856-1-git-send-email-ville.syrjala@linux.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mail-ee0-f54.google.com (mail-ee0-f54.google.com [74.125.83.54])
 by gabe.freedesktop.org (Postfix) with ESMTP id 439AE6EF82
 for <intel-gfx@lists.freedesktop.org>; Fri, 25 Apr 2014 13:32:08 -0700 (PDT)
Received: by mail-ee0-f54.google.com with SMTP id d49so3143086eek.27
 for <intel-gfx@lists.freedesktop.org>; Fri, 25 Apr 2014 13:32:07 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <1398453111-9856-1-git-send-email-ville.syrjala@linux.intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: ville.syrjala@linux.intel.com
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

On Fri, Apr 25, 2014 at 10:11:51PM +0300, ville.syrjala@linux.intel.com wro=
te:
> From: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>
> =

> We have a struct_mutex deadlock during driver init on ILK
> =

> [   54.320273] =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
> [   54.320371] [ INFO: possible recursive locking detected ]
> [   54.320471] 3.15.0-rc2-flip_race+ #2 Not tainted
> [   54.320567] ---------------------------------------------
> [   54.320665] modprobe/2178 is trying to acquire lock:
> [   54.320762]  (&dev->struct_mutex){+.+.+.}, at: [<ffffffffa0568b05>] in=
tel_enable_gt_powersave+0xa5/0x9d0 [i915]
> [   54.321111]
> [   54.321111] but task is already holding lock:
> [   54.321250]  (&dev->struct_mutex){+.+.+.}, at: [<ffffffffa05b4c2e>] in=
tel_modeset_init_hw+0x3e/0x60 [i915]
> [   54.321583]
> [   54.321583] other info that might help us debug this:
> [   54.321724]  Possible unsafe locking scenario:
> [   54.321724]
> [   54.321863]        CPU0
> [   54.321954]        ----
> [   54.322046]   lock(&dev->struct_mutex);
> [   54.322221]   lock(&dev->struct_mutex);
> [   54.322397]
> [   54.322397]  *** DEADLOCK ***
> [   54.322397]
> [   54.322638]  May be due to missing lock nesting notation
> [   54.322638]
> [   54.322781] 4 locks held by modprobe/2178:
> [   54.322875]  #0:  (&dev->mutex){......}, at: [<ffffffff813592eb>] __dr=
iver_attach+0x5b/0xb0
> [   54.323230]  #1:  (&dev->mutex){......}, at: [<ffffffff813592f9>] __dr=
iver_attach+0x69/0xb0
> [   54.323582]  #2:  (drm_global_mutex){+.+.+.}, at: [<ffffffffa04e1e0d>]=
 drm_dev_register+0x2d/0x120 [drm]
> [   54.323945]  #3:  (&dev->struct_mutex){+.+.+.}, at: [<ffffffffa05b4c2e=
>] intel_modeset_init_hw+0x3e/0x60 [i915]
> =

> This regression got introduced in:
>  commit 586d5270b60dc1f35cc3ca982d403765bad77965
>  Author: Imre Deak <imre.deak@intel.com>
>  Date:   Mon Apr 14 20:24:28 2014 +0300
> =

>     drm/i915: move getting struct_mutex lower in the callstack during GPU=
 reset
> =

> Fix the problem by not taking struct_mutex around intel_enable_gt_powersa=
ve()
> in intel_modeset_init_hw() since intel_enable_gt_powersave() now grabs the
> mutex itself.
> =

> Signed-off-by: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>

Queued for -next, thanks for the patch.
-Daniel
-- =

Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch