[PATCH v3 3/4] kprobes: move x86-specific blacklist symbols to arch directory
From: Björn Davidsson The common kprobes blacklist contains x86-specific symbols. Looking for these in kallsyms takes unnecessary time during startup on non-X86 platform. The symbols where moved to arch/x86/kernel/kprobes/core.c. Cc: Masami Hiramatsu Cc: David S. Miller Cc: linux-a...@vger.kernel.org Reviewed-by: Radovan Lekanovic Signed-off-by: Björn Davidsson Signed-off-by: Oskar Andero Acked-by: Masami Hiramatsu --- arch/x86/kernel/kprobes/core.c | 7 +++ kernel/kprobes.c | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c index 7bfe318..41ce6c1 100644 --- a/arch/x86/kernel/kprobes/core.c +++ b/arch/x86/kernel/kprobes/core.c @@ -65,6 +65,13 @@ void jprobe_return_end(void); DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL; DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk); +const char * const arch_kprobes_blacksyms[] = { + "native_get_debugreg", + "irq_entries_start", + "common_interrupt", +}; +const size_t arch_kprobes_blacksyms_size = ARRAY_SIZE(arch_kprobes_blacksyms); + #define stack_addr(regs) ((unsigned long *)kernel_stack_pointer(regs)) #define W(row, b0, b1, b2, b3, b4, b5, b6, b7, b8, b9, ba, bb, bc, bd, be, bf)\ diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 2458ae1..b289384 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -95,9 +95,6 @@ static raw_spinlock_t *kretprobe_table_lock_ptr(unsigned long hash) */ static const char * const common_kprobes_blacksyms[] = { "preempt_schedule", - "native_get_debugreg", - "irq_entries_start", - "common_interrupt", "mcount", /* mcount can be called from everywhere */ }; static const size_t common_kprobes_blacksyms_size = -- 1.8.1.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v3 3/4] kprobes: move x86-specific blacklist symbols to arch directory
From: Björn Davidsson bjorn.davids...@sonymobile.com The common kprobes blacklist contains x86-specific symbols. Looking for these in kallsyms takes unnecessary time during startup on non-X86 platform. The symbols where moved to arch/x86/kernel/kprobes/core.c. Cc: Masami Hiramatsu masami.hiramatsu...@hitachi.com Cc: David S. Miller da...@davemloft.net Cc: linux-a...@vger.kernel.org Reviewed-by: Radovan Lekanovic radovan.lekano...@sonymobile.com Signed-off-by: Björn Davidsson bjorn.davids...@sonymobile.com Signed-off-by: Oskar Andero oskar.and...@sonymobile.com Acked-by: Masami Hiramatsu masami.hiramatsu...@hitachi.com --- arch/x86/kernel/kprobes/core.c | 7 +++ kernel/kprobes.c | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c index 7bfe318..41ce6c1 100644 --- a/arch/x86/kernel/kprobes/core.c +++ b/arch/x86/kernel/kprobes/core.c @@ -65,6 +65,13 @@ void jprobe_return_end(void); DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL; DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk); +const char * const arch_kprobes_blacksyms[] = { + native_get_debugreg, + irq_entries_start, + common_interrupt, +}; +const size_t arch_kprobes_blacksyms_size = ARRAY_SIZE(arch_kprobes_blacksyms); + #define stack_addr(regs) ((unsigned long *)kernel_stack_pointer(regs)) #define W(row, b0, b1, b2, b3, b4, b5, b6, b7, b8, b9, ba, bb, bc, bd, be, bf)\ diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 2458ae1..b289384 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -95,9 +95,6 @@ static raw_spinlock_t *kretprobe_table_lock_ptr(unsigned long hash) */ static const char * const common_kprobes_blacksyms[] = { preempt_schedule, - native_get_debugreg, - irq_entries_start, - common_interrupt, mcount, /* mcount can be called from everywhere */ }; static const size_t common_kprobes_blacksyms_size = -- 1.8.1.5 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/