From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi•com>
To: Benjamin Herrenschmidt <benh@kernel•crashing.org>,
Paul Mackerras <paulus@samba•org>,
Tony Luck <tony.luck@gmail•com>
Cc: Jeremy Fitzhardinge <jeremy@goop•org>,
linux-ia64@vger•kernel.org, sparse@chrisli•org,
"H. Peter Anvin" <hpa@zytor•com>,
akataria@vmware•com, linux-tip-commits@vger•kernel.org,
anil.s.keshavamurthy@intel•com, Ingo Molnar <mingo@kernel•org>,
"Suzuki K. Poulose" <suzuki@in•ibm.com>,
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,
Thomas Gleixner <tglx@linutronix•de>,
Tony Luck <tony.luck@intel•com>, Kevin Hao <haokexin@gmail•com>,
Linus Torvalds <torvalds@linux-foundation•org>,
rdunlap@infradead•org,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
dl9pf@gmx•de, Andrew Morton <akpm@linux-foundation•org>,
linuxppc-dev@lists•ozlabs.org,
"David S. Miller" <davem@davemloft•net>
Subject: Re: [PATCH v4] [BUGFIX] kprobes: Fix "Failed to find blacklist" error on ia64 and ppc64
Date: Mon, 30 Jun 2014 12:14:35 +0900 [thread overview]
Message-ID: <53B0D61B.9010104@hitachi.com> (raw)
In-Reply-To: <20140620022307.23075.55858.stgit@kbuild-fedora.novalocal>
Ping? :)
(2014/06/20 11:23), 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 for kallsyms_lookup_size_offset() while initializing
> blacklist.
>
> Changes in v4:
> - Add kernel_text_address() check for verifying the address.
> - Moved on the latest linus tree.
>
> Changes in v3:
> - Fix a bug to get blacklist address based on function entry
> instead of function descriptor. (Suzuki's work, Thanks!)
>
> Changes in V2:
> - Use function_entry() macro when lookin up symbols instead
> of storing it.
> - Update for the latest -next.
>
> Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi•com>
> Reported-by: Tony Luck <tony.luck@gmail•com>
> Tested-by: Tony Luck <tony.luck@intel•com>
> Cc: Michael Ellerman <mpe@ellerman•id.au>
> Cc: Suzuki K. Poulose <suzuki@in•ibm.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/types.h | 4 ++++
> kernel/kprobes.c | 15 ++++++++++-----
> 4 files changed, 27 insertions(+), 5 deletions(-)
>
> diff --git a/arch/ia64/include/asm/types.h b/arch/ia64/include/asm/types.h
> index 4c351b1..95279dd 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 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..8b89d65 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 function_entry(fn) (((func_descr_t *)(fn))->entry)
> +#else
> +#define function_entry(fn) ((unsigned long)(fn))
> +#endif
> +
> #endif /* __ASSEMBLY__ */
>
> #endif /* _ASM_POWERPC_TYPES_H */
> diff --git a/include/linux/types.h b/include/linux/types.h
> index a0bb704..3b95369 100644
> --- a/include/linux/types.h
> +++ b/include/linux/types.h
> @@ -213,5 +213,9 @@ struct callback_head {
> };
> #define rcu_head callback_head
>
> +#ifndef function_entry
> +#define function_entry(fn) ((unsigned long)(fn))
> +#endif
> +
> #endif /* __ASSEMBLY__ */
> #endif /* _LINUX_TYPES_H */
> diff --git a/kernel/kprobes.c b/kernel/kprobes.c
> index 3214289..7412535 100644
> --- a/kernel/kprobes.c
> +++ b/kernel/kprobes.c
> @@ -32,6 +32,7 @@
> * <prasanna@in•ibm.com> added function-return probes.
> */
> #include <linux/kprobes.h>
> +#include <linux/types.h>
> #include <linux/hash.h>
> #include <linux/init.h>
> #include <linux/slab.h>
> @@ -2037,19 +2038,23 @@ static int __init populate_kprobe_blacklist(unsigned long *start,
> {
> unsigned long *iter;
> struct kprobe_blacklist_entry *ent;
> - unsigned long offset = 0, size = 0;
> + unsigned long entry, offset = 0, size = 0;
>
> for (iter = start; iter < end; iter++) {
> - if (!kallsyms_lookup_size_offset(*iter, &size, &offset)) {
> - pr_err("Failed to find blacklist %p\n", (void *)*iter);
> + entry = function_entry(*iter);
> +
> + if (!kernel_text_address(entry) ||
> + !kallsyms_lookup_size_offset(entry, &size, &offset)) {
> + pr_err("Failed to find blacklist at %p\n",
> + (void *)entry);
> continue;
> }
>
> ent = kmalloc(sizeof(*ent), GFP_KERNEL);
> if (!ent)
> return -ENOMEM;
> - ent->start_addr = *iter;
> - ent->end_addr = *iter + size;
> + ent->start_addr = entry;
> + ent->end_addr = entry + size;
> INIT_LIST_HEAD(&ent->list);
> list_add_tail(&ent->list, &kprobe_blacklist);
> }
>
>
>
--
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-06-30 3:14 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-20 2:23 [PATCH v4] [BUGFIX] kprobes: Fix "Failed to find blacklist" error on ia64 and ppc64 Masami Hiramatsu
2014-06-30 3:14 ` Masami Hiramatsu [this message]
2014-06-30 11:36 ` Michael Ellerman
2014-07-01 2:21 ` Masami Hiramatsu
2014-07-02 4:41 ` Michael Ellerman
2014-07-02 6:39 ` Masami Hiramatsu
2014-07-02 6:56 ` Michael Ellerman
2014-07-02 7:16 ` Masami Hiramatsu
2014-07-02 7:00 ` [PATCH v5 1/2] kprobes/powerpc: Fix arch_deref_entry_point to support ABIv2 Masami Hiramatsu
2014-07-02 7:18 ` Masami Hiramatsu
2014-07-02 7:00 ` [PATCH v5 2/2] [BUGFIX] kprobes: Fix "Failed to find blacklist" error on ia64 and ppc64 Masami Hiramatsu
2014-07-08 12:07 ` Masami Hiramatsu
2014-07-14 17:17 ` Tony Luck
2014-07-15 2:11 ` Michael Ellerman
2014-07-15 2:24 ` Masami Hiramatsu
2014-07-15 3:16 ` Michael Ellerman
2014-07-15 3:19 ` Michael Ellerman
2014-07-15 7:16 ` Benjamin Herrenschmidt
2014-07-15 10:09 ` Masami Hiramatsu
2014-07-16 13:28 ` Ingo Molnar
2014-07-17 7:10 ` Masami Hiramatsu
2014-07-17 9:40 ` Ingo Molnar
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=53B0D61B.9010104@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=benh@kernel$(echo .)crashing.org \
--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