From: Steven Rostedt <rostedt@goodmis.org>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>,
Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Christoph Hellwig <hch@infradead.org>,
Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>,
Gregory Haskins <ghaskins@novell.com>,
Arnaldo Carvalho de Melo <acme@ghostprotocols.net>,
Thomas Gleixner <tglx@linutronix.de>,
Tim Bird <tim.bird@am.sony.com>, Sam Ravnborg <sam@ravnborg.org>,
"Frank Ch. Eigler" <fche@redhat.com>,
Jan Kiszka <jan.kiszka@siemens.com>,
John Stultz <johnstul@us.ibm.com>,
Arjan van de Ven <arjan@infradead.org>,
Pavel Machek <pavel@ucw.cz>, Steven Rostedt <srostedt@redhat.com>
Subject: [PATCH 06/23 -v6] add notrace annotations for NMI routines
Date: Fri, 25 Jan 2008 23:21:58 -0500 [thread overview]
Message-ID: <20080126042802.072086932@goodmis.org> (raw)
In-Reply-To: 20080126042152.526086719@goodmis.org
[-- Attachment #1: mcount-nmi-notrace-annotations.patch --]
[-- Type: text/plain, Size: 2466 bytes --]
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.
Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: Steven Rostedt <srostedt@redhat.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-25 21:46:50.000000000 -0500
+++ linux-mcount.git/arch/x86/kernel/nmi_32.c 2008-01-25 21:47:08.000000000 -0500
@@ -318,7 +318,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-25 21:46:50.000000000 -0500
+++ linux-mcount.git/arch/x86/kernel/nmi_64.c 2008-01-25 21:47:08.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-25 21:46:50.000000000 -0500
+++ linux-mcount.git/arch/x86/kernel/traps_32.c 2008-01-25 21:47:08.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;
--
next prev parent reply other threads:[~2008-01-26 4:33 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-26 4:21 [PATCH 00/23 -v6] mcount and latency tracing utility -v6 Steven Rostedt
2008-01-26 4:21 ` [PATCH 01/23 -v6] printk - dont wakeup klogd with interrupts disabled Steven Rostedt
2008-01-26 9:10 ` Pavel Machek
2008-01-26 9:52 ` Peter Zijlstra
2008-01-26 13:07 ` Steven Rostedt
2008-01-26 13:48 ` Steven Rostedt
2008-01-26 9:50 ` Peter Zijlstra
2008-01-26 13:03 ` Steven Rostedt
2008-01-26 4:21 ` [PATCH 02/23 -v6] Add basic support for gcc profiler instrumentation Steven Rostedt
2008-01-26 4:21 ` [PATCH 03/23 -v6] Annotate core code that should not be traced Steven Rostedt
2008-01-26 4:21 ` [PATCH 04/23 -v6] x86_64: notrace annotations Steven Rostedt
2008-01-26 4:21 ` [PATCH 05/23 -v6] add notrace annotations to vsyscall Steven Rostedt
2008-01-26 4:21 ` Steven Rostedt [this message]
2008-01-26 4:21 ` [PATCH 07/23 -v6] handle accurate time keeping over long delays Steven Rostedt
2008-01-26 4:22 ` [PATCH 08/23 -v6] initialize the clock source to jiffies clock Steven Rostedt
2008-01-26 4:22 ` [PATCH 09/23 -v6] add get_monotonic_cycles Steven Rostedt
2008-01-26 4:22 ` [PATCH 10/23 -v6] add notrace annotations to timing events Steven Rostedt
2008-01-26 4:22 ` [PATCH 11/23 -v6] mcount based trace in the form of a header file library Steven Rostedt
2008-01-26 4:22 ` [PATCH 12/23 -v6] Add context switch marker to sched.c Steven Rostedt
2008-01-26 4:22 ` [PATCH 13/23 -v6] Make the task State char-string visible to all Steven Rostedt
2008-01-26 4:22 ` [PATCH 14/23 -v6] Add tracing of context switches Steven Rostedt
2008-01-26 4:22 ` [PATCH 15/23 -v6] Generic command line storage Steven Rostedt
2008-01-26 4:22 ` [PATCH 16/23 -v6] trace generic call to schedule switch Steven Rostedt
2008-01-26 4:22 ` [PATCH 17/23 -v6] Add marker in try_to_wake_up Steven Rostedt
2008-01-26 4:22 ` [PATCH 18/23 -v6] mcount tracer for wakeup latency timings Steven Rostedt
2008-01-26 4:22 ` [PATCH 19/23 -v6] Trace irq disabled critical timings Steven Rostedt
2008-01-26 4:22 ` [PATCH 20/23 -v6] trace preempt off " Steven Rostedt
2008-01-26 4:22 ` [PATCH 21/23 -v6] Add markers to various events Steven Rostedt
2008-01-26 4:22 ` [PATCH 22/23 -v6] Add event tracer Steven Rostedt
2008-01-26 4:22 ` [PATCH 23/23 -v6] Critical latency timings histogram Steven Rostedt
2008-01-26 9:11 ` Pavel Machek
2008-01-26 13:00 ` Steven Rostedt
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=20080126042802.072086932@goodmis.org \
--to=rostedt@goodmis.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=akpm@linux-foundation.org \
--cc=arjan@infradead.org \
--cc=fche@redhat.com \
--cc=ghaskins@novell.com \
--cc=hch@infradead.org \
--cc=jan.kiszka@siemens.com \
--cc=johnstul@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@polymtl.ca \
--cc=mingo@elte.hu \
--cc=pavel@ucw.cz \
--cc=sam@ravnborg.org \
--cc=srostedt@redhat.com \
--cc=tglx@linutronix.de \
--cc=tim.bird@am.sony.com \
--cc=torvalds@linux-foundation.org \
/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