ftrace: add notrace annotations for NMI routines
PATCH 9/19 ftrace: add notrace annotations for NMI routines
From: Steven Rostedt <[email protected]>
This annotates NMI functions with notrace. Some tracers may be able to live with this, but some cannot. The safest is to turn it off, it's not particularly interesting anyway.
Signed-off-by Steven Rostedt <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/kernel/nmi_32.c | 3 ++- arch/x86/kernel/nmi_64.c | 6 ++++-- arch/x86/kernel/traps_32.c | 12 ++++++------ arch/x86/kernel/traps_64.c | 11 ++++++----- 4 files changed, 18 insertions(+), 14 deletions(-)
arch/x86/kernel/nmi_32.c +2 -1
@@ -320,7 +320,8 @@ EXPORT_SYMBOL(touch_nmi_watchdog);extern void die_nmi (struct pt_regs *,const char *msg); -__kprobes int nmi_watchdog_tick (struct pt_regs * regs,unsigned reason) +notrace __kprobes int +nmi_watchdog_tick (struct pt_regs *regs,unsigned reason) {/*
arch/x86/kernel/nmi_64.c +4 -2
@@ -314,7 +314,8 @@ void touch_nmi_watchdog(void) }EXPORT_SYMBOL (touch_nmi_watchdog); -int __kprobes nmi_watchdog_tick (struct pt_regs * regs,unsigned reason) +notrace __kprobes int +nmi_watchdog_tick (struct pt_regs *regs,unsigned reason) {int sum;int touched =0 ;
@@ -385,7 +386,8 @@ int __kprobes nmi_watchdog_tick(struct pstatic unsigned ignore_nmis; -asmlinkage __kprobes void do_nmi(struct pt_regs * regs, long error_code) +asmlinkage notrace __kprobes void +do_nmi (struct pt_regs *regs,long error_code) {nmi_enter ();add_pda (__nmi_count,1 );
arch/x86/kernel/traps_32.c +6 -6
@@ -665,7 +665,7 @@ gp_in_kernel: } } -static __kprobes void +static notrace __kprobes voidmem_parity_error (unsigned char reason,struct pt_regs * regs) { printk(KERN_EMERG "Uhhuh. NMI received for unknown reason %02x on "
@@ -688,7 +688,7 @@ mem_parity_error(unsigned char reason, sclear_mem_error (reason); } -static __kprobes void +static notrace __kprobes voidio_check_error (unsigned char reason,struct pt_regs * regs) {unsigned long i;
@@ -705,7 +705,7 @@ io_check_error(unsigned char reason, stroutb (reason,0x61 ); } -static __kprobes void +static notrace __kprobes voidunknown_nmi_error (unsigned char reason,struct pt_regs * regs) {#ifdef CONFIG_MCA
@@ -727,7 +727,7 @@ unknown_nmi_error(unsigned char reason,static DEFINE_SPINLOCK (nmi_print_lock); -void __kprobes die_nmi (struct pt_regs *regs,const char *msg) +void notrace __kprobes die_nmi(struct pt_regs *regs, const char *msg) {if (notify_die (DIE_NMIWATCHDOG , msg, regs,0 ,2 ,SIGINT ) ==NOTIFY_STOP )
@@ -758,7 +758,7 @@ void __kprobes die_nmi(struct pt_regs *rdo_exit (SIGSEGV ); } -static __kprobes void default_do_nmi (struct pt_regs * regs) +static notrace __kprobes void default_do_nmi(struct pt_regs *regs) {unsigned char reason =0 ;
@@ -798,7 +798,7 @@ static __kprobes void default_do_nmi(strstatic int ignore_nmis; -__kprobes void do_nmi (struct pt_regs * regs,long error_code) +notrace __kprobes void do_nmi(struct pt_regs *regs, long error_code) {int cpu;
arch/x86/kernel/traps_64.c +6 -5
@@ -598,7 +598,8 @@ void die(const char * str, struct pt_regoops_end (flags, regs,SIGSEGV ); } -void __kprobes die_nmi (char *str,struct pt_regs *regs,int do_panic) +notrace __kprobes void +die_nmi (char *str,struct pt_regs *regs,int do_panic) {unsigned long flags =oops_begin ();
@@ -765,7 +766,7 @@ asmlinkage void __kprobes do_general_prodie ("general protection fault" , regs, error_code); } -static __kprobes void +static notrace __kprobes voidmem_parity_error (unsigned char reason,struct pt_regs * regs) { printk(KERN_EMERG "Uhhuh. NMI received for unknown reason %02x.\n",
@@ -789,7 +790,7 @@ mem_parity_error(unsigned char reason, soutb (reason,0x61 ); } -static __kprobes void +static notrace __kprobes voidio_check_error (unsigned char reason,struct pt_regs * regs) {printk ("NMI: IOCK error (debug interrupt?)\n" );
@@ -803,7 +804,7 @@ io_check_error(unsigned char reason, stroutb (reason,0x61 ); } -static __kprobes void +static notrace __kprobes voidunknown_nmi_error (unsigned char reason,struct pt_regs * regs) { printk(KERN_EMERG "Uhhuh. NMI received for unknown reason %02x.\n",
@@ -818,7 +819,7 @@ unknown_nmi_error(unsigned char reason,/* Runs on IST stack. This code must keep interrupts off all the time. Nested NMIs are prevented by the CPU. */ -asmlinkage __kprobes void default_do_nmi(struct pt_regs *regs) +asmlinkage notrace __kprobes void default_do_nmi(struct pt_regs *regs) {unsigned char reason =0 ;int cpu;