From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi•com>
To: "Suzuki K. Poulose" <suzuki@in•ibm.com>
Cc: Jeremy Fitzhardinge <jeremy@goop•org>,
linux-ia64@vger•kernel.org, sparse@chrisli•org,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Paul Mackerras <paulus@samba•org>,
"H. Peter Anvin" <hpa@zytor•com>,
Thomas Gleixner <tglx@linutronix•de>,
linux-tip-commits@vger•kernel.org,
anil.s.keshavamurthy@intel•com, Ingo Molnar <mingo@kernel•org>,
Fenghua Yu <fenghua.yu@intel•com>, Arnd Bergmann <arnd@arndb•de>,
Rusty Russell <rusty@rustcorp•com.au>,
Chris Wright <chrisw@sous-sol•org>,
yrl.pp-manager.tt@hitachi•com, akataria@vmware•com,
Tony Luck <tony.luck@intel•com>, Kevin Hao <haokexin@gmail•com>,
linuxppc-dev@lists•ozlabs.org, rdunlap@infradead•org,
Tony Luck <tony.luck@gmail•com>,
dl9pf@gmx•de, Andrew Morton <akpm@linux-foundation•org>,
Linus Torvalds <torvalds@linux-foundation•org>,
"David S. Miller" <davem@davemloft•net>
Subject: Re: [RFT PATCH -next ] [BUGFIX] kprobes: Fix "Failed to find blacklist" error on ia64 and ppc64
Date: Mon, 26 May 2014 20:48:03 +0900 [thread overview]
Message-ID: <538329F3.7090806@hitachi.com> (raw)
In-Reply-To: <5383249A.6060407@in.ibm.com>
(2014/05/26 20:25), Suzuki K. Poulose wrote:
> On 05/07/2014 05:25 PM, Masami Hiramatsu wrote:
>> On ia64 and ppc64, the function pointer does not point the
>> entry address of the function, but the address of function
>> discriptor (which contains the entry address and misc
>> data.) Since the kprobes passes the function pointer stored
>> by NOKPROBE_SYMBOL() to kallsyms_lookup_size_offset() for
>> initalizing its blacklist, it fails and reports many errors
>> as below.
>>
>> Failed to find blacklist 0001013168300000
>> Failed to find blacklist 0001013000f0a000
>> Failed to find blacklist 000101315f70a000
>> Failed to find blacklist 000101324c80a000
>> Failed to find blacklist 0001013063f0a000
>> Failed to find blacklist 000101327800a000
>> Failed to find blacklist 0001013277f0a000
>> Failed to find blacklist 000101315a70a000
>> Failed to find blacklist 0001013277e0a000
>> Failed to find blacklist 000101305a20a000
>> Failed to find blacklist 0001013277d0a000
>> Failed to find blacklist 00010130bdc0a000
>> Failed to find blacklist 00010130dc20a000
>> Failed to find blacklist 000101309a00a000
>> Failed to find blacklist 0001013277c0a000
>> Failed to find blacklist 0001013277b0a000
>> Failed to find blacklist 0001013277a0a000
>> Failed to find blacklist 000101327790a000
>> Failed to find blacklist 000101303140a000
>> Failed to find blacklist 0001013a3280a000
>>
>> To fix this bug, this introduces function_entry() macro to
>> retrieve the entry address from the given function pointer,
>> and uses it in NOKPROBE_SYMBOL().
>>
>>
>> Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi•com>
>> Reported-by: Tony Luck <tony.luck@gmail•com>
>> Cc: Tony Luck <tony.luck@intel•com>
>> Cc: Fenghua Yu <fenghua.yu@intel•com>
>> Cc: Benjamin Herrenschmidt <benh@kernel•crashing.org>
>> Cc: Paul Mackerras <paulus@samba•org>
>> Cc: Ananth N Mavinakayanahalli <ananth@in•ibm.com>
>> Cc: Kevin Hao <haokexin@gmail•com>
>> Cc: linux-ia64@vger•kernel.org
>> Cc: linux-kernel@vger•kernel.org
>> Cc: linuxppc-dev@lists•ozlabs.org
>> ---
>> arch/ia64/include/asm/types.h | 2 ++
>> arch/powerpc/include/asm/types.h | 11 +++++++++++
>> include/linux/kprobes.h | 3 ++-
>> include/linux/types.h | 4 ++++
>> 4 files changed, 19 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/ia64/include/asm/types.h b/arch/ia64/include/asm/types.h
>> index 4c351b1..6ab7b6c 100644
>> --- a/arch/ia64/include/asm/types.h
>> +++ b/arch/ia64/include/asm/types.h
>> @@ -27,5 +27,7 @@ struct fnptr {
>> unsigned long gp;
>> };
>>
>> +#define constant_function_entry(fn) (((struct fnptr *)(fn))->ip)
>> +
>> #endif /* !__ASSEMBLY__ */
>> #endif /* _ASM_IA64_TYPES_H */
>> diff --git a/arch/powerpc/include/asm/types.h b/arch/powerpc/include/asm/types.h
>> index bfb6ded..fd297b8 100644
>> --- a/arch/powerpc/include/asm/types.h
>> +++ b/arch/powerpc/include/asm/types.h
>> @@ -25,6 +25,17 @@ typedef struct {
>> unsigned long env;
>> } func_descr_t;
>>
>> +#if defined(CONFIG_PPC64) && (!defined(_CALL_ELF) || _CALL_ELF == 1)
>> +/*
>> + * On PPC64 ABIv1 the function pointer actually points to the
>> + * function's descriptor. The first entry in the descriptor is the
>> + * address of the function text.
>> + */
>> +#define constant_function_entry(fn) (((func_descr_t *)(fn))->entry)
>> +#else
>> +#define constant_function_entry(fn) ((unsigned long)(fn))
>> +#endif
>> +
>> #endif /* __ASSEMBLY__ */
>>
>> #endif /* _ASM_POWERPC_TYPES_H */
>> diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
>> index e059507..637eafe 100644
>> --- a/include/linux/kprobes.h
>> +++ b/include/linux/kprobes.h
>> @@ -40,6 +40,7 @@
>> #include <linux/rcupdate.h>
>> #include <linux/mutex.h>
>> #include <linux/ftrace.h>
>> +#include <linux/types.h>
>>
>> #ifdef CONFIG_KPROBES
>> #include <asm/kprobes.h>
>> @@ -485,7 +486,7 @@ static inline int enable_jprobe(struct jprobe *jp)
>> #define __NOKPROBE_SYMBOL(fname) \
>> static unsigned long __used \
>> __attribute__((section("_kprobe_blacklist"))) \
>> - _kbl_addr_##fname = (unsigned long)fname;
>> + _kbl_addr_##fname = constant_function_entry(fname);
>> #define NOKPROBE_SYMBOL(fname) __NOKPROBE_SYMBOL(fname)
>
>
> Throws up build errors for me :
>
> CC kernel/notifier.o
> kernel/notifier.c:105:1: error: initializer element is not constant
> NOKPROBE_SYMBOL(notifier_call_chain);
> ^
> kernel/notifier.c:188:1: error: initializer element is not constant
> NOKPROBE_SYMBOL(__atomic_notifier_call_chain);
> ^
> kernel/notifier.c:196:1: error: initializer element is not constant
> NOKPROBE_SYMBOL(atomic_notifier_call_chain);
> ^
> kernel/notifier.c:546:1: error: initializer element is not constant
> NOKPROBE_SYMBOL(notify_die);
> ^
> make[1]: *** [kernel/notifier.o] Error 1
> make: *** [kernel] Error 2
Thanks for the test!
>> +#define constant_function_entry(fn) (((func_descr_t *)(fn))->entry)
Ah! right, This is not allowed for initialization...
I'll update it to deref pointer when it is used.
Thank you again!
>
> Thanks
> Suzuki
>
>
--
Masami HIRAMATSU
Software Platform Research Dept. Linux Technology Research Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: masami.hiramatsu.pt@hitachi•com
next prev parent reply other threads:[~2014-05-26 11:48 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <536A16A6.5040709@hitachi.com>
2014-05-07 11:55 ` [RFT PATCH -next ] [BUGFIX] kprobes: Fix "Failed to find blacklist" error on ia64 and ppc64 Masami Hiramatsu
2014-05-07 11:59 ` Masami Hiramatsu
2014-05-14 8:19 ` Masami Hiramatsu
2014-05-08 4:47 ` Ananth N Mavinakayanahalli
2014-05-08 5:40 ` Masami Hiramatsu
2014-05-08 6:16 ` Ananth N Mavinakayanahalli
2014-05-09 8:06 ` Masami Hiramatsu
2014-05-26 11:25 ` Suzuki K. Poulose
2014-05-26 11:48 ` Masami Hiramatsu [this message]
2014-05-27 6:31 ` [RFT PATCH -next v2] " Masami Hiramatsu
2014-05-29 19:13 ` Suzuki K. Poulose
2014-05-30 2:47 ` Masami Hiramatsu
2014-05-30 3:18 ` [RFT PATCH -next v3] " Masami Hiramatsu
2014-06-06 6:38 ` Masami Hiramatsu
2014-06-17 23:03 ` Tony Luck
2014-06-18 7:56 ` Michael Ellerman
2014-06-18 8:46 ` Masami Hiramatsu
2014-06-19 1:30 ` Michael Ellerman
2014-06-19 4:52 ` Masami Hiramatsu
2014-06-19 6:40 ` Suzuki K. Poulose
2014-06-19 7:26 ` Masami Hiramatsu
2014-06-19 9:45 ` Suzuki K. Poulose
2014-06-19 11:01 ` Masami Hiramatsu
2014-06-19 11:20 ` Masami Hiramatsu
2014-06-20 0:37 ` Michael Ellerman
2014-06-20 2:13 ` Masami Hiramatsu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=538329F3.7090806@hitachi.com \
--to=masami.hiramatsu.pt@hitachi$(echo .)com \
--cc=akataria@vmware$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=anil.s.keshavamurthy@intel$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=chrisw@sous-sol$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=dl9pf@gmx$(echo .)de \
--cc=fenghua.yu@intel$(echo .)com \
--cc=haokexin@gmail$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=jeremy@goop$(echo .)org \
--cc=linux-ia64@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-tip-commits@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mingo@kernel$(echo .)org \
--cc=paulus@samba$(echo .)org \
--cc=rdunlap@infradead$(echo .)org \
--cc=rusty@rustcorp$(echo .)com.au \
--cc=sparse@chrisli$(echo .)org \
--cc=suzuki@in$(echo .)ibm.com \
--cc=tglx@linutronix$(echo .)de \
--cc=tony.luck@gmail$(echo .)com \
--cc=tony.luck@intel$(echo .)com \
--cc=torvalds@linux-foundation$(echo .)org \
--cc=yrl.pp-manager.tt@hitachi$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox