7d134b2ce6
Often all is needed is these small helpers, instead of compiler.h or a full kprobes.h. This is important for asm helpers, in fact even some asm/kprobes.h make use of these helpers... instead just keep a generic asm file with helpers useful for asm code with the least amount of clutter as possible. Likewise we need now to also address what to do about this file for both when architectures have CONFIG_HAVE_KPROBES, and when they do not. Then for when architectures have CONFIG_HAVE_KPROBES but have disabled CONFIG_KPROBES. Right now most asm/kprobes.h do not have guards against CONFIG_KPROBES, this means most architecture code cannot include asm/kprobes.h safely. Correct this and add guards for architectures missing them. Additionally provide architectures that not have kprobes support with the default asm-generic solution. This lets us force asm/kprobes.h on the header include/linux/kprobes.h always, but most importantly we can now safely include just asm/kprobes.h on architecture code without bringing the full kitchen sink of header files. Two architectures already provided a guard against CONFIG_KPROBES on its kprobes.h: sh, arch. The rest of the architectures needed gaurds added. We avoid including any not-needed headers on asm/kprobes.h unless kprobes have been enabled. In a subsequent atomic change we can try now to remove compiler.h from include/linux/kprobes.h. During this sweep I've also identified a few architectures defining a common macro needed for both kprobes and ftrace, that of the definition of the breakput instruction up. Some refer to this as BREAKPOINT_INSTRUCTION. This must be kept outside of the #ifdef CONFIG_KPROBES guard. [mcgrof@kernel.org: fix arm64 build] Link: http://lkml.kernel.org/r/CAB=NE6X1WMByuARS4mZ1g9+W=LuVBnMDnh_5zyN0CLADaVh=Jw@mail.gmail.com [sfr@canb.auug.org.au: fixup for kprobes declarations moving] Link: http://lkml.kernel.org/r/20170214165933.13ebd4f4@canb.auug.org.au Link: http://lkml.kernel.org/r/20170203233139.32682-1-mcgrof@kernel.org Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Masami Hiramatsu <mhiramat@kernel.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com> Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com> Cc: David S. Miller <davem@davemloft.net> Cc: Ingo Molnar <mingo@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Andy Lutomirski <luto@kernel.org> Cc: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
25 lines
829 B
C
25 lines
829 B
C
#ifndef _ASM_GENERIC_KPROBES_H
|
|
#define _ASM_GENERIC_KPROBES_H
|
|
|
|
#if defined(__KERNEL__) && !defined(__ASSEMBLY__)
|
|
#ifdef CONFIG_KPROBES
|
|
/*
|
|
* Blacklist ganerating macro. Specify functions which is not probed
|
|
* by using this macro.
|
|
*/
|
|
# define __NOKPROBE_SYMBOL(fname) \
|
|
static unsigned long __used \
|
|
__attribute__((__section__("_kprobe_blacklist"))) \
|
|
_kbl_addr_##fname = (unsigned long)fname;
|
|
# define NOKPROBE_SYMBOL(fname) __NOKPROBE_SYMBOL(fname)
|
|
/* Use this to forbid a kprobes attach on very low level functions */
|
|
# define __kprobes __attribute__((__section__(".kprobes.text")))
|
|
# define nokprobe_inline __always_inline
|
|
#else
|
|
# define NOKPROBE_SYMBOL(fname)
|
|
# define __kprobes
|
|
# define nokprobe_inline inline
|
|
#endif
|
|
#endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */
|
|
|
|
#endif /* _ASM_GENERIC_KPROBES_H */
|