From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755557Ab3KALZh (ORCPT ); Fri, 1 Nov 2013 07:25:37 -0400 Received: from mail7.hitachi.co.jp ([133.145.228.42]:33596 "EHLO mail7.hitachi.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751508Ab3KALZf (ORCPT ); Fri, 1 Nov 2013 07:25:35 -0400 Subject: [PATCH -tip v2 1/3] kprobes: Introduce nokprobe annotation for non-probe-able functions To: Ingo Molnar From: Masami Hiramatsu Cc: "David S. Miller" , x86@kernel.org, Ananth N Mavinakayanahalli , "Steven Rostedt (Red Hat)" , lkml Date: Fri, 01 Nov 2013 11:25:32 +0000 Message-ID: <20131101112532.14657.34462.stgit@kbuild-fedora.novalocal> In-Reply-To: <20131101112530.14657.87835.stgit@kbuild-fedora.novalocal> References: <20131101112530.14657.87835.stgit@kbuild-fedora.novalocal> User-Agent: StGit/0.16 MIME-Version: 1.0 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 Instead of __kprobes annotation, introduce 'nokprobe' new annotation to annotate that the function is not probed by kprobes. Previously the '__kprobes' is used just for avoiding probes on kprobes-related functions which will be used from kprobes. However nowadays we use it for prohibiting probing the functions implicitly invoked from kprobes int3 handler, since that causes infinit-loop lockup or sudden reboot. In this case, the annotated functions are not limited in the kprobes-related functions, and __kprobes looks very confusing. (Moreover, actually, most of control-side kprobes functions like as register_kprobes() are safely probed by kprobes) Thus, we decide to introduce 'nokprobe' new annotation. We leave "__kprobes" just for compatibility but it should be replaced or removed eventually. New commits must use 'nokprobe' for this purpose. Signed-off-by: Masami Hiramatsu Cc: Ingo Molnar Cc: Ananth N Mavinakayanahalli Cc: "David S. Miller" --- include/linux/compiler.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/linux/compiler.h b/include/linux/compiler.h index 92669cd..173c64e 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -353,8 +353,10 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */ #ifdef CONFIG_KPROBES -# define __kprobes __attribute__((__section__(".kprobes.text"))) +# define nokprobe __attribute__((__section__(".kprobes.text"))) #else -# define __kprobes +# define nokprobe #endif +#define __kprobes nokprobe + #endif /* __LINUX_COMPILER_H */