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>,
Steven Rostedt <srostedt@redhat.com>
Subject: [PATCH 05/23 -v8] add notrace annotations to vsyscall.
Date: Wed, 30 Jan 2008 16:04:02 -0500 [thread overview]
Message-ID: <20080130210525.547283853@goodmis.org> (raw)
In-Reply-To: 20080130210357.927754294@goodmis.org
[-- Attachment #1: mcount-add-x86-vdso-notrace-annotations.patch --]
[-- Type: text/plain, Size: 4566 bytes --]
Add the notrace annotations to some of the vsyscall functions.
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
---
arch/x86/kernel/vsyscall_64.c | 3 ++-
arch/x86/vdso/vclock_gettime.c | 15 ++++++++-------
arch/x86/vdso/vgetcpu.c | 3 ++-
include/asm-x86/vsyscall.h | 3 ++-
4 files changed, 14 insertions(+), 10 deletions(-)
Index: linux-mcount.git/arch/x86/kernel/vsyscall_64.c
===================================================================
--- linux-mcount.git.orig/arch/x86/kernel/vsyscall_64.c 2008-01-30 14:35:51.000000000 -0500
+++ linux-mcount.git/arch/x86/kernel/vsyscall_64.c 2008-01-30 14:47:08.000000000 -0500
@@ -42,7 +42,8 @@
#include <asm/topology.h>
#include <asm/vgtod.h>
-#define __vsyscall(nr) __attribute__ ((unused,__section__(".vsyscall_" #nr)))
+#define __vsyscall(nr) \
+ __attribute__ ((unused, __section__(".vsyscall_" #nr))) notrace
#define __syscall_clobber "r11","rcx","memory"
#define __pa_vsymbol(x) \
({unsigned long v; \
Index: linux-mcount.git/arch/x86/vdso/vclock_gettime.c
===================================================================
--- linux-mcount.git.orig/arch/x86/vdso/vclock_gettime.c 2008-01-30 14:35:51.000000000 -0500
+++ linux-mcount.git/arch/x86/vdso/vclock_gettime.c 2008-01-30 14:47:08.000000000 -0500
@@ -24,7 +24,7 @@
#define gtod vdso_vsyscall_gtod_data
-static long vdso_fallback_gettime(long clock, struct timespec *ts)
+notrace static long vdso_fallback_gettime(long clock, struct timespec *ts)
{
long ret;
asm("syscall" : "=a" (ret) :
@@ -32,7 +32,7 @@ static long vdso_fallback_gettime(long c
return ret;
}
-static inline long vgetns(void)
+notrace static inline long vgetns(void)
{
long v;
cycles_t (*vread)(void);
@@ -41,7 +41,7 @@ static inline long vgetns(void)
return (v * gtod->clock.mult) >> gtod->clock.shift;
}
-static noinline int do_realtime(struct timespec *ts)
+notrace static noinline int do_realtime(struct timespec *ts)
{
unsigned long seq, ns;
do {
@@ -55,7 +55,8 @@ static noinline int do_realtime(struct t
}
/* Copy of the version in kernel/time.c which we cannot directly access */
-static void vset_normalized_timespec(struct timespec *ts, long sec, long nsec)
+notrace static void
+vset_normalized_timespec(struct timespec *ts, long sec, long nsec)
{
while (nsec >= NSEC_PER_SEC) {
nsec -= NSEC_PER_SEC;
@@ -69,7 +70,7 @@ static void vset_normalized_timespec(str
ts->tv_nsec = nsec;
}
-static noinline int do_monotonic(struct timespec *ts)
+notrace static noinline int do_monotonic(struct timespec *ts)
{
unsigned long seq, ns, secs;
do {
@@ -83,7 +84,7 @@ static noinline int do_monotonic(struct
return 0;
}
-int __vdso_clock_gettime(clockid_t clock, struct timespec *ts)
+notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts)
{
if (likely(gtod->sysctl_enabled && gtod->clock.vread))
switch (clock) {
@@ -97,7 +98,7 @@ int __vdso_clock_gettime(clockid_t clock
int clock_gettime(clockid_t, struct timespec *)
__attribute__((weak, alias("__vdso_clock_gettime")));
-int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz)
+notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz)
{
long ret;
if (likely(gtod->sysctl_enabled && gtod->clock.vread)) {
Index: linux-mcount.git/arch/x86/vdso/vgetcpu.c
===================================================================
--- linux-mcount.git.orig/arch/x86/vdso/vgetcpu.c 2008-01-30 14:35:51.000000000 -0500
+++ linux-mcount.git/arch/x86/vdso/vgetcpu.c 2008-01-30 14:47:08.000000000 -0500
@@ -13,7 +13,8 @@
#include <asm/vgtod.h>
#include "vextern.h"
-long __vdso_getcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *unused)
+notrace long
+__vdso_getcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *unused)
{
unsigned int dummy, p;
Index: linux-mcount.git/include/asm-x86/vsyscall.h
===================================================================
--- linux-mcount.git.orig/include/asm-x86/vsyscall.h 2008-01-30 14:35:51.000000000 -0500
+++ linux-mcount.git/include/asm-x86/vsyscall.h 2008-01-30 14:47:08.000000000 -0500
@@ -24,7 +24,8 @@ enum vsyscall_num {
((unused, __section__ (".vsyscall_gtod_data"),aligned(16)))
#define __section_vsyscall_clock __attribute__ \
((unused, __section__ (".vsyscall_clock"),aligned(16)))
-#define __vsyscall_fn __attribute__ ((unused,__section__(".vsyscall_fn")))
+#define __vsyscall_fn \
+ __attribute__ ((unused, __section__(".vsyscall_fn"))) notrace
#define VGETCPU_RDTSCP 1
#define VGETCPU_LSL 2
--
next prev parent reply other threads:[~2008-01-30 21:10 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-30 21:03 [PATCH 00/23 -v8] mcount and latency tracing utility -v8 Steven Rostedt
2008-01-30 21:03 ` [PATCH 01/23 -v8] printk - dont wakeup klogd with interrupts disabled Steven Rostedt
2008-01-30 21:03 ` [PATCH 02/23 -v8] Add basic support for gcc profiler instrumentation Steven Rostedt
2008-01-30 21:04 ` [PATCH 03/23 -v8] Annotate core code that should not be traced Steven Rostedt
2008-01-30 21:04 ` [PATCH 04/23 -v8] x86_64: notrace annotations Steven Rostedt
2008-01-30 21:04 ` Steven Rostedt [this message]
2008-01-30 21:04 ` [PATCH 06/23 -v8] handle accurate time keeping over long delays Steven Rostedt
2008-01-31 12:10 ` Mathieu Desnoyers
2008-01-31 17:24 ` John Stultz
2008-02-01 17:02 ` Mathieu Desnoyers
2008-02-02 7:11 ` Steven Rostedt
2008-02-02 16:30 ` Mathieu Desnoyers
2008-01-30 21:04 ` [PATCH 07/23 -v8] initialize the clock source to jiffies clock Steven Rostedt
2008-01-30 21:04 ` [PATCH 08/23 -v8] add get_monotonic_cycles Steven Rostedt
2008-01-30 21:04 ` [PATCH 09/23 -v8] add notrace annotations to timing events Steven Rostedt
2008-01-30 21:04 ` [PATCH 10/23 -v8] mcount tracer add preempt_enable/disable notrace macros Steven Rostedt
2008-01-30 21:04 ` [PATCH 11/23 -v8] mcount based trace in the form of a header file library Steven Rostedt
2008-01-30 21:04 ` [PATCH 12/23 -v8] Add context switch marker to sched.c Steven Rostedt
2008-01-30 21:04 ` [PATCH 13/23 -v8] Make the task State char-string visible to all Steven Rostedt
2008-01-30 21:04 ` [PATCH 14/23 -v8] Add tracing of context switches Steven Rostedt
2008-02-05 17:04 ` Tim Bird
2008-01-30 21:04 ` [PATCH 15/23 -v8] Generic command line storage Steven Rostedt
2008-01-30 21:04 ` [PATCH 16/23 -v8] trace generic call to schedule switch Steven Rostedt
2008-01-30 21:04 ` [PATCH 17/23 -v8] Add marker in try_to_wake_up Steven Rostedt
2008-01-30 21:04 ` [PATCH 18/23 -v8] mcount tracer for wakeup latency timings Steven Rostedt
2008-01-30 21:04 ` [PATCH 19/23 -v8] Trace irq disabled critical timings Steven Rostedt
2008-01-30 21:04 ` [PATCH 20/23 -v8] trace preempt off " Steven Rostedt
2008-01-30 21:04 ` [PATCH 21/23 -v8] Add markers to various events Steven Rostedt
2008-01-31 12:06 ` Mathieu Desnoyers
2008-02-02 7:00 ` Steven Rostedt
2008-02-02 14:14 ` Mathieu Desnoyers
2008-01-30 21:04 ` [PATCH 22/23 -v8] Add event tracer Steven Rostedt
2008-01-30 21:04 ` [PATCH 23/23 -v8] Critical latency timings histogram Steven Rostedt
2008-02-05 17:11 ` [PATCH 00/23 -v8] mcount and latency tracing utility -v8 Tim Bird
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=20080130210525.547283853@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=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