Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932443AbWHLWAl (ORCPT ); Sat, 12 Aug 2006 18:00:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932619AbWHLWAk (ORCPT ); Sat, 12 Aug 2006 18:00:40 -0400 Received: from mtaout03-winn.ispmail.ntl.com ([81.103.221.49]:32543 "EHLO mtaout03-winn.ispmail.ntl.com") by vger.kernel.org with ESMTP id S932443AbWHLWAb (ORCPT ); Sat, 12 Aug 2006 18:00:31 -0400 From: Catalin Marinas Subject: [PATCH 2.6.18-rc4 05/10] Add kmemleak support for i386 Date: Sat, 12 Aug 2006 23:00:27 +0100 To: linux-kernel@vger.kernel.org Message-Id: <20060812220027.17709.33032.stgit@localhost.localdomain> In-Reply-To: <20060812215857.17709.79502.stgit@localhost.localdomain> References: <20060812215857.17709.79502.stgit@localhost.localdomain> Content-Type: text/plain; charset=utf-8; format=fixed Content-Transfer-Encoding: 8bit User-Agent: StGIT/0.10 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2750 Lines: 87 From: Catalin Marinas This patch modifies the vmlinux.lds.S script and adds the backtrace support for i386 to be used with kmemleak. Signed-off-by: Catalin Marinas --- arch/i386/kernel/vmlinux.lds.S | 4 ++++ include/asm-i386/processor.h | 12 ++++++++++++ include/asm-i386/thread_info.h | 10 +++++++++- 3 files changed, 25 insertions(+), 1 deletions(-) diff --git a/arch/i386/kernel/vmlinux.lds.S b/arch/i386/kernel/vmlinux.lds.S index 2d4f138..34fccf1 100644 --- a/arch/i386/kernel/vmlinux.lds.S +++ b/arch/i386/kernel/vmlinux.lds.S @@ -45,6 +45,7 @@ SECTIONS __tracedata_end = .; /* writeable */ + _sdata = .; /* Start of data section */ .data : AT(ADDR(.data) - LOAD_OFFSET) { /* Data */ *(.data) CONSTRUCTORS @@ -156,6 +157,9 @@ #endif __per_cpu_start = .; .data.percpu : AT(ADDR(.data.percpu) - LOAD_OFFSET) { *(.data.percpu) } __per_cpu_end = .; + __memleak_offsets_start = .; + .init.memleak_offsets : AT(ADDR(.init.memleak_offsets) - LOAD_OFFSET) { *(.init.memleak_offsets) } + __memleak_offsets_end = .; . = ALIGN(4096); __init_end = .; /* freed after init ends here */ diff --git a/include/asm-i386/processor.h b/include/asm-i386/processor.h index b32346d..29626e3 100644 --- a/include/asm-i386/processor.h +++ b/include/asm-i386/processor.h @@ -731,4 +731,16 @@ extern unsigned long boot_option_idle_ov extern void enable_sep_cpu(void); extern int sysenter_setup(void); +#ifdef CONFIG_FRAME_POINTER +static inline unsigned long arch_call_address(void *frame) +{ + return *(unsigned long *)(frame + 4); +} + +static inline void *arch_prev_frame(void *frame) +{ + return *(void **)frame; +} +#endif + #endif /* __ASM_I386_PROCESSOR_H */ diff --git a/include/asm-i386/thread_info.h b/include/asm-i386/thread_info.h index 54d6d7a..054553f 100644 --- a/include/asm-i386/thread_info.h +++ b/include/asm-i386/thread_info.h @@ -100,12 +100,20 @@ #define alloc_thread_info(tsk) \ struct thread_info *ret; \ \ ret = kmalloc(THREAD_SIZE, GFP_KERNEL); \ + memleak_ignore(ret); \ if (ret) \ memset(ret, 0, THREAD_SIZE); \ ret; \ }) #else -#define alloc_thread_info(tsk) kmalloc(THREAD_SIZE, GFP_KERNEL) +#define alloc_thread_info(tsk) \ + ({ \ + struct thread_info *ret; \ + \ + ret = kmalloc(THREAD_SIZE, GFP_KERNEL); \ + memleak_ignore(ret); \ + ret; \ + }) #endif #define free_thread_info(info) kfree(info) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/