struct_mutex leak in i915_load_gem_init ?

struct_mutex leak in i915_load_gem_init ?

[Konstantin Belousov]

[-- Attachment #1.1: Type: text/plain, Size: 187 bytes --]

Hi,
it seems that in case of any i915_gem_init_aliasing_ppgtt() failure,
after the commit d3ae08109d628d26615d7f7f4d8d53cdd8d71fd0, the struct_mutex
lock leaks from i915_load_gem_init().

[-- Attachment #1.2: Type: application/pgp-signature, Size: 196 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: struct_mutex leak in i915_load_gem_init ?

[Chris Wilson]

On Mon, 2 Apr 2012 23:32:00 +0300, Konstantin Belousov <kostikbel@gmail.com> wrote:
> Hi,
> it seems that in case of any i915_gem_init_aliasing_ppgtt() failure,
> after the commit d3ae08109d628d26615d7f7f4d8d53cdd8d71fd0, the struct_mutex
> lock leaks from i915_load_gem_init().

Right, I should have caught that before telling Daniel the patch was ok. :(
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

[PATCH] drm/i915: don't leak struct_mutex lock on ppgtt init failures

[Daniel Vetter]

Reported-by: Konstantin Belousov <kostikbel@gmail.com>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 drivers/gpu/drm/i915/i915_dma.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 8a62285..785f67f 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1222,8 +1222,10 @@ static int i915_load_gem_init(struct drm_device *dev)
 		i915_gem_do_init(dev, 0, mappable_size, gtt_size);
 
 		ret = i915_gem_init_aliasing_ppgtt(dev);
-		if (ret)
+		if (ret) {
+			mutex_unlock(&dev->struct_mutex);
 			return ret;
+		}
 	} else {
 		/* Let GEM Manage all of the aperture.
 		 *
-- 
1.7.9.1

Re: [PATCH] drm/i915: don't leak struct_mutex lock on ppgtt init failures

[Chris Wilson]

On Mon,  2 Apr 2012 23:33:03 +0200, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Reported-by: Konstantin Belousov <kostikbel@gmail.com>
> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Never twice wrong?
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre