Hi
On Thu, Jul 24, 2014 at 3:23 PM, Chris Wilson wrote:
> In order to prevent external observers walking the list of open DRM
> files from seeing an invalid drm_file_private in the process of being
> torndown, the first operation we need to take is to unlink the
> drm_file_private from that list.
>
> general protection fault: [#1] PREEMPT SMP
> Modules linked in: i915 i2c_algo_bit drm_kms_helper drm lpc_ich
> mfd_core nls_iso8859_1 i2c_hid video hid_generic usbhid hid e1000e ahci ptp
> libahci pps_core
> CPU: 3 PID: 8220 Comm: cat Not tainted 3.16.0-rc6+ #4
> Hardware name: Intel Corporation Shark Bay Client platform/WhiteTip
> Mountain 1, BIOS HSWLPTU1.86C.0119.R00.1303230105 03/23/2013
> task: 8800219642c0 ti: 880047024000 task.ti: 880047024000
> RIP: 0010:[] []
> per_file_stats+0x110/0x160 [i915]
> RSP: 0018:880047027d48 EFLAGS: 00010246
> RAX: 6b6b6b6b6b6b6b6b RBX: 880047027e30 RCX:
> RDX: 0001 RSI: RDI: 88003a05cd00
> RBP: 880047027d58 R08: 0001 R09:
> R10: 8800219642c0 R11: R12: 88003a05cd00
> R13: R14: 88003a05cd00 R15: 880047027d88
> FS: 7f5f73a13740() GS:88014e38()
> knlGS:
> CS: 0010 DS: ES: CR0: 80050033
> CR2: 023ff038 CR3: 21a4b000 CR4: 001407e0
> Stack:
> 0001 880047027dc8 813438e4
> 880047027e30 a0137b60 880021a8af58 880021a8f1a0
> 8800a2061fb0 8800a2062048 8800a2061fb0 8800a1e23478
> Call Trace:
> [] idr_for_each+0xf4/0x180
> [] ? i915_gem_stolen_list_info+0x1f0/0x1f0 [i915]
> [] i915_gem_object_info+0x5ca/0x6a0 [i915]
> [] seq_read+0xf5/0x3a0
> [] vfs_read+0x90/0x150
> [] SyS_read+0x49/0xb0
> [] tracesys+0xd0/0xd5
> Code: 01 00 00 49 39 84 24 08 01 00 00 74 55 49 8b 84 24 b8 00 00 00
> 48 01 43 18 31 c0 5b 41 5c 5d c3 0f 1f 00 49 8b 44 24 08 4c 89 e7 <48> 8b 70
> 28 48 81 c6 48 80 00 00 e8 80 14 01 00 84 c0 74 bc 49
> RIP [] per_file_stats+0x110/0x160 [i915]
> RSP
>
> Reported-by: "Ursulin, Tvrtko"
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=81712
> Signed-off-by: Chris Wilson
> Cc: "Ursulin, Tvrtko"
I have the same change in my local drm_file cleanup. This is:
Reviewed-by: David Herrmann
Thanks
David
> ---
> drivers/gpu/drm/drm_fops.c | 8
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
> index a0c63cf..aff8217 100644
> --- a/drivers/gpu/drm/drm_fops.c
> +++ b/drivers/gpu/drm/drm_fops.c
> @@ -416,6 +416,10 @@ int drm_release(struct inode *inode, struct file *filp)
>
> DRM_DEBUG("open_count = %d\n", dev->open_count);
>
> + mutex_lock(&dev->struct_mutex);
> + list_del(&file_priv->lhead);
> + mutex_unlock(&dev->struct_mutex);
> +
> if (dev->driver->preclose)
> dev->driver->preclose(dev, file_priv);
>
> @@ -509,10 +513,6 @@ int drm_release(struct inode *inode, struct file *filp)
> file_priv->is_master = 0;
> mutex_unlock(&dev->master_mutex);
>
> - mutex_lock(&dev->struct_mutex);
> - list_del(&file_priv->lhead);
> - mutex_unlock(&dev->struct_mutex);
> -
> if (dev->driver->postclose)
> dev->driver->postclose(dev, file_priv);
>
> --
> 1.9.1
>
> ___
> dri-devel mailing list
> dri-de...@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
