From: Masami Hiramatsu <mhiramat@kernel.org>
To: mcgrof@kernel.org
Cc: gnomes@lxorguk.ukuu.org.uk, linux-ia64@vger.kernel.org,
jkosina@suse.cz, benh@kernel.crashing.org,
ming.lei@canonical.com, heiko.carstens@de.ibm.com,
platform-driver-x86@vger.kernel.org,
James.Bottomley@HansenPartnership.com,
paul.gortmaker@windriver.com, paulus@samba.org,
mpe@ellerman.id.au, hpa@zytor.com,
masami.hiramatsu.pt@hitachi.com, mchehab@osg.samsung.com,
linux-arch@vger.kernel.org, markus.heiser@darmarit.de,
sparclinux@vger.kernel.org, xen-devel@lists.xensource.com,
linux@arm.linux.org.uk, linux-sh@vger.kernel.org,
will.deacon@arm.com, korea.drzix@gmail.com, x86@kernel.org,
anil.s.keshavamurthy@intel.com, fontana@sharpeleven.org,
torvalds@linux-foundation.org, mingo@redhat.com,
linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com,
dvhart@infradead.org, linux-xtensa@linux-xtensa.org,
pali.rohar@gmail.com, keescook@chromium.org, arnd@arndb.de,
realmz6@gma
Subject: Re: [PATCH v4 14/16] kprobes: move kprobe declarations to asm-generic/kprobes.h
Date: Mon, 22 Aug 2016 15:11:40 +0000 [thread overview]
Message-ID: <20160823001140.8f7293408d2094a14c7725a1@kernel.org> (raw)
In-Reply-To: <1471642454-5679-15-git-send-email-mcgrof@kernel.org>
On Fri, 19 Aug 2016 14:34:12 -0700
mcgrof@kernel.org wrote:
> From: "Luis R. Rodriguez" <mcgrof@kernel.org>
>
> 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.
Hmm, this looks a bit overkill... I rather like move it into linux/table.h.
Thanks,
>
> Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
> ---
> arch/alpha/include/asm/Kbuild | 1 +
> arch/arc/include/asm/kprobes.h | 6 ++++--
> arch/arm/include/asm/kprobes.h | 4 ++++
> arch/arm/probes/decode.h | 1 +
> arch/arm64/include/asm/kprobes.h | 4 ++++
> arch/arm64/kernel/insn.c | 1 +
> arch/avr32/include/asm/kprobes.h | 4 ++++
> arch/blackfin/include/asm/Kbuild | 1 +
> arch/c6x/include/asm/Kbuild | 1 +
> arch/cris/include/asm/Kbuild | 1 +
> arch/frv/include/asm/Kbuild | 1 +
> arch/h8300/include/asm/Kbuild | 1 +
> arch/hexagon/include/asm/Kbuild | 1 +
> arch/ia64/include/asm/kprobes.h | 7 ++++++-
> arch/m32r/include/asm/Kbuild | 1 +
> arch/m68k/include/asm/Kbuild | 1 +
> arch/metag/include/asm/Kbuild | 1 +
> arch/microblaze/include/asm/Kbuild | 1 +
> arch/mips/include/asm/kprobes.h | 6 +++++-
> arch/mn10300/include/asm/kprobes.h | 4 ++++
> arch/nios2/include/asm/Kbuild | 1 +
> arch/openrisc/include/asm/Kbuild | 1 +
> arch/parisc/include/asm/Kbuild | 1 +
> arch/powerpc/include/asm/kprobes.h | 6 ++++++
> arch/s390/include/asm/kprobes.h | 4 ++++
> arch/score/include/asm/Kbuild | 1 +
> arch/sh/include/asm/kprobes.h | 2 ++
> arch/sparc/include/asm/kprobes.h | 5 +++++
> arch/tile/include/asm/kprobes.h | 6 +++++-
> arch/um/include/asm/Kbuild | 1 +
> arch/unicore32/include/asm/Kbuild | 1 +
> arch/x86/include/asm/kprobes.h | 6 ++++++
> arch/xtensa/include/asm/Kbuild | 1 +
> include/asm-generic/kprobes.h | 25 +++++++++++++++++++++++++
> include/linux/compiler.h | 8 --------
> include/linux/kprobes.h | 19 +++----------------
> 36 files changed, 107 insertions(+), 29 deletions(-)
> create mode 100644 include/asm-generic/kprobes.h
>
> diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild
> index f3bdc31d3c97..54d388fd026f 100644
> --- a/arch/alpha/include/asm/Kbuild
> +++ b/arch/alpha/include/asm/Kbuild
> @@ -13,3 +13,4 @@ generic-y += trace_clock.h
> generic-y += section-core.h
> generic-y += ranges.h
> generic-y += tables.h
> +generic-y += kprobes.h
> diff --git a/arch/arc/include/asm/kprobes.h b/arch/arc/include/asm/kprobes.h
> index 944dbedb38b5..00bdbe167615 100644
> --- a/arch/arc/include/asm/kprobes.h
> +++ b/arch/arc/include/asm/kprobes.h
> @@ -9,6 +9,8 @@
> #ifndef _ARC_KPROBES_H
> #define _ARC_KPROBES_H
>
> +#include <asm-generic/kprobes.h>
> +
> #ifdef CONFIG_KPROBES
>
> typedef u16 kprobe_opcode_t;
> @@ -55,6 +57,6 @@ void trap_is_kprobe(unsigned long address, struct pt_regs *regs);
> static void trap_is_kprobe(unsigned long address, struct pt_regs *regs)
> {
> }
> -#endif
> +#endif /* CONFIG_KPROBES */
>
> -#endif
> +#endif /* _ARC_KPROBES_H */
> diff --git a/arch/arm/include/asm/kprobes.h b/arch/arm/include/asm/kprobes.h
> index 3ea9be559726..59655459da59 100644
> --- a/arch/arm/include/asm/kprobes.h
> +++ b/arch/arm/include/asm/kprobes.h
> @@ -16,6 +16,9 @@
> #ifndef _ARM_KPROBES_H
> #define _ARM_KPROBES_H
>
> +#include <asm-generic/kprobes.h>
> +
> +#ifdef CONFIG_KPROBES
> #include <linux/types.h>
> #include <linux/ptrace.h>
> #include <linux/notifier.h>
> @@ -83,4 +86,5 @@ struct arch_optimized_insn {
> */
> };
>
> +#endif /* CONFIG_KPROBES */
> #endif /* _ARM_KPROBES_H */
> diff --git a/arch/arm/probes/decode.h b/arch/arm/probes/decode.h
> index f9b08ba7fe73..548d622a3159 100644
> --- a/arch/arm/probes/decode.h
> +++ b/arch/arm/probes/decode.h
> @@ -22,6 +22,7 @@
> #include <linux/types.h>
> #include <linux/stddef.h>
> #include <asm/probes.h>
> +#include <asm/kprobes.h>
>
> void __init arm_probes_decode_init(void);
>
> diff --git a/arch/arm64/include/asm/kprobes.h b/arch/arm64/include/asm/kprobes.h
> index 1737aecfcc5e..6deb8d726041 100644
> --- a/arch/arm64/include/asm/kprobes.h
> +++ b/arch/arm64/include/asm/kprobes.h
> @@ -16,6 +16,9 @@
> #ifndef _ARM_KPROBES_H
> #define _ARM_KPROBES_H
>
> +#include <asm-generic/kprobes.h>
> +
> +#ifdef CONFIG_KPROBES
> #include <linux/types.h>
> #include <linux/ptrace.h>
> #include <linux/percpu.h>
> @@ -57,4 +60,5 @@ int kprobe_single_step_handler(struct pt_regs *regs, unsigned int esr);
> void kretprobe_trampoline(void);
> void __kprobes *trampoline_probe_handler(struct pt_regs *regs);
>
> +#endif /* CONFIG_KPROBES */
> #endif /* _ARM_KPROBES_H */
> diff --git a/arch/arm64/kernel/insn.c b/arch/arm64/kernel/insn.c
> index 63f9432d05e8..cc38f3241927 100644
> --- a/arch/arm64/kernel/insn.c
> +++ b/arch/arm64/kernel/insn.c
> @@ -32,6 +32,7 @@
> #include <asm/fixmap.h>
> #include <asm/opcodes.h>
> #include <asm/insn.h>
> +#include <asm/kprobes.h>
>
> #define AARCH64_INSN_SF_BIT BIT(31)
> #define AARCH64_INSN_N_BIT BIT(22)
> diff --git a/arch/avr32/include/asm/kprobes.h b/arch/avr32/include/asm/kprobes.h
> index 45f563ed73fd..09f39d8749ea 100644
> --- a/arch/avr32/include/asm/kprobes.h
> +++ b/arch/avr32/include/asm/kprobes.h
> @@ -11,6 +11,9 @@
> #ifndef __ASM_AVR32_KPROBES_H
> #define __ASM_AVR32_KPROBES_H
>
> +#include <asm-generic/kprobes.h>
> +
> +#ifdef CONFIG_KPROBES
> #include <linux/types.h>
>
> typedef u16 kprobe_opcode_t;
> @@ -46,4 +49,5 @@ extern int kprobe_exceptions_notify(struct notifier_block *self,
>
> #define flush_insn_slot(p) do { } while (0)
>
> +#endif /* CONFIG_KPROBES */
> #endif /* __ASM_AVR32_KPROBES_H */
> diff --git a/arch/blackfin/include/asm/Kbuild b/arch/blackfin/include/asm/Kbuild
> index b71893b1cd53..f56a68697353 100644
> --- a/arch/blackfin/include/asm/Kbuild
> +++ b/arch/blackfin/include/asm/Kbuild
> @@ -51,3 +51,4 @@ generic-y += xor.h
> generic-y += section-core.h
> generic-y += ranges.h
> generic-y += tables.h
> +generic-y += kprobes.h
> diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild
> index cede2a950fbf..c54f7cc1f63e 100644
> --- a/arch/c6x/include/asm/Kbuild
> +++ b/arch/c6x/include/asm/Kbuild
> @@ -64,3 +64,4 @@ generic-y += word-at-a-time.h
> generic-y += xor.h
> generic-y += section-core.h
> generic-y += ranges.h
> +generic-y += kprobes.h
> diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
> index 7062c1be7913..051d355feae3 100644
> --- a/arch/cris/include/asm/Kbuild
> +++ b/arch/cris/include/asm/Kbuild
> @@ -48,3 +48,4 @@ generic-y += xor.h
> generic-y += section-core.h
> generic-y += ranges.h
> generic-y += tables.h
> +generic-y += kprobes.h
> diff --git a/arch/frv/include/asm/Kbuild b/arch/frv/include/asm/Kbuild
> index 4a59cbda5091..b58b9fc49383 100644
> --- a/arch/frv/include/asm/Kbuild
> +++ b/arch/frv/include/asm/Kbuild
> @@ -11,3 +11,4 @@ generic-y += word-at-a-time.h
> generic-y += section-core.h
> generic-y += ranges.h
> generic-y += tables.h
> +generic-y += kprobes.h
> diff --git a/arch/h8300/include/asm/Kbuild b/arch/h8300/include/asm/Kbuild
> index d79968d93c12..cfca7de52b37 100644
> --- a/arch/h8300/include/asm/Kbuild
> +++ b/arch/h8300/include/asm/Kbuild
> @@ -78,3 +78,4 @@ generic-y += xor.h
> generic-y += section-core.h
> generic-y += ranges.h
> generic-y += tables.h
> +generic-y += kprobes.h
> diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild
> index d59ac1c1858b..d7cc35451f30 100644
> --- a/arch/hexagon/include/asm/Kbuild
> +++ b/arch/hexagon/include/asm/Kbuild
> @@ -63,3 +63,4 @@ generic-y += xor.h
> generic-y += section-core.h
> generic-y += ranges.h
> generic-y += tables.h
> +generic-y += kprobes.h
> diff --git a/arch/ia64/include/asm/kprobes.h b/arch/ia64/include/asm/kprobes.h
> index d5505d6f2382..36999c55f3f2 100644
> --- a/arch/ia64/include/asm/kprobes.h
> +++ b/arch/ia64/include/asm/kprobes.h
> @@ -23,6 +23,10 @@
> * 2005-Apr Rusty Lynch <rusty.lynch@intel.com> and Anil S Keshavamurthy
> * <anil.s.keshavamurthy@intel.com> adapted from i386
> */
> +#include <asm-generic/kprobes.h>
> +
> +#ifdef CONFIG_KPROBES
> +
> #include <linux/types.h>
> #include <linux/ptrace.h>
> #include <linux/percpu.h>
> @@ -124,4 +128,5 @@ extern void invalidate_stacked_regs(void);
> extern void flush_register_stack(void);
> extern void arch_remove_kprobe(struct kprobe *p);
>
> -#endif /* _ASM_KPROBES_H */
> +#endif /* CONFIG_KPROBES */
> +#endif /* _ASM_KPROBES_H */
> diff --git a/arch/m32r/include/asm/Kbuild b/arch/m32r/include/asm/Kbuild
> index 24088f3c733c..198ad591ab41 100644
> --- a/arch/m32r/include/asm/Kbuild
> +++ b/arch/m32r/include/asm/Kbuild
> @@ -14,3 +14,4 @@ generic-y += word-at-a-time.h
> generic-y += section-core.h
> generic-y += ranges.h
> generic-y += tables.h
> +generic-y += kprobes.h
> diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
> index 65c0df17f70e..ae86bb91e13b 100644
> --- a/arch/m68k/include/asm/Kbuild
> +++ b/arch/m68k/include/asm/Kbuild
> @@ -38,3 +38,4 @@ generic-y += xor.h
> generic-y += section-core.h
> generic-y += ranges.h
> generic-y += tables.h
> +generic-y += kprobes.h
> diff --git a/arch/metag/include/asm/Kbuild b/arch/metag/include/asm/Kbuild
> index 2538224899fd..10f36ed301e1 100644
> --- a/arch/metag/include/asm/Kbuild
> +++ b/arch/metag/include/asm/Kbuild
> @@ -59,3 +59,4 @@ generic-y += xor.h
> generic-y += section-core.h
> generic-y += ranges.h
> generic-y += tables.h
> +generic-y += kprobes.h
> diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/asm/Kbuild
> index 01afb1b420f5..865ce3d96443 100644
> --- a/arch/microblaze/include/asm/Kbuild
> +++ b/arch/microblaze/include/asm/Kbuild
> @@ -14,3 +14,4 @@ generic-y += word-at-a-time.h
> generic-y += section-core.h
> generic-y += ranges.h
> generic-y += tables.h
> +generic-y += kprobes.h
> diff --git a/arch/mips/include/asm/kprobes.h b/arch/mips/include/asm/kprobes.h
> index daba1f9a4f79..291846d9ba83 100644
> --- a/arch/mips/include/asm/kprobes.h
> +++ b/arch/mips/include/asm/kprobes.h
> @@ -22,6 +22,9 @@
> #ifndef _ASM_KPROBES_H
> #define _ASM_KPROBES_H
>
> +#include <asm-generic/kprobes.h>
> +
> +#ifdef CONFIG_KPROBES
> #include <linux/ptrace.h>
> #include <linux/types.h>
>
> @@ -94,4 +97,5 @@ struct kprobe_ctlblk {
> extern int kprobe_exceptions_notify(struct notifier_block *self,
> unsigned long val, void *data);
>
> -#endif /* _ASM_KPROBES_H */
> +#endif /* CONFIG_KPROBES */
> +#endif /* _ASM_KPROBES_H */
> diff --git a/arch/mn10300/include/asm/kprobes.h b/arch/mn10300/include/asm/kprobes.h
> index c800b590183a..5729bb5b972a 100644
> --- a/arch/mn10300/include/asm/kprobes.h
> +++ b/arch/mn10300/include/asm/kprobes.h
> @@ -21,6 +21,9 @@
> #ifndef _ASM_KPROBES_H
> #define _ASM_KPROBES_H
>
> +#include <asm-generic/kprobes.h>
> +
> +#ifdef CONFIG_KPROBES
> #include <linux/types.h>
> #include <linux/ptrace.h>
>
> @@ -47,4 +50,5 @@ extern int kprobe_exceptions_notify(struct notifier_block *self,
>
> extern void arch_remove_kprobe(struct kprobe *p);
>
> +#endif /* CONFIG_KPROBES */
> #endif /* _ASM_KPROBES_H */
> diff --git a/arch/nios2/include/asm/Kbuild b/arch/nios2/include/asm/Kbuild
> index ee6220dac1e8..d6ce7edee7e0 100644
> --- a/arch/nios2/include/asm/Kbuild
> +++ b/arch/nios2/include/asm/Kbuild
> @@ -66,3 +66,4 @@ generic-y += xor.h
> generic-y += section-core.h
> generic-y += ranges.h
> generic-y += tables.h
> +generic-y += kprobes.h
> diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild
> index ceafe458e295..1bf89a67317c 100644
> --- a/arch/openrisc/include/asm/Kbuild
> +++ b/arch/openrisc/include/asm/Kbuild
> @@ -74,3 +74,4 @@ generic-y += xor.h
> generic-y += section-core.h
> generic-y += ranges.h
> generic-y += tables.h
> +generic-y += kprobes.h
> diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild
> index 99211477bfb2..982886ba812a 100644
> --- a/arch/parisc/include/asm/Kbuild
> +++ b/arch/parisc/include/asm/Kbuild
> @@ -32,3 +32,4 @@ generic-y += xor.h
> generic-y += section-core.h
> generic-y += ranges.h
> generic-y += tables.h
> +generic-y += kprobes.h
> diff --git a/arch/powerpc/include/asm/kprobes.h b/arch/powerpc/include/asm/kprobes.h
> index 2c9759bdb63b..e5d0dc5c6236 100644
> --- a/arch/powerpc/include/asm/kprobes.h
> +++ b/arch/powerpc/include/asm/kprobes.h
> @@ -1,5 +1,9 @@
> #ifndef _ASM_POWERPC_KPROBES_H
> #define _ASM_POWERPC_KPROBES_H
> +
> +#include <asm-generic/kprobes.h>
> +
> +#ifdef CONFIG_KPROBES
> #ifdef __KERNEL__
> /*
> * Kernel Probes (KProbes)
> @@ -127,5 +131,7 @@ struct kprobe_ctlblk {
> extern int kprobe_exceptions_notify(struct notifier_block *self,
> unsigned long val, void *data);
> extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr);
> +
> #endif /* __KERNEL__ */
> +#endif /* CONFIG_KPROBES */
> #endif /* _ASM_POWERPC_KPROBES_H */
> diff --git a/arch/s390/include/asm/kprobes.h b/arch/s390/include/asm/kprobes.h
> index 591e5a5279b0..dc12b0135007 100644
> --- a/arch/s390/include/asm/kprobes.h
> +++ b/arch/s390/include/asm/kprobes.h
> @@ -27,6 +27,9 @@
> * 2005-Dec Used as a template for s390 by Mike Grundy
> * <grundym@us.ibm.com>
> */
> +#include <asm-generic/kprobes.h>
> +
> +#ifdef CONFIG_KPROBES
> #include <linux/types.h>
> #include <linux/ptrace.h>
> #include <linux/percpu.h>
> @@ -91,4 +94,5 @@ int probe_is_insn_relative_long(u16 *insn);
>
> #define flush_insn_slot(p) do { } while (0)
>
> +#endif /* CONFIG_KPROBES */
> #endif /* _ASM_S390_KPROBES_H */
> diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild
> index 16ea15a3e432..6ac8a7f5c768 100644
> --- a/arch/score/include/asm/Kbuild
> +++ b/arch/score/include/asm/Kbuild
> @@ -17,3 +17,4 @@ generic-y += word-at-a-time.h
> generic-y += section-core.h
> generic-y += ranges.h
> generic-y += tables.h
> +generic-y += kprobes.h
> diff --git a/arch/sh/include/asm/kprobes.h b/arch/sh/include/asm/kprobes.h
> index 134f3980e44a..0b9a54016eeb 100644
> --- a/arch/sh/include/asm/kprobes.h
> +++ b/arch/sh/include/asm/kprobes.h
> @@ -1,6 +1,8 @@
> #ifndef __ASM_SH_KPROBES_H
> #define __ASM_SH_KPROBES_H
>
> +#include <asm-generic/kprobes.h>
> +
> #ifdef CONFIG_KPROBES
>
> #include <linux/types.h>
> diff --git a/arch/sparc/include/asm/kprobes.h b/arch/sparc/include/asm/kprobes.h
> index a145d798e112..8c4cd15395f6 100644
> --- a/arch/sparc/include/asm/kprobes.h
> +++ b/arch/sparc/include/asm/kprobes.h
> @@ -1,6 +1,9 @@
> #ifndef _SPARC64_KPROBES_H
> #define _SPARC64_KPROBES_H
>
> +#include <asm-generic/kprobes.h>
> +
> +#ifdef CONFIG_KPROBES
> #include <linux/types.h>
> #include <linux/percpu.h>
>
> @@ -48,4 +51,6 @@ int kprobe_exceptions_notify(struct notifier_block *self,
> int kprobe_fault_handler(struct pt_regs *regs, int trapnr);
> asmlinkage void __kprobes kprobe_trap(unsigned long trap_level,
> struct pt_regs *regs);
> +
> +#endif /* CONFIG_KPROBES */
> #endif /* _SPARC64_KPROBES_H */
> diff --git a/arch/tile/include/asm/kprobes.h b/arch/tile/include/asm/kprobes.h
> index d8f9a83943b1..4a8b1cadca24 100644
> --- a/arch/tile/include/asm/kprobes.h
> +++ b/arch/tile/include/asm/kprobes.h
> @@ -17,10 +17,13 @@
> #ifndef _ASM_TILE_KPROBES_H
> #define _ASM_TILE_KPROBES_H
>
> +#include <asm-generic/kprobes.h>
> +
> +#ifdef CONFIG_KPROBES
> +
> #include <linux/types.h>
> #include <linux/ptrace.h>
> #include <linux/percpu.h>
> -
> #include <arch/opcode.h>
>
> #define __ARCH_WANT_KPROBES_INSN_SLOT
> @@ -76,4 +79,5 @@ void arch_remove_kprobe(struct kprobe *);
> extern int kprobe_exceptions_notify(struct notifier_block *self,
> unsigned long val, void *data);
>
> +#endif /* CONFIG_KPROBES */
> #endif /* _ASM_TILE_KPROBES_H */
> diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild
> index eea5dd842992..f0314517090b 100644
> --- a/arch/um/include/asm/Kbuild
> +++ b/arch/um/include/asm/Kbuild
> @@ -30,3 +30,4 @@ generic-y += xor.h
> generic-y += section-core.h
> generic-y += ranges.h
> generic-y += tables.h
> +generic-y += kprobes.h
> diff --git a/arch/unicore32/include/asm/Kbuild b/arch/unicore32/include/asm/Kbuild
> index 5c31eafbf1fd..32321579011b 100644
> --- a/arch/unicore32/include/asm/Kbuild
> +++ b/arch/unicore32/include/asm/Kbuild
> @@ -66,3 +66,4 @@ generic-y += word-at-a-time.h
> generic-y += xor.h
> generic-y += ranges.h
> generic-y += tables.h
> +generic-y += kprobes.h
> diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
> index d1d1e5094c28..95c480dc8570 100644
> --- a/arch/x86/include/asm/kprobes.h
> +++ b/arch/x86/include/asm/kprobes.h
> @@ -21,6 +21,10 @@
> *
> * See arch/x86/kernel/kprobes.c for x86 kprobes history.
> */
> +
> +#include <asm-generic/kprobes.h>
> +
> +#ifdef CONFIG_KPROBES
> #include <linux/types.h>
> #include <linux/ptrace.h>
> #include <linux/percpu.h>
> @@ -116,4 +120,6 @@ extern int kprobe_exceptions_notify(struct notifier_block *self,
> unsigned long val, void *data);
> extern int kprobe_int3_handler(struct pt_regs *regs);
> extern int kprobe_debug_handler(struct pt_regs *regs);
> +
> +#endif /* CONFIG_KPROBES */
> #endif /* _ASM_X86_KPROBES_H */
> diff --git a/arch/xtensa/include/asm/Kbuild b/arch/xtensa/include/asm/Kbuild
> index ae48f8fd9212..bf0e40100fda 100644
> --- a/arch/xtensa/include/asm/Kbuild
> +++ b/arch/xtensa/include/asm/Kbuild
> @@ -34,3 +34,4 @@ generic-y += xor.h
> generic-y += section-core.h
> generic-y += ranges.h
> generic-y += tables.h
> +generic-y += kprobes.h
> diff --git a/include/asm-generic/kprobes.h b/include/asm-generic/kprobes.h
> new file mode 100644
> index 000000000000..57af9f21d148
> --- /dev/null
> +++ b/include/asm-generic/kprobes.h
> @@ -0,0 +1,25 @@
> +#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 */
> diff --git a/include/linux/compiler.h b/include/linux/compiler.h
> index 1eed7f5e137d..4736dc5741e4 100644
> --- a/include/linux/compiler.h
> +++ b/include/linux/compiler.h
> @@ -542,12 +542,4 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
> (_________p1); \
> })
>
> -/* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
> -#ifdef CONFIG_KPROBES
> -# define __kprobes __attribute__((__section__(".kprobes.text")))
> -# define nokprobe_inline __always_inline
> -#else
> -# define __kprobes
> -# define nokprobe_inline inline
> -#endif
> #endif /* __LINUX_COMPILER_H */
> diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
> index 8f6849084248..985ed79ef431 100644
> --- a/include/linux/kprobes.h
> +++ b/include/linux/kprobes.h
> @@ -29,7 +29,7 @@
> * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
> * <prasanna@in.ibm.com> added function-return probes.
> */
> -#include <linux/compiler.h> /* for __kprobes */
> +#include <linux/compiler.h>
> #include <linux/linkage.h>
> #include <linux/list.h>
> #include <linux/notifier.h>
> @@ -40,9 +40,9 @@
> #include <linux/rcupdate.h>
> #include <linux/mutex.h>
> #include <linux/ftrace.h>
> +#include <asm/kprobes.h>
>
> #ifdef CONFIG_KPROBES
> -#include <asm/kprobes.h>
>
> /* kprobe_status settings */
> #define KPROBE_HIT_ACTIVE 0x00000001
> @@ -51,6 +51,7 @@
> #define KPROBE_HIT_SSDONE 0x00000008
>
> #else /* CONFIG_KPROBES */
> +#include <asm-generic/kprobes.h>
> typedef int kprobe_opcode_t;
> struct arch_specific_insn {
> int dummy;
> @@ -481,18 +482,4 @@ static inline int enable_jprobe(struct jprobe *jp)
> return enable_kprobe(&jp->kp);
> }
>
> -#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)
> -#else
> -#define NOKPROBE_SYMBOL(fname)
> -#endif
> -
> #endif /* _LINUX_KPROBES_H */
> --
> 2.9.2
>
--
Masami Hiramatsu <mhiramat@kernel.org>
next prev parent reply other threads:[~2016-08-22 15:11 UTC|newest]
Thread overview: 141+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-19 21:32 [PATCH v4 00/16] linux: generalize sections, ranges and linker tables mcgrof
2016-08-19 21:32 ` [PATCH v4 01/16] x86: remove LTO_REFERENCE_INITCALL() mcgrof
2016-08-19 21:32 ` [PATCH v4 02/16] dell-smo8800: include uaccess.h mcgrof
2016-08-19 21:32 ` [PATCH v4 03/16] scripts/module-common.lds: enable generation mcgrof
2016-08-19 21:32 ` [PATCH v4 04/16] generic-sections: add section core helpers mcgrof
2016-08-19 21:32 ` [PATCH v4 05/16] xtensa: skip adding literal when SORT() is used mcgrof
2016-08-19 21:32 ` [PATCH v4 06/16] ranges.h: add helpers to build and identify Linux section ranges mcgrof
2016-08-19 21:32 ` [PATCH v4 07/16] tables.h: add linker table support mcgrof
2016-08-19 21:32 ` [PATCH v4 08/16] kbuild: enable option to force compile force-obj-y and force-lib-y mcgrof
2016-08-19 21:32 ` [PATCH v4 09/16] firmware/Makefile: force recompilation if makefile changes mcgrof
2016-08-19 21:32 ` [PATCH v4 10/16] firmware: port built-in section to linker table mcgrof
2016-08-19 21:33 ` [PATCH v4 00/16] linux: generalize sections, ranges and linker tables mcgrof
2016-08-19 21:33 ` [PATCH v4 01/16] x86: remove LTO_REFERENCE_INITCALL() mcgrof
2016-08-19 21:34 ` [PATCH v4 02/16] dell-smo8800: include uaccess.h mcgrof
2016-08-19 21:34 ` [PATCH v4 03/16] scripts/module-common.lds: enable generation mcgrof
2016-08-19 21:34 ` [PATCH v4 04/16] generic-sections: add section core helpers mcgrof
2016-08-23 1:26 ` Nicholas Piggin
2016-08-23 17:33 ` Luis R. Rodriguez
2016-08-24 3:51 ` Nicholas Piggin
2016-08-24 20:12 ` Luis R. Rodriguez
2016-08-25 2:06 ` Nicholas Piggin
2016-08-25 6:05 ` Luis R. Rodriguez
2016-08-25 6:51 ` Nicholas Piggin
2016-08-25 17:52 ` Luis R. Rodriguez
2016-08-26 3:00 ` Nicholas Piggin
[not found] ` <CAB=NE6UQ8qE6AqRg9=YddNYrMyU7opCEij-5Usty7wMgEJJbpw@mail.gmail.com>
2016-08-26 7:33 ` Nicholas Piggin
2016-08-26 13:22 ` Luis R. Rodriguez
2016-08-26 13:28 ` Nicholas Piggin
2016-08-19 21:34 ` [PATCH v4 05/16] xtensa: skip adding literal when SORT() is used mcgrof
2016-08-19 21:34 ` [PATCH v4 06/16] ranges.h: add helpers to build and identify Linux section ranges mcgrof
2016-08-19 21:34 ` [PATCH v4 07/16] tables.h: add linker table support mcgrof
2016-08-19 21:34 ` [PATCH v4 08/16] kbuild: enable option to force compile force-obj-y and force-lib-y mcgrof
2016-08-19 21:34 ` [PATCH v4 09/16] firmware/Makefile: force recompilation if makefile changes mcgrof
2016-08-19 21:34 ` [PATCH v4 10/16] firmware: port built-in section to linker table mcgrof
2016-08-19 21:34 ` [PATCH v4 11/16] jump_label: move guard #endif down where it belongs mcgrof
2016-08-19 21:34 ` [PATCH v4 12/16] jump_label: port __jump_table to linker tables mcgrof
2016-08-19 21:34 ` [PATCH v4 13/16] dynamic_debug: port to use " mcgrof
2016-08-19 21:34 ` [PATCH v4 14/16] kprobes: move kprobe declarations to asm-generic/kprobes.h mcgrof
2016-08-22 15:11 ` Masami Hiramatsu [this message]
2016-08-23 16:31 ` Luis R. Rodriguez
2016-08-29 14:04 ` Masami Hiramatsu
2016-08-30 20:07 ` Luis R. Rodriguez
2017-02-01 20:02 ` Luis R. Rodriguez
2016-08-19 21:34 ` [PATCH v4 15/16] kprobes: port .kprobes.text to section range mcgrof
2016-08-19 21:34 ` [PATCH v4 16/16] kprobes: port blacklist kprobes to linker table mcgrof
2016-08-19 21:41 ` [PATCH v1 0/7] tools: add linker table userspace sandbox mcgrof
2016-08-19 21:41 ` [PATCH v1 1/7] tools: add a userspace tools bug.h mcgrof
2016-08-19 21:41 ` [PATCH v1 2/7] tools: add a basic tools printk.h mcgrof
2016-08-19 21:41 ` [PATCH v1 3/7] tools: add init.h for tools mcgrof
2016-08-19 21:41 ` [PATCH v1 4/7] tools: add __used and enable to override mcgrof
2016-08-19 21:41 ` [PATCH v1 5/7] tools: expand export.h with VMLINUX_SYMBOL() mcgrof
2016-08-19 21:41 ` [PATCH v1 6/7] tools: add __section() to compiler.h mcgrof
2016-08-20 4:57 ` [PATCH v1 0/7] tools: add linker table userspace sandbox Rob Landley
2016-08-21 4:59 ` Rich Felker
2016-08-22 4:04 ` H. Peter Anvin
[not found] ` <1471642875-5957-8-git-send-email-mcgrof@kernel.org>
[not found] ` <CAGXu5jKX-VZR_r9wMsnLAU+Z10vB4yDiRPpvwXbRZj0=wU208A@mail.gmail.com>
[not found] ` <20160823000739.GX3296@wotan.suse.de>
2016-08-23 0:28 ` [PATCH v1 7/7] tools: add userspace linker table sandbox H. Peter Anvin
2016-12-22 2:39 ` [PATCH v2 0/6] tools: add linker table userspace sandbox Luis R. Rodriguez
2016-12-22 2:39 ` [PATCH v2 1/6] tools: add a userspace tools bug.h Luis R. Rodriguez
2016-12-22 2:39 ` [PATCH v2 2/6] tools: add init.h for tools Luis R. Rodriguez
2016-12-22 2:39 ` [PATCH v2 3/6] tools: add __used and enable to override Luis R. Rodriguez
2016-12-22 2:39 ` [PATCH v2 4/6] tools: expand export.h with VMLINUX_SYMBOL() Luis R. Rodriguez
2016-12-22 2:39 ` [PATCH v2 5/6] tools: add __section() to compiler.h Luis R. Rodriguez
2017-01-09 15:02 ` [PATCH v3 0/6] tools: add linker table userspace sandbox Luis R. Rodriguez
2017-01-09 15:02 ` [PATCH v3 1/6] tools: add a userspace tools bug.h Luis R. Rodriguez
2017-01-09 15:02 ` [PATCH v3 2/6] tools: add init.h for tools Luis R. Rodriguez
2017-01-09 15:02 ` [PATCH v3 3/6] tools: add __used and enable to override Luis R. Rodriguez
2017-01-09 15:02 ` [PATCH v3 4/6] tools: expand export.h with VMLINUX_SYMBOL() Luis R. Rodriguez
2017-01-09 15:02 ` [PATCH v3 5/6] tools: add __section() to compiler.h Luis R. Rodriguez
2017-01-15 21:12 ` [PATCH v4 0/6] tools: add linker table userspace sandbox Luis R. Rodriguez
2017-01-15 21:12 ` [PATCH v4 1/6] tools: add a userspace tools bug.h Luis R. Rodriguez
2017-01-19 11:01 ` Greg KH
2017-01-15 21:12 ` [PATCH v4 2/6] tools: add init.h for tools Luis R. Rodriguez
2017-01-19 11:02 ` Greg KH
2017-01-15 21:12 ` [PATCH v4 3/6] tools: add __used and enable to override Luis R. Rodriguez
2017-01-19 11:02 ` Greg KH
2017-01-15 21:12 ` [PATCH v4 4/6] tools: expand export.h with VMLINUX_SYMBOL() Luis R. Rodriguez
2017-01-19 11:03 ` Greg KH
2017-01-19 11:04 ` Greg KH
2017-01-15 21:12 ` [PATCH v4 5/6] tools: add __section() to compiler.h Luis R. Rodriguez
2017-01-19 11:04 ` Greg KH
2016-12-22 2:37 ` [PATCH v5 00/14] linux: generalize sections, ranges and linker tables Luis R. Rodriguez
2016-12-22 2:37 ` [PATCH v5 01/14] generic-sections: add section core helpers Luis R. Rodriguez
2016-12-22 2:37 ` [PATCH v5 02/14] xtensa: skip adding literal when SORT() is used Luis R. Rodriguez
2016-12-22 2:37 ` [PATCH v5 03/14] ranges.h: add helpers to build and identify Linux section ranges Luis R. Rodriguez
2016-12-22 2:38 ` [PATCH v5 04/14] tables.h: add linker table support Luis R. Rodriguez
2016-12-22 13:58 ` Andy Shevchenko
2017-01-03 21:25 ` Luis R. Rodriguez
2016-12-22 2:38 ` [PATCH v5 05/14] kbuild: enable option to force compile force-obj-y and force-lib-y Luis R. Rodriguez
2016-12-22 2:38 ` [PATCH v5 06/14] firmware/Makefile: force recompilation if makefile changes Luis R. Rodriguez
2016-12-22 2:38 ` [PATCH v5 07/14] firmware: port built-in section to linker table Luis R. Rodriguez
2016-12-22 2:38 ` [PATCH v5 08/14] jump_label: move guard #endif down where it belongs Luis R. Rodriguez
2016-12-22 2:38 ` [PATCH v5 09/14] jump_label: port __jump_table to linker tables Luis R. Rodriguez
2016-12-22 14:08 ` Andy Shevchenko
2017-01-03 21:27 ` Luis R. Rodriguez
2016-12-22 2:38 ` [PATCH v5 10/14] dynamic_debug: port to use " Luis R. Rodriguez
2016-12-22 2:38 ` [PATCH v5 11/14] kprobes: move kprobe declarations to asm-generic/kprobes.h Luis R. Rodriguez
2016-12-22 2:38 ` [PATCH v5 12/14] kprobes: port .kprobes.text to section range Luis R. Rodriguez
2016-12-22 2:38 ` [PATCH v5 13/14] kprobes: port blacklist kprobes to linker table Luis R. Rodriguez
2016-12-22 2:38 ` [PATCH v5 14/14] lib: add linker tables test driver Luis R. Rodriguez
2017-01-09 14:58 ` [PATCH v6 00/14] linux: generalize sections, ranges and linker tables Luis R. Rodriguez
2017-01-09 14:58 ` [PATCH v6 01/14] generic-sections: add section core helpers Luis R. Rodriguez
2017-01-16 14:46 ` Borislav Petkov
2017-01-09 14:58 ` [PATCH v6 02/14] xtensa: skip adding literal when SORT() is used Luis R. Rodriguez
2017-01-09 14:58 ` [PATCH v6 03/14] ranges.h: add helpers to build and identify Linux section ranges Luis R. Rodriguez
2017-01-09 14:58 ` [PATCH v6 04/14] tables.h: add linker table support Luis R. Rodriguez
2017-01-09 14:58 ` [PATCH v6 05/14] kbuild: enable option to force compile force-obj-y and force-lib-y Luis R. Rodriguez
2017-01-09 14:58 ` [PATCH v6 06/14] firmware/Makefile: force recompilation if makefile changes Luis R. Rodriguez
2017-01-09 14:58 ` [PATCH v6 07/14] firmware: port built-in section to linker table Luis R. Rodriguez
2017-01-09 14:58 ` [PATCH v6 08/14] jump_label: move guard #endif down where it belongs Luis R. Rodriguez
2017-01-09 14:58 ` [PATCH v6 09/14] jump_label: port __jump_table to linker tables Luis R. Rodriguez
2017-01-09 14:58 ` [PATCH v6 10/14] dynamic_debug: port to use " Luis R. Rodriguez
2017-01-09 14:58 ` [PATCH v6 11/14] kprobes: move kprobe declarations to asm-generic/kprobes.h Luis R. Rodriguez
2017-01-09 14:58 ` [PATCH v6 12/14] kprobes: port .kprobes.text to section range Luis R. Rodriguez
2017-01-09 14:58 ` [PATCH v6 13/14] kprobes: port blacklist kprobes to linker table Luis R. Rodriguez
2017-01-09 14:58 ` [PATCH v6 14/14] lib: add linker tables test driver Luis R. Rodriguez
2017-01-09 16:27 ` [PATCH v6 00/14] linux: generalize sections, ranges and linker tables Andy Shevchenko
[not found] ` <1483981946.26691.44.camel@intel.com>
2017-01-09 18:29 ` Andy Shevchenko
2017-01-11 14:37 ` Luis R. Rodriguez
2017-01-15 21:10 ` [PATCH v7 " Luis R. Rodriguez
2017-01-15 21:10 ` [PATCH v7 01/14] generic-sections: add section core helpers Luis R. Rodriguez
2017-01-19 11:09 ` Greg KH
2017-01-15 21:10 ` [PATCH v7 02/14] xtensa: skip adding literal when SORT() is used Luis R. Rodriguez
2017-01-18 11:29 ` Borislav Petkov
2017-01-15 21:10 ` [PATCH v7 03/14] ranges.h: add helpers to build and identify Linux section ranges Luis R. Rodriguez
2017-01-19 11:11 ` Greg KH
2017-01-15 21:10 ` [PATCH v7 04/14] tables.h: add linker table support Luis R. Rodriguez
2017-01-19 11:13 ` Greg KH
2017-01-15 21:10 ` [PATCH v7 05/14] kbuild: enable option to force compile force-obj-y and force-lib-y Luis R. Rodriguez
2017-01-19 11:18 ` Greg KH
2017-01-15 21:10 ` [PATCH v7 06/14] firmware/Makefile: force recompilation if makefile changes Luis R. Rodriguez
2017-01-19 11:19 ` Greg KH
2017-01-15 21:10 ` [PATCH v7 07/14] firmware: port built-in section to linker table Luis R. Rodriguez
2017-01-15 21:10 ` [PATCH v7 08/14] jump_label: move guard #endif down where it belongs Luis R. Rodriguez
2017-01-19 11:20 ` Greg KH
2017-01-15 21:10 ` [PATCH v7 09/14] jump_label: port __jump_table to linker tables Luis R. Rodriguez
2017-01-19 11:24 ` Greg KH
2017-01-15 21:10 ` [PATCH v7 10/14] dynamic_debug: port to use " Luis R. Rodriguez
2017-01-15 21:10 ` [PATCH v7 11/14] kprobes: move kprobe declarations to asm-generic/kprobes.h Luis R. Rodriguez
2017-01-15 21:10 ` [PATCH v7 12/14] kprobes: port .kprobes.text to section range Luis R. Rodriguez
2017-01-15 21:10 ` [PATCH v7 13/14] kprobes: port blacklist kprobes to linker table Luis R. Rodriguez
2017-01-15 21:10 ` [PATCH v7 14/14] lib: add linker tables test driver Luis R. Rodriguez
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=20160823001140.8f7293408d2094a14c7725a1@kernel.org \
--to=mhiramat@kernel.org \
--cc=James.Bottomley@HansenPartnership.com \
--cc=anil.s.keshavamurthy@intel.com \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=catalin.marinas@arm.com \
--cc=dvhart@infradead.org \
--cc=fontana@sharpeleven.org \
--cc=gnomes@lxorguk.ukuu.org.uk \
--cc=heiko.carstens@de.ibm.com \
--cc=hpa@zytor.com \
--cc=jkosina@suse.cz \
--cc=keescook@chromium.org \
--cc=korea.drzix@gmail.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=linux@arm.linux.org.uk \
--cc=markus.heiser@darmarit.de \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mcgrof@kernel.org \
--cc=mchehab@osg.samsung.com \
--cc=ming.lei@canonical.com \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=pali.rohar@gmail.com \
--cc=paul.gortmaker@windriver.com \
--cc=paulus@samba.org \
--cc=platform-driver-x86@vger.kernel.org \
--cc=realmz6@gma \
--cc=sparclinux@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=will.deacon@arm.com \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).