summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/msi_bitmap.h
diff options
context:
space:
mode:
authorDenis Kirjanov <kda@linux-powerpc.org>2015-09-16 22:26:14 +0300
committerMichael Ellerman <mpe@ellerman.id.au>2015-10-05 21:32:50 +1100
commitcb2d3883c6033831e2a93b396fcc43033108409c (patch)
tree2324cf13c2716efb64cd2c9f4ce518f44a224fb4 /arch/powerpc/include/asm/msi_bitmap.h
parent06bacefcbd5f91efb7ffedc17615fa188d6ce406 (diff)
downloadlinux-cb2d3883c6033831e2a93b396fcc43033108409c.tar.gz
linux-cb2d3883c6033831e2a93b396fcc43033108409c.tar.bz2
linux-cb2d3883c6033831e2a93b396fcc43033108409c.zip
powerpc/msi: Free the bitmap if it was slab allocated
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/0x9c Add a flag to msi_bitmap for tracking allocations from slab and memblock so we can properly free/handle memory in msi_bitmap_free(). Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org> Reviewed-by: Catalin Marinas <catalin.marinas@arm.com> [mpe: Reword changelog & use bitmap_from_slab in the if] Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/include/asm/msi_bitmap.h')
-rw-r--r--arch/powerpc/include/asm/msi_bitmap.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/msi_bitmap.h b/arch/powerpc/include/asm/msi_bitmap.h
index 97ac3f46ae0d..1ec7125551f1 100644
--- a/arch/powerpc/include/asm/msi_bitmap.h
+++ b/arch/powerpc/include/asm/msi_bitmap.h
@@ -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);