From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751958Ab3LKC6R (ORCPT ); Tue, 10 Dec 2013 21:58:17 -0500 Received: from mail9.hitachi.co.jp ([133.145.228.44]:55359 "EHLO mail9.hitachi.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751030Ab3LKC6Q (ORCPT ); Tue, 10 Dec 2013 21:58:16 -0500 Message-ID: <52A7D4C0.7060700@hitachi.com> Date: Wed, 11 Dec 2013 11:58:08 +0900 From: Masami Hiramatsu Organization: Hitachi, Ltd., Japan User-Agent: Mozilla/5.0 (Windows NT 5.2; rv:13.0) Gecko/20120614 Thunderbird/13.0.1 MIME-Version: 1.0 To: Ingo Molnar Cc: linux-arch@vger.kernel.org, Ananth N Mavinakayanahalli , Sandeepa Prabhu , x86@kernel.org, lkml , "Steven Rostedt (Red Hat)" , systemtap@sourceware.org, "David S. Miller" Subject: Re: [PATCH -tip v5 13/18] notifier: Use NOKPROBE_SYMBOL macro in notifier References: <20131209104717.13397.8864.stgit@kbuild-fedora.novalocal> <20131209104748.13397.52431.stgit@kbuild-fedora.novalocal> In-Reply-To: <20131209104748.13397.52431.stgit@kbuild-fedora.novalocal> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org (2013/12/09 19:47), Masami Hiramatsu wrote: > Use NOKPROBE_SYMBOL macro to protect functions from > kprobes instead of __kprobes annotation in notifier. Ah, this must just removes __kprobes since we don't use notify_die for kprobes anymore... > > Signed-off-by: Masami Hiramatsu > --- > kernel/notifier.c | 22 +++++++++++++--------- > 1 file changed, 13 insertions(+), 9 deletions(-) > > diff --git a/kernel/notifier.c b/kernel/notifier.c > index 2d5cc4c..61fc78a 100644 > --- a/kernel/notifier.c > +++ b/kernel/notifier.c > @@ -71,9 +71,9 @@ static int notifier_chain_unregister(struct notifier_block **nl, > * @returns: notifier_call_chain returns the value returned by the > * last notifier function called. > */ > -static int __kprobes notifier_call_chain(struct notifier_block **nl, > - unsigned long val, void *v, > - int nr_to_call, int *nr_calls) > +static int notifier_call_chain(struct notifier_block **nl, > + unsigned long val, void *v, > + int nr_to_call, int *nr_calls) > { > int ret = NOTIFY_DONE; > struct notifier_block *nb, *next_nb; > @@ -102,6 +102,7 @@ static int __kprobes notifier_call_chain(struct notifier_block **nl, > } > return ret; > } > +NOKPROBE_SYMBOL(notifier_call_chain); > > /* > * Atomic notifier chain routines. Registration and unregistration > @@ -172,9 +173,9 @@ EXPORT_SYMBOL_GPL(atomic_notifier_chain_unregister); > * Otherwise the return value is the return value > * of the last notifier function called. > */ > -int __kprobes __atomic_notifier_call_chain(struct atomic_notifier_head *nh, > - unsigned long val, void *v, > - int nr_to_call, int *nr_calls) > +int __atomic_notifier_call_chain(struct atomic_notifier_head *nh, > + unsigned long val, void *v, > + int nr_to_call, int *nr_calls) > { > int ret; > > @@ -184,13 +185,15 @@ int __kprobes __atomic_notifier_call_chain(struct atomic_notifier_head *nh, > return ret; > } > EXPORT_SYMBOL_GPL(__atomic_notifier_call_chain); > +NOKPROBE_SYMBOL(__atomic_notifier_call_chain); > > -int __kprobes atomic_notifier_call_chain(struct atomic_notifier_head *nh, > - unsigned long val, void *v) > +int atomic_notifier_call_chain(struct atomic_notifier_head *nh, > + unsigned long val, void *v) > { > return __atomic_notifier_call_chain(nh, val, v, -1, NULL); > } > EXPORT_SYMBOL_GPL(atomic_notifier_call_chain); > +NOKPROBE_SYMBOL(atomic_notifier_call_chain); > > /* > * Blocking notifier chain routines. All access to the chain is > @@ -527,7 +530,7 @@ EXPORT_SYMBOL_GPL(srcu_init_notifier_head); > > static ATOMIC_NOTIFIER_HEAD(die_chain); > > -int notrace __kprobes notify_die(enum die_val val, const char *str, > +int notrace notify_die(enum die_val val, const char *str, > struct pt_regs *regs, long err, int trap, int sig) > { > struct die_args args = { > @@ -540,6 +543,7 @@ int notrace __kprobes notify_die(enum die_val val, const char *str, > }; > return atomic_notifier_call_chain(&die_chain, val, &args); > } > +NOKPROBE_SYMBOL(notify_die); > > int register_die_notifier(struct notifier_block *nb) > { > > > -- Masami HIRAMATSU IT Management Research Dept. Linux Technology Center Hitachi, Ltd., Yokohama Research Laboratory E-mail: masami.hiramatsu.pt@hitachi.com