From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andi Kleen Subject: [PATCH] [2/11] Add a kernel_address() that works for data too Date: Mon, 21 Dec 2009 02:20:23 +0100 (CET) Message-ID: <20091221012023.9DC1FB158A@basil.firstfloor.org> References: <20091221220.243954235@firstfloor.org> Return-path: Received: from one.firstfloor.org ([213.235.205.2]:37703 "EHLO one.firstfloor.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756356AbZLUBU2 (ORCPT ); Sun, 20 Dec 2009 20:20:28 -0500 In-Reply-To: <20091221220.243954235@firstfloor.org> Sender: linux-arch-owner@vger.kernel.org List-ID: To: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, paulmck@linux.vnet.ibm.com, ebiederm@xmission.com Add a variant of kernel_text_address() that includes kernel data. Assumes kernel is _text ... _end - init section. True everywhere? Cc: linux-arch@vger.kernel.org Signed-off-by: Andi Kleen --- include/linux/kernel.h | 1 + kernel/extable.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) Index: linux-2.6.33-rc1-ak/include/linux/kernel.h =================================================================== --- linux-2.6.33-rc1-ak.orig/include/linux/kernel.h +++ linux-2.6.33-rc1-ak/include/linux/kernel.h @@ -205,6 +205,7 @@ extern unsigned long long memparse(const extern int core_kernel_text(unsigned long addr); extern int __kernel_text_address(unsigned long addr); extern int kernel_text_address(unsigned long addr); +extern int kernel_address(unsigned long addr); extern int func_ptr_is_kernel_text(void *ptr); struct pid; Index: linux-2.6.33-rc1-ak/kernel/extable.c =================================================================== --- linux-2.6.33-rc1-ak.orig/kernel/extable.c +++ linux-2.6.33-rc1-ak/kernel/extable.c @@ -72,6 +72,18 @@ int core_kernel_text(unsigned long addr) return 0; } +static int core_kernel_address(unsigned long addr) +{ + if ((addr >= (unsigned long)_text && + addr <= (unsigned long)_end)) { + if (addr >= (unsigned long)__init_begin && + addr < (unsigned long)__init_end) + return system_state == SYSTEM_BOOTING; + return 1; + } + return 0; +} + int __kernel_text_address(unsigned long addr) { if (core_kernel_text(addr)) @@ -98,6 +110,12 @@ int kernel_text_address(unsigned long ad return is_module_text_address(addr); } +/* text or data in core kernel or module */ +int kernel_address(unsigned long addr) +{ + return core_kernel_address(addr) || is_module_address(addr); +} + /* * On some architectures (PPC64, IA64) function pointers * are actually only tokens to some data that then holds the