Commit 9326638c authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Ingo Molnar
Browse files

kprobes, x86: Use NOKPROBE_SYMBOL() instead of __kprobes annotation 



Use NOKPROBE_SYMBOL macro for protecting functions
from kprobes instead of __kprobes annotation under
arch/x86.

This applies nokprobe_inline annotation for some cases,
because NOKPROBE_SYMBOL() will inhibit inlining by
referring the symbol address.

This just folds a bunch of previous NOKPROBE_SYMBOL()
cleanup patches for x86 to one patch.

Signed-off-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Link: http://lkml.kernel.org/r/20140417081814.26341.51656.stgit@ltc230.yrl.intra.hitachi.co.jp


Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Borislav Petkov <bp@suse.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Fernando Luis Vázquez Cao <fernando_b1@lab.ntt.co.jp>
Cc: Gleb Natapov <gleb@redhat.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Jonathan Lebon <jlebon@redhat.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Matt Fleming <matt.fleming@intel.com>
Cc: Michel Lespinasse <walken@google.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Seiji Aguchi <seiji.aguchi@hds.com>
Cc: Srivatsa Vaddagiri <vatsa@linux.vnet.ibm.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Vineet Gupta <vgupta@synopsys.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 9c54b616

arch/x86/include/asm/traps.h

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ dotraplinkage void do_segment_not_present(struct pt_regs *, long); 
dotraplinkage void do_stack_segment(struct pt_regs *, long);

#ifdef CONFIG_X86_64

dotraplinkage void do_double_fault(struct pt_regs *, long);

asmlinkage __kprobes struct pt_regs *sync_regs(struct pt_regs *);

asmlinkage struct pt_regs *sync_regs(struct pt_regs *);

#endif

dotraplinkage void do_general_protection(struct pt_regs *, long);

dotraplinkage void do_page_fault(struct pt_regs *, unsigned long);

arch/x86/kernel/apic/hw_nmi.c

+2 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ void arch_trigger_all_cpu_backtrace(void) 
	smp_mb__after_clear_bit();

}



static int __kprobes

static int

arch_trigger_all_cpu_backtrace_handler(unsigned int cmd, struct pt_regs *regs)

{

	int cpu;
@@ -80,6 +80,7 @@ arch_trigger_all_cpu_backtrace_handler(unsigned int cmd, struct pt_regs *regs) 


	return NMI_DONE;

}

NOKPROBE_SYMBOL(arch_trigger_all_cpu_backtrace_handler);



static int __init register_trigger_all_cpu_backtrace(void)

{

arch/x86/kernel/cpu/perf_event.c

+2 −1
Original line number Diff line number Diff line
@@ -1292,7 +1292,7 @@ void perf_events_lapic_init(void) 
	apic_write(APIC_LVTPC, APIC_DM_NMI);

}



static int __kprobes

static int

perf_event_nmi_handler(unsigned int cmd, struct pt_regs *regs)

{

	u64 start_clock;
@@ -1310,6 +1310,7 @@ perf_event_nmi_handler(unsigned int cmd, struct pt_regs *regs) 


	return ret;

}

NOKPROBE_SYMBOL(perf_event_nmi_handler);



struct event_constraint emptyconstraint;

struct event_constraint unconstrained;

arch/x86/kernel/cpu/perf_event_amd_ibs.c

+2 −1
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ out: 
	return 1;

}



static int __kprobes

static int

perf_ibs_nmi_handler(unsigned int cmd, struct pt_regs *regs)

{

	int handled = 0;
@@ -606,6 +606,7 @@ perf_ibs_nmi_handler(unsigned int cmd, struct pt_regs *regs) 


	return handled;

}

NOKPROBE_SYMBOL(perf_ibs_nmi_handler);



static __init int perf_ibs_pmu_init(struct perf_ibs *perf_ibs, char *name)

{

arch/x86/kernel/dumpstack.c

+6 −3
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED; 
static int die_owner = -1;

static unsigned int die_nest_count;



unsigned __kprobes long oops_begin(void)

unsigned long oops_begin(void)

{

	int cpu;

	unsigned long flags;
@@ -223,8 +223,9 @@ unsigned __kprobes long oops_begin(void) 
	return flags;

}

EXPORT_SYMBOL_GPL(oops_begin);

NOKPROBE_SYMBOL(oops_begin);



void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)

void oops_end(unsigned long flags, struct pt_regs *regs, int signr)

{

	if (regs && kexec_should_crash(current))

		crash_kexec(regs);
@@ -247,8 +248,9 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr) 
		panic("Fatal exception");

	do_exit(signr);

}

NOKPROBE_SYMBOL(oops_end);



int __kprobes __die(const char *str, struct pt_regs *regs, long err)

int __die(const char *str, struct pt_regs *regs, long err)

{

#ifdef CONFIG_X86_32

	unsigned short ss;
@@ -291,6 +293,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err) 
#endif

	return 0;

}

NOKPROBE_SYMBOL(__die);



/*

 * This is gone through when something in the kernel has done something bad

CRA Git | Maintained and supported by SUSTech CRA and CCSE