powerpc: msi: mark bitmap with kmemleak_not_leak()
PATCH v2 1/1 powerpc: msi: mark bitmap with kmemleak_not_leak()
During the MSI bitmap test on boot kmemleak spews the following trace:
unreferenced object 0xc00000016e86c900 (size 64):
comm "swapper/0", pid 1, jiffies 4294893173 (age 518.024s)
hex dump (first 32 bytes):
00 00 01 ff 7f ff 7f 37 00 00 00 00 00 00 00 00
.......7........
ff ff ff ff ff ff ff ff 01 ff ff ff ff
ff ff ff
................
backtrace:
[<c00000000003eebc>] .zalloc_maybe_bootmem+0x3c/0x380
[<c000000000042d6c>] .msi_bitmap_alloc+0x3c/0xb0
[<c000000000a9aff8>] .msi_bitmap_selftest+0x30/0x2b4
[<c0000000000090f4>] .do_one_initcall+0xd4/0x270
[<c000000000a8e250>] .kernel_init_freeable+0x1a0/0x280
[<c000000000009b5c>] .kernel_init+0x1c/0x120
[<c000000000007fbc>] .ret_from_kernel_thread+0x58/0x9cAdded a flag to msi_bitmap for tracking allocations from slab and memblock so we can properly free/handle memory in msi_bitmap_free().
Changes vor v2:
- added a flag to msi_bitmap
- kmemleak annotaion moved under CONFIG_MSI_BITMAP_SELFTEST
--- arch/powerpc/include/asm/msi_bitmap.h | 1 + arch/powerpc/sysdev/msi_bitmap.c | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-)
arch/powerpc/include/asm/msi_bitmap.h +1 -0
@@ -19,6 +19,7 @@ struct msi_bitmap {unsigned long *bitmap;spinlock_t lock;unsigned int irq_count; +bool bitmap_from_slab; };int msi_bitmap_alloc_hwirqs (struct msi_bitmap *bmp,int num);
arch/powerpc/sysdev/msi_bitmap.c +11 -4
@@ -11,6 +11,7 @@#include <linux/slab.h> #include <linux/kernel.h> #include <linux/bitmap.h> +#include <linux/bootmem.h> #include <asm/msi_bitmap.h> #include <asm/setup.h>
@@ -122,7 +123,12 @@ int msi_bitmap_alloc(struct msi_bitmap *bmp, unsigned int irq_count, size =BITS_TO_LONGS (irq_count) *sizeof (long );pr_debug ("msi_bitmap: allocator bitmap size is 0x%x bytes\n" , size); - bmp->bitmap =zalloc_maybe_bootmem (size,GFP_KERNEL ); +if (slab_is_available ()) { + bmp->bitmap =kzalloc (size,GFP_KERNEL ); + bmp->bitmap_from_slab = true; + }else + bmp->bitmap =memblock_virt_alloc (size,0 ); +if (!bmp->bitmap) {pr_debug ("msi_bitmap: ENOMEM allocating allocator bitmap!\n" );return -ENOMEM ;
@@ -138,7 +144,8 @@ int msi_bitmap_alloc(struct msi_bitmap *bmp, unsigned int irq_count,void msi_bitmap_free (struct msi_bitmap *bmp) { -/* we can't free the bitmap we don't know if it's bootmem etc. */ +if (bmp->bitmap_from_slab) +kfree (bmp->bitmap);of_node_put (bmp->of_node); bmp->bitmap =NULL ; }
@@ -200,11 +207,11 @@ static void __init test_basics(void)WARN_ON (rc <0 && rc %128 !=0 );msi_bitmap_free (&bmp); +if (!bmp.bitmap_from_slab) +kmemleak_not_leak (bmp.bitmap);/* Clients may WARN_ON bitmap == NULL for "not-allocated" */ WARN_ON (bmp.bitmap !=NULL ); - -kfree (bmp.bitmap); }static void __init test_of_node (void )
Signature · 1 line
2.4.0
arch/powerpc/include=
Quoted 1 line · Denis Kirjanov
arch/powerpc/include= renamed from arch/powerpc/include/asm/msi_bitmap.h +0
-0
/asm/msi_bitmap.h
arch/powerpc/include/asm/msi_bitmap.h struct msi_bitmap { · line 22
Quoted 8 lines
index 97ac3f4..9a1d2fb 100644
arch/powerpc/include/asm/msi_bitmap.h +1
-0@@ -19,6 +19,7 @@ struct msi_bitmap { =09unsigned long=09=09*bitmap; =09spinlock_t=09=09lock; =09unsigned int=09=09irq_count; +=09bool=09=09bitmap_from_slab;
Nitpick: same alignment for bitmap_from_slab with irq_count etc. (unless it's just my mail client).
arch/powerpc/sysdev/msi_b=
Quoted 4 lines
arch/powerpc/include/asm/msi_bitmap.h +0
-0};=20
intmsi_bitmap_alloc_hwirqs(struct msi_bitmap *bmp, int num);arch/powerpc/sysdev/msi_b= renamed from arch/powerpc/sysdev/msi_bitmap.c +0
-0
itmap.c
arch/powerpc/sysdev/msi_bitmap.c int msi_bitmap_alloc(struct msi_bitmap *bmp, unsigne=
Quoted 12 lines
index 73b64c7..305ebe3 100644
arch/powerpc/sysdev/msi_bitmap.c +1
-0@@ -11,6 +11,7 @@#include <linux/slab.h> #include <linux/kernel.h> #include <linux/bitmap.h> +#include <linux/bootmem.h> #include <asm/msi_bitmap.h> #include <asm/setup.h> =20
arch/powerpc/sysdev/msi_bitmap.c +0
-0@@ -122,7 +123,12 @@ int msi_bitmap_alloc(struct msi_bitmap *bmp, unsigne=
d int irq_count,
Quoted 9 lines
arch/powerpc/sysdev/msi_bitmap.c +0
-0=09size =3D BITS_TO_LONGS(irq_count) * sizeof(long); =09pr_debug("msi_bitmap: allocator bitmap size is 0x%x bytes\n", size);=20
-=09bmp->bitmap =3Dzalloc_maybe_bootmem(size, GFP_KERNEL);+=09if (slab_is_available()) { +=09=09bmp->bitmap =3D kzalloc(size, GFP_KERNEL); +=09=09bmp->bitmap_from_slab =3D true; +=09} else +=09=09bmp->bitmap =3D memblock_virt_alloc(size, 0);
I don't think bmp->bitmap_from_slab is always initialised, so you need to explicitly set it to false here.
arch/powerpc/sysdev/msi_bitmap.c int msi_bitmap_alloc(struct msi_bitmap *bmp, unsigned=
Quoted 5 lines
arch/powerpc/sysdev/msi_bitmap.c +1
-0+ =09if (!bmp->bitmap) { =09=09pr_debug("msi_bitmap: ENOMEM allocating allocator bitmap!\n"); =09=09return -ENOMEM;@@ -138,7 +144,8 @@ int msi_bitmap_alloc(struct msi_bitmap *bmp, unsigned=
int irq_count,
Quoted 13 lines
=20
voidmsi_bitmap_free(struct msi_bitmap *bmp)
{
-=09/* we can't free the bitmap we don't know if it's bootmem etc. */+=09if (bmp->bitmap_from_slab) +=09=09kfree(bmp->bitmap);=09of_node_put(bmp->of_node);
=09bmp->bitmap =3D NULL;
}arch/powerpc/sysdev/msi_bitmap.c +0
-0@@ -200,11 +207,11 @@ static void __init test_basics(void) =09WARN_ON(rc < 0 && rc % 128 !=3D 0);=20
=09msi_bitmap_free(&bmp);
Quoted 2 lines
+=09if (!bmp.bitmap_from_slab) +=09=09kmemleak_not_leak(bmp.bitmap);
As I mentioned in the other thread, I think you can call kmemleak_not_leak() immediately after memblock_virt_alloc() (together with a comment that this is never going to be freed). That would match the other kmemleak API uses throughout the kernel.
--=20
Catalin
Quoted 36 lines · Catalin Marinas
arch/powerpc/include/asm/msi_bitmap.h struct msi_bitmap { · line 22
Quoted 10 lines · Denis Kirjanov
arch/powerpc/include/asm/msi_bitmap.h +1
-0@@ -19,6 +19,7 @@ struct msi_bitmap {unsigned long *bitmap;spinlock_t lock;unsigned int irq_count; +bool bitmap_from_slab;Nitpick: same alignment for
bitmap_from_slabwithirq_countetc. (unless it's just my mail client).Quoted 21 lines
arch/powerpc/include/asm/msi_bitmap.h +0
-0};int msi_bitmap_alloc_hwirqs (struct msi_bitmap *bmp,int num);arch/powerpc/sysdev/msi_bitmap.c +1
-0@@ -11,6 +11,7 @@#include <linux/slab.h> #include <linux/kernel.h> #include <linux/bitmap.h> +#include <linux/bootmem.h> #include <asm/msi_bitmap.h> #include <asm/setup.h> @@ -122,7 +123,12 @@ int msi_bitmap_alloc(struct msi_bitmap *bmp, unsignedint irq_count, size =BITS_TO_LONGS (irq_count) *sizeof (long );pr_debug ("msi_bitmap: allocator bitmap size is 0x%x bytes\n" , size);
Quoted 9 lines
arch/powerpc/sysdev/msi_bitmap.c int msi_bitmap_alloc(struct msi_bitmap *bmp, unsigned int irq_count, · line 130
Quoted 6 lines
arch/powerpc/sysdev/msi_bitmap.c +5
-1- bmp->bitmap =zalloc_maybe_bootmem (size,GFP_KERNEL ); +if (slab_is_available ()) { + bmp->bitmap =kzalloc (size,GFP_KERNEL ); + bmp->bitmap_from_slab = true; + }else + bmp->bitmap =memblock_virt_alloc (size,0 );I don't think
bmp->bitmap_from_slabis always initialised, so you need to explicitly set it to false here.
Oops, right.
Quoted 19 lines
Quoted 19 lines
arch/powerpc/sysdev/msi_bitmap.c +1
-0+if (!bmp->bitmap) {pr_debug ("msi_bitmap: ENOMEM allocating allocator bitmap!\n" );arch/powerpc/sysdev/msi_bitmap.c +2
-1return -ENOMEM ;@@ -138,7 +144,8 @@ int msi_bitmap_alloc(struct msi_bitmap *bmp, unsigned int irq_count, void msi_bitmap_free(struct msi_bitmap *bmp) { -/* we can't free the bitmap we don't know if it's bootmem etc. */ +if (bmp->bitmap_from_slab) +kfree (bmp->bitmap);of_node_put (bmp->of_node); bmp->bitmap =NULL ;}
arch/powerpc/sysdev/msi_bitmap.c +0
-0@@ -200,11 +207,11 @@ static void __init test_basics(void)WARN_ON (rc <0 && rc %128 !=0 );
Quoted 8 lines
arch/powerpc/sysdev/msi_bitmap.c static void __init test_basics(void) · line 211
Quoted 3 lines
arch/powerpc/sysdev/msi_bitmap.c +2
-0msi_bitmap_free (&bmp); +if (!bmp.bitmap_from_slab) +kmemleak_not_leak (bmp.bitmap);As I mentioned in the other thread, I think you can call
kmemleak_not_leak()immediately aftermemblock_virt_alloc()(together with a comment that this is never going to be freed). That would match the other kmemleak API uses throughout the kernel.
Ah, ok. Thanks for the review!
Quoted 5 lines
--
Catalin