linux-kernel - Re: [PATCH 06/20 -v5] add notrace annotations for NMI routines

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 23 Jan 2008 16:31:39 -0500
From:	Mathieu Desnoyers <mathieu.desnoyers@...ymtl.ca>
To:	Steven Rostedt <rostedt@...dmis.org>
Cc:	LKML <linux-kernel@...r.kernel.org>, Ingo Molnar <mingo@...e.hu>,
	Linus Torvalds <torvalds@...ux-foundation.org>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Peter Zijlstra <a.p.zijlstra@...llo.nl>,
	Christoph Hellwig <hch@...radead.org>,
	Gregory Haskins <ghaskins@...ell.com>,
	Arnaldo Carvalho de Melo <acme@...stprotocols.net>,
	Thomas Gleixner <tglx@...utronix.de>,
	Tim Bird <tim.bird@...sony.com>,
	Sam Ravnborg <sam@...nborg.org>,
	"Frank Ch. Eigler" <fche@...hat.com>,
	Jan Kiszka <jan.kiszka@...mens.com>,
	John Stultz <johnstul@...ibm.com>,
	Arjan van de Ven <arjan@...radead.org>,
	Steven Rostedt <srostedt@...hat.com>
Subject: Re: [PATCH 06/20 -v5] add notrace annotations for NMI routines

* Steven Rostedt (rostedt@...dmis.org) wrote:
> This annotates NMI functions with notrace. Some tracers may be able
> to live with this, but some cannot. So we turn off NMI tracing.
> 
> One solution might be to make a notrace_nmi which would only turn
> off NMI tracing if a trace utility needed it off.
> 
Is this still needed with the atomic clocksource read ?

> Signed-off-by: Arnaldo Carvalho de Melo <acme@...stprotocols.net>
> Signed-off-by: Steven Rostedt <srostedt@...hat.com>
> 
> ---
>  arch/x86/kernel/nmi_32.c   |    2 +-
>  arch/x86/kernel/nmi_64.c   |    2 +-
>  arch/x86/kernel/traps_32.c |    4 ++--
>  3 files changed, 4 insertions(+), 4 deletions(-)
> 
> Index: linux-mcount.git/arch/x86/kernel/nmi_32.c
> ===================================================================
> --- linux-mcount.git.orig/arch/x86/kernel/nmi_32.c	2008-01-23 10:26:11.000000000 -0500
> +++ linux-mcount.git/arch/x86/kernel/nmi_32.c	2008-01-23 10:26:53.000000000 -0500
> @@ -323,7 +323,7 @@ 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)
>  {
>  
>  	/*
> Index: linux-mcount.git/arch/x86/kernel/nmi_64.c
> ===================================================================
> --- linux-mcount.git.orig/arch/x86/kernel/nmi_64.c	2008-01-23 10:26:11.000000000 -0500
> +++ linux-mcount.git/arch/x86/kernel/nmi_64.c	2008-01-23 10:26:53.000000000 -0500
> @@ -314,7 +314,7 @@ void touch_nmi_watchdog(void)
>   	touch_softlockup_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;
> Index: linux-mcount.git/arch/x86/kernel/traps_32.c
> ===================================================================
> --- linux-mcount.git.orig/arch/x86/kernel/traps_32.c	2008-01-23 10:26:11.000000000 -0500
> +++ linux-mcount.git/arch/x86/kernel/traps_32.c	2008-01-23 10:26:53.000000000 -0500
> @@ -723,7 +723,7 @@ void __kprobes die_nmi(struct pt_regs *r
>  	do_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;
>  
> @@ -763,7 +763,7 @@ static __kprobes void default_do_nmi(str
>  
>  static int ignore_nmis;
>  
> -fastcall __kprobes void do_nmi(struct pt_regs * regs, long error_code)
> +notrace fastcall __kprobes void do_nmi(struct pt_regs *regs, long error_code)
>  {
>  	int cpu;
>  
> 
> -- 

-- 
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/