* [PATCH 1/2] drm/i915/selftests: don't leak the gem object
@ 2017-02-22 16:01 Matthew Auld
2017-02-22 16:01 ` [PATCH 2/2] drm/i915: prefer use of i915_gem_object_put Matthew Auld
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Matthew Auld @ 2017-02-22 16:01 UTC (permalink / raw)
To: intel-gfx
For our fake dma objects we can leak the underlying gem object if we
fail to pin our "backing storage".
[ 39.952618] =============================================================================
[ 39.952625] BUG mock_object (Tainted: G U ): Objects remaining in mock_object on __kmem_cache_shutdown()
[ 39.952629] -----------------------------------------------------------------------------
[ 39.952633] Disabling lock debugging due to kernel taint
[ 39.952635] INFO: Slab 0xffffea00086c6a00 objects=21 used=1 fp=0xffff88021b1abc00 flags=0x5fff8000008100
[ 39.952640] CPU: 1 PID: 1258 Comm: drv_selftest Tainted: G BU 4.10.0+ #46
[ 39.952641] Hardware name: Apple Inc. MacBookPro11,1/Mac-189A3D4F975D5FFC, BIOS MBP111.88Z.0138.B17.1602221718 02/22/2016
[ 39.952642] Call Trace:
[ 39.952648] dump_stack+0x4d/0x6f
[ 39.952651] slab_err+0x9d/0xb0
[ 39.952654] ? ksm_migrate_page+0xe0/0xe0
[ 39.952657] ? on_each_cpu_cond+0x9a/0xc0
[ 39.952658] ? __kmalloc+0x1af/0x1c0
[ 39.952660] ? __kmem_cache_shutdown+0x173/0x3e0
[ 39.952661] __kmem_cache_shutdown+0x196/0x3e0
[ 39.952664] kmem_cache_destroy+0xa0/0x150
[ 39.952708] mock_device_release+0x113/0x140 [i915]
[ 39.952726] drm_dev_release+0x20/0x40 [drm]
[ 39.952735] drm_dev_unref+0x23/0x30 [drm]
[ 39.952768] i915_gem_gtt_mock_selftests+0x55/0x70 [i915]
[ 39.952803] __run_selftests+0x169/0x1c0 [i915]
[ 39.952805] ? 0xffffffffa0151000
[ 39.952840] i915_mock_selftests+0x30/0x60 [i915]
[ 39.952869] i915_init+0xc/0x78 [i915]
[ 39.952870] ? 0xffffffffa0151000
[ 39.952872] do_one_initcall+0x43/0x170
[ 39.952874] ? __vunmap+0x81/0xd0
[ 39.952875] ? kmem_cache_alloc_trace+0x37/0x170
[ 39.952877] ? do_init_module+0x27/0x1f8
[ 39.952879] do_init_module+0x5f/0x1f8
[ 39.952881] load_module+0x2423/0x29b0
[ 39.952882] ? __symbol_put+0x40/0x40
[ 39.952885] ? kernel_read_file+0x1a3/0x1c0
[ 39.952887] SYSC_finit_module+0xbc/0xf0
[ 39.952889] SyS_finit_module+0xe/0x10
[ 39.952892] entry_SYSCALL_64_fastpath+0x13/0x94
v2: use onion teardown and favour i915_gem_object_put
Fixes: 8d28ba4568f4 ("drm/i915: Exercise filling the top/bottom portions of the ppgtt")
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
---
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
index e23753181720..a2310f8a7559 100644
--- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
@@ -101,7 +101,7 @@ fake_dma_object(struct drm_i915_private *i915, u64 size)
obj = i915_gem_object_alloc(i915);
if (!obj)
- return ERR_PTR(-ENOMEM);
+ goto err;
drm_gem_private_object_init(&i915->drm, &obj->base, size);
i915_gem_object_init(obj, &fake_ops);
@@ -112,10 +112,15 @@ fake_dma_object(struct drm_i915_private *i915, u64 size)
/* Preallocate the "backing storage" */
if (i915_gem_object_pin_pages(obj))
- return ERR_PTR(-ENOMEM);
+ goto err_obj;
i915_gem_object_unpin_pages(obj);
return obj;
+
+err_obj:
+ i915_gem_object_put(obj);
+err:
+ return ERR_PTR(-ENOMEM);
}
static int igt_ppgtt_alloc(void *arg)
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] drm/i915: prefer use of i915_gem_object_put
2017-02-22 16:01 [PATCH 1/2] drm/i915/selftests: don't leak the gem object Matthew Auld
@ 2017-02-22 16:01 ` Matthew Auld
2017-02-22 16:12 ` Chris Wilson
2017-02-22 16:12 ` [PATCH 1/2] drm/i915/selftests: don't leak the gem object Chris Wilson
2017-02-22 18:52 ` ✓ Fi.CI.BAT: success for series starting with [1/2] " Patchwork
2 siblings, 1 reply; 6+ messages in thread
From: Matthew Auld @ 2017-02-22 16:01 UTC (permalink / raw)
To: intel-gfx
Always use i915_gem_object_put over i915_gem_object_free if we can.
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
---
drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
index f3abdc27c5dd..9ad8c7dddd04 100644
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -599,7 +599,7 @@ _i915_gem_object_create_stolen(struct drm_i915_private *dev_priv,
return obj;
cleanup:
- i915_gem_object_free(obj);
+ i915_gem_object_put(obj);
return NULL;
}
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] drm/i915: prefer use of i915_gem_object_put
2017-02-22 16:01 ` [PATCH 2/2] drm/i915: prefer use of i915_gem_object_put Matthew Auld
@ 2017-02-22 16:12 ` Chris Wilson
2017-02-22 16:26 ` Matthew Auld
0 siblings, 1 reply; 6+ messages in thread
From: Chris Wilson @ 2017-02-22 16:12 UTC (permalink / raw)
To: Matthew Auld; +Cc: intel-gfx
On Wed, Feb 22, 2017 at 04:01:06PM +0000, Matthew Auld wrote:
> Always use i915_gem_object_put over i915_gem_object_free if we can.
>
> Signed-off-by: Matthew Auld <matthew.auld@intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> ---
> drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
> index f3abdc27c5dd..9ad8c7dddd04 100644
> --- a/drivers/gpu/drm/i915/i915_gem_stolen.c
> +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
> @@ -599,7 +599,7 @@ _i915_gem_object_create_stolen(struct drm_i915_private *dev_priv,
> return obj;
>
> cleanup:
> - i915_gem_object_free(obj);
> + i915_gem_object_put(obj);
Which you can't here. Put(stolen) assumes we have pinned the pages.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] drm/i915/selftests: don't leak the gem object
2017-02-22 16:01 [PATCH 1/2] drm/i915/selftests: don't leak the gem object Matthew Auld
2017-02-22 16:01 ` [PATCH 2/2] drm/i915: prefer use of i915_gem_object_put Matthew Auld
@ 2017-02-22 16:12 ` Chris Wilson
2017-02-22 18:52 ` ✓ Fi.CI.BAT: success for series starting with [1/2] " Patchwork
2 siblings, 0 replies; 6+ messages in thread
From: Chris Wilson @ 2017-02-22 16:12 UTC (permalink / raw)
To: Matthew Auld; +Cc: intel-gfx
On Wed, Feb 22, 2017 at 04:01:05PM +0000, Matthew Auld wrote:
> For our fake dma objects we can leak the underlying gem object if we
> fail to pin our "backing storage".
>
> [ 39.952618] =============================================================================
> [ 39.952625] BUG mock_object (Tainted: G U ): Objects remaining in mock_object on __kmem_cache_shutdown()
> [ 39.952629] -----------------------------------------------------------------------------
>
> [ 39.952633] Disabling lock debugging due to kernel taint
> [ 39.952635] INFO: Slab 0xffffea00086c6a00 objects=21 used=1 fp=0xffff88021b1abc00 flags=0x5fff8000008100
> [ 39.952640] CPU: 1 PID: 1258 Comm: drv_selftest Tainted: G BU 4.10.0+ #46
> [ 39.952641] Hardware name: Apple Inc. MacBookPro11,1/Mac-189A3D4F975D5FFC, BIOS MBP111.88Z.0138.B17.1602221718 02/22/2016
> [ 39.952642] Call Trace:
> [ 39.952648] dump_stack+0x4d/0x6f
> [ 39.952651] slab_err+0x9d/0xb0
> [ 39.952654] ? ksm_migrate_page+0xe0/0xe0
> [ 39.952657] ? on_each_cpu_cond+0x9a/0xc0
> [ 39.952658] ? __kmalloc+0x1af/0x1c0
> [ 39.952660] ? __kmem_cache_shutdown+0x173/0x3e0
> [ 39.952661] __kmem_cache_shutdown+0x196/0x3e0
> [ 39.952664] kmem_cache_destroy+0xa0/0x150
> [ 39.952708] mock_device_release+0x113/0x140 [i915]
> [ 39.952726] drm_dev_release+0x20/0x40 [drm]
> [ 39.952735] drm_dev_unref+0x23/0x30 [drm]
> [ 39.952768] i915_gem_gtt_mock_selftests+0x55/0x70 [i915]
> [ 39.952803] __run_selftests+0x169/0x1c0 [i915]
> [ 39.952805] ? 0xffffffffa0151000
> [ 39.952840] i915_mock_selftests+0x30/0x60 [i915]
> [ 39.952869] i915_init+0xc/0x78 [i915]
> [ 39.952870] ? 0xffffffffa0151000
> [ 39.952872] do_one_initcall+0x43/0x170
> [ 39.952874] ? __vunmap+0x81/0xd0
> [ 39.952875] ? kmem_cache_alloc_trace+0x37/0x170
> [ 39.952877] ? do_init_module+0x27/0x1f8
> [ 39.952879] do_init_module+0x5f/0x1f8
> [ 39.952881] load_module+0x2423/0x29b0
> [ 39.952882] ? __symbol_put+0x40/0x40
> [ 39.952885] ? kernel_read_file+0x1a3/0x1c0
> [ 39.952887] SYSC_finit_module+0xbc/0xf0
> [ 39.952889] SyS_finit_module+0xe/0x10
> [ 39.952892] entry_SYSCALL_64_fastpath+0x13/0x94
>
> v2: use onion teardown and favour i915_gem_object_put
>
> Fixes: 8d28ba4568f4 ("drm/i915: Exercise filling the top/bottom portions of the ppgtt")
> Signed-off-by: Matthew Auld <matthew.auld@intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] drm/i915: prefer use of i915_gem_object_put
2017-02-22 16:12 ` Chris Wilson
@ 2017-02-22 16:26 ` Matthew Auld
0 siblings, 0 replies; 6+ messages in thread
From: Matthew Auld @ 2017-02-22 16:26 UTC (permalink / raw)
To: Chris Wilson, Matthew Auld, Intel Graphics Development, Joonas Lahtinen
On 22 February 2017 at 16:12, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> On Wed, Feb 22, 2017 at 04:01:06PM +0000, Matthew Auld wrote:
>> Always use i915_gem_object_put over i915_gem_object_free if we can.
>>
>> Signed-off-by: Matthew Auld <matthew.auld@intel.com>
>> Cc: Chris Wilson <chris@chris-wilson.co.uk>
>> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>> ---
>> drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
>> index f3abdc27c5dd..9ad8c7dddd04 100644
>> --- a/drivers/gpu/drm/i915/i915_gem_stolen.c
>> +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
>> @@ -599,7 +599,7 @@ _i915_gem_object_create_stolen(struct drm_i915_private *dev_priv,
>> return obj;
>>
>> cleanup:
>> - i915_gem_object_free(obj);
>> + i915_gem_object_put(obj);
>
> Which you can't here. Put(stolen) assumes we have pinned the pages.
Ah, missed that :|
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/selftests: don't leak the gem object
2017-02-22 16:01 [PATCH 1/2] drm/i915/selftests: don't leak the gem object Matthew Auld
2017-02-22 16:01 ` [PATCH 2/2] drm/i915: prefer use of i915_gem_object_put Matthew Auld
2017-02-22 16:12 ` [PATCH 1/2] drm/i915/selftests: don't leak the gem object Chris Wilson
@ 2017-02-22 18:52 ` Patchwork
2 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2017-02-22 18:52 UTC (permalink / raw)
To: Matthew Auld; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/2] drm/i915/selftests: don't leak the gem object
URL : https://patchwork.freedesktop.org/series/20077/
State : success
== Summary ==
Series 20077v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/20077/revisions/1/mbox/
fi-bdw-5557u total:253 pass:242 dwarn:0 dfail:0 fail:0 skip:11
fi-bsw-n3050 total:253 pass:214 dwarn:0 dfail:0 fail:0 skip:39
fi-bxt-j4205 total:253 pass:234 dwarn:0 dfail:0 fail:0 skip:19
fi-bxt-t5700 total:83 pass:70 dwarn:0 dfail:0 fail:0 skip:12
fi-byt-j1900 total:253 pass:226 dwarn:0 dfail:0 fail:0 skip:27
fi-byt-n2820 total:253 pass:222 dwarn:0 dfail:0 fail:0 skip:31
fi-hsw-4770 total:253 pass:237 dwarn:0 dfail:0 fail:0 skip:16
fi-hsw-4770r total:253 pass:237 dwarn:0 dfail:0 fail:0 skip:16
fi-ilk-650 total:253 pass:203 dwarn:0 dfail:0 fail:0 skip:50
fi-ivb-3520m total:253 pass:235 dwarn:0 dfail:0 fail:0 skip:18
fi-ivb-3770 total:253 pass:235 dwarn:0 dfail:0 fail:0 skip:18
fi-kbl-7500u total:253 pass:235 dwarn:0 dfail:0 fail:0 skip:18
fi-skl-6260u total:253 pass:243 dwarn:0 dfail:0 fail:0 skip:10
fi-skl-6700hq total:253 pass:236 dwarn:0 dfail:0 fail:0 skip:17
fi-skl-6700k total:253 pass:231 dwarn:4 dfail:0 fail:0 skip:18
fi-skl-6770hq total:253 pass:243 dwarn:0 dfail:0 fail:0 skip:10
fi-snb-2520m total:253 pass:225 dwarn:0 dfail:0 fail:0 skip:28
fi-snb-2600 total:253 pass:224 dwarn:0 dfail:0 fail:0 skip:29
bf89ec45d0822835b03910371ac0baf46c4efa2d drm-tip: 2017y-02m-22d-14h-30m-04s UTC integration manifest
885d6b6 drm/i915: prefer use of i915_gem_object_put
560ab66 drm/i915/selftests: don't leak the gem object
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3934/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-02-22 18:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-22 16:01 [PATCH 1/2] drm/i915/selftests: don't leak the gem object Matthew Auld
2017-02-22 16:01 ` [PATCH 2/2] drm/i915: prefer use of i915_gem_object_put Matthew Auld
2017-02-22 16:12 ` Chris Wilson
2017-02-22 16:26 ` Matthew Auld
2017-02-22 16:12 ` [PATCH 1/2] drm/i915/selftests: don't leak the gem object Chris Wilson
2017-02-22 18:52 ` ✓ Fi.CI.BAT: success for series starting with [1/2] " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.