kmemleak: Pull request
Linus,
Please consider pulling the kmemleak patches from the branch detailed below.
These patches have been posted/reviewed on several occasions on LKML and available in the linux-next tree for about two kernel release cycles. The necessary x86-specific patch is merged via the x86 tree and the ARM-specific one via RMK's tree (these only add some vmlinux.lds.S symbols).
Thanks.
The following changes since commit 991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d:
Linus Torvalds (1):
Merge branch 'tracing-urgent-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip
are available in the git repository at:
git://linux-arm.org/linux-2.6.git for-linus
Catalin Marinas (12):
kmemleak: Add the base support
kmemleak: Add documentation on the memory leak detector
kmemleak: Add the slab memory allocation/freeing hooks
kmemleak: Add the slob memory allocation/freeing hooks
kmemleak: Add the slub memory allocation/freeing hooks
kmemleak: Add the vmalloc memory allocation/freeing hooks
kmemleak: Add kmemleak_alloc callback from alloc_large_system_hash
kmemleak: Add modules support
kmemleak: Remove some of the kmemleak false positives
kmemleak: Enable the building of the memory leak detector
kmemleak: Simple testing module for kmemleak
kmemleak: Add the corresponding MAINTAINERS entry
Documentation/kernel-parameters.txt | 4 + Documentation/kmemleak.txt | 142 ++++ MAINTAINERS | 6 + drivers/char/vt.c | 7 + fs/block_dev.c | 6 + include/linux/kmemleak.h | 96 +++ include/linux/percpu.h | 5 + include/linux/slab.h | 2 + init/main.c | 4 +- kernel/module.c | 56 ++ lib/Kconfig.debug | 32 + mm/Makefile | 2 + mm/kmemleak-test.c | 111 +++ mm/kmemleak.c | 1498 +++++++++++++++++++++++++++++++++++ mm/page_alloc.c | 11 + mm/slab.c | 32 +- mm/slob.c | 7 + mm/slub.c | 5 +- mm/vmalloc.c | 30 +- 19 files changed, 2049 insertions(+), 7 deletions(-) create mode 100644 Documentation/kmemleak.txt create mode 100644 include/linux/kmemleak.h create mode 100644 mm/kmemleak-test.c create mode 100644 mm/kmemleak.c
Signature · 1 line
Catalin
Quoted 3 lines · Catalin Marinas
Please consider pulling the kmemleak patches from the branch detailed below.
Ok, I got conflicts with the slab/earlyboot changes, but they looked resolvable. I haven't tested the merge though, so please do give it a good check.
Linus
Quoted 9 lines · Linus Torvalds
Quoted 3 lines · Catalin Marinas
Please consider pulling the kmemleak patches from the branch detailed below.
Ok, I got conflicts with the slab/earlyboot changes, but they looked resolvable. I haven't tested the merge though, so please do give it a good check.
I tested it with both slab and slub allocators and seems alright (and found a possible leak in tty_ldisc.c). I'll give it a try with slob as well.
There are two more trivial patches to merge. I'll send them as replies to this mail but you can pull them directly from the same for-linus branch:
The following changes since commit 8ebf975608aaebd7feb33d77f07ba21a6380e086:
Randy Dunlap (1):
block: fix kernel-doc in recent block/ changes
are available in the git repository at:
git://linux-arm.org/linux-2.6.git for-linus
Catalin Marinas (2):
kmemleak: Remove the kmemleak.h include in drivers/char/vt.c
kmemleak: Add more info to the MAINTAINERS entry
MAINTAINERS | 16 ++++++++++------ drivers/char/vt.c | 1 - 2 files changed, 10 insertions(+), 7 deletions(-)
Thanks.
Signature · 1 line
Catalin
PATCH 1/2 kmemleak: Remove the kmemleak.h include in drivers/char/vt.c
This file is no longer annotated for false positives but the kmemleak.h include was still present.
--- drivers/char/vt.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/char/vt.c +0 -1
@@ -103,7 +103,6 @@#include <linux/io.h> #include <asm/system.h> #include <linux/uaccess.h> -#include <linux/kmemleak.h> #define MAX_NR_CON_DRIVER 16
Re: [PATCH 1/2] kmemleak: Remove the kmemleak.h include in drivers/char/vt.c
Quoted 4 lines · On Fri, 12 Jun 2009 10:55:44 +0100 Catalin Marinas <[email protected]>…
This file is no longer annotated for false positives but the
kmemleak.hinclude was still present.Signed-off-by Catalin Marinas <[email protected]>
PATCH 2/2 kmemleak: Add more info to the MAINTAINERS entry
In reply to Catalin MarinasThe patch adds the "F:" fields to the KMEMLEAK MAINTAINERS entry and also moves it before KMEMTRACE to preserve the alphabetical order.
--- MAINTAINERS | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-)
MAINTAINERS +10 -6
@@ -3363,6 +3363,16 @@ F: drivers/serial/kgdboc.c F: include/linux/kgdb.h F: kernel/kgdb.c +KMEMLEAK +P: Catalin Marinas +M: [email protected] +L: [email protected] +S: Maintained +F: Documentation/kmemleak.txt +F: include/linux/kmemleak.h +F: mm/kmemleak.c +F: mm/kmemleak-test.c + KMEMTRACE P: Eduard - Gabriel Munteanu M: [email protected]
@@ -3372,12 +3382,6 @@ F: Documentation/trace/kmemtrace.txt F: include/trace/kmemtrace.h F: kernel/trace/kmemtrace.c -KMEMLEAK -P: Catalin Marinas -M: [email protected] -L: [email protected] -S: Maintained - KPROBES P: Ananth N Mavinakayanahalli M: [email protected]