* [PATCH 0/2] [GIT PULL][v2.6.36] tracing: fixes for tracing virt guests
@ 2010-09-23 3:03 Steven Rostedt
2010-09-23 3:04 ` [PATCH 1/2] tracing/x86: Dont use mcount in pvclock.c Steven Rostedt
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Steven Rostedt @ 2010-09-23 3:03 UTC (permalink / raw)
To: linux-kernel; +Cc: Ingo Molnar, Andrew Morton, Frederic Weisbecker
Ingo,
I actually did these fixes back in July for RHEL, but forgot about
them for mainline :-(
Jeremy hit the same bug and set me a fix. It was only part of what
I did in July, so I pulled in his fix and added the second part.
Please pull the latest tip/perf/urgent tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/perf/urgent
Jeremy Fitzhardinge (1):
tracing/x86: Don't use mcount in pvclock.c
Steven Rostedt (1):
tracing/x86: Don't use mcount in kvmclock.c
----
arch/x86/kernel/Makefile | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] tracing/x86: Dont use mcount in pvclock.c
2010-09-23 3:03 [PATCH 0/2] [GIT PULL][v2.6.36] tracing: fixes for tracing virt guests Steven Rostedt
@ 2010-09-23 3:04 ` Steven Rostedt
2010-09-23 3:04 ` [PATCH 2/2] tracing/x86: Dont use mcount in kvmclock.c Steven Rostedt
2010-09-23 6:48 ` [PATCH 0/2] [GIT PULL][v2.6.36] tracing: fixes for tracing virt guests Ingo Molnar
2 siblings, 0 replies; 4+ messages in thread
From: Steven Rostedt @ 2010-09-23 3:04 UTC (permalink / raw)
To: linux-kernel
Cc: Ingo Molnar, Andrew Morton, Frederic Weisbecker, stable,
Jeremy Fitzhardinge
[-- Attachment #1: 0001-tracing-x86-Don-t-use-mcount-in-pvclock.c.patch --]
[-- Type: text/plain, Size: 944 bytes --]
From: Jeremy Fitzhardinge <jeremy@goop.org>
When using a paravirt clock, pvclock.c can be used by sched_clock(),
which in turn is used by the tracing mechanism for timestamps,
which leads to infinite recursion.
Disable mcount/tracing for pvclock.o.
Cc: stable@kernel.org
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
LKML-Reference: <4C9A9A3F.4040201@goop.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/x86/kernel/Makefile | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 0925676..882bbff 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -11,6 +11,7 @@ ifdef CONFIG_FUNCTION_TRACER
CFLAGS_REMOVE_tsc.o = -pg
CFLAGS_REMOVE_rtc.o = -pg
CFLAGS_REMOVE_paravirt-spinlocks.o = -pg
+CFLAGS_REMOVE_pvclock.o = -pg
CFLAGS_REMOVE_ftrace.o = -pg
CFLAGS_REMOVE_early_printk.o = -pg
endif
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] tracing/x86: Dont use mcount in kvmclock.c
2010-09-23 3:03 [PATCH 0/2] [GIT PULL][v2.6.36] tracing: fixes for tracing virt guests Steven Rostedt
2010-09-23 3:04 ` [PATCH 1/2] tracing/x86: Dont use mcount in pvclock.c Steven Rostedt
@ 2010-09-23 3:04 ` Steven Rostedt
2010-09-23 6:48 ` [PATCH 0/2] [GIT PULL][v2.6.36] tracing: fixes for tracing virt guests Ingo Molnar
2 siblings, 0 replies; 4+ messages in thread
From: Steven Rostedt @ 2010-09-23 3:04 UTC (permalink / raw)
To: linux-kernel
Cc: Ingo Molnar, Andrew Morton, Frederic Weisbecker, stable,
Jeremy Fitzhardinge, Avi Kivity
[-- Attachment #1: 0002-tracing-x86-Don-t-use-mcount-in-kvmclock.c.patch --]
[-- Type: text/plain, Size: 937 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
The guest can use the paravirt clock in kvmclock.c which is used
by sched_clock(), which in turn is used by the tracing mechanism
for timestamps, which leads to infinite recursion.
Disable mcount/tracing for kvmclock.o.
Cc: stable@kernel.org
Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Avi Kivity <avi@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/x86/kernel/Makefile | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 882bbff..fedf32a 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -12,6 +12,7 @@ CFLAGS_REMOVE_tsc.o = -pg
CFLAGS_REMOVE_rtc.o = -pg
CFLAGS_REMOVE_paravirt-spinlocks.o = -pg
CFLAGS_REMOVE_pvclock.o = -pg
+CFLAGS_REMOVE_kvmclock.o = -pg
CFLAGS_REMOVE_ftrace.o = -pg
CFLAGS_REMOVE_early_printk.o = -pg
endif
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 0/2] [GIT PULL][v2.6.36] tracing: fixes for tracing virt guests
2010-09-23 3:03 [PATCH 0/2] [GIT PULL][v2.6.36] tracing: fixes for tracing virt guests Steven Rostedt
2010-09-23 3:04 ` [PATCH 1/2] tracing/x86: Dont use mcount in pvclock.c Steven Rostedt
2010-09-23 3:04 ` [PATCH 2/2] tracing/x86: Dont use mcount in kvmclock.c Steven Rostedt
@ 2010-09-23 6:48 ` Ingo Molnar
2 siblings, 0 replies; 4+ messages in thread
From: Ingo Molnar @ 2010-09-23 6:48 UTC (permalink / raw)
To: Steven Rostedt; +Cc: linux-kernel, Andrew Morton, Frederic Weisbecker
* Steven Rostedt <rostedt@goodmis.org> wrote:
> Ingo,
>
> I actually did these fixes back in July for RHEL, but forgot about
> them for mainline :-(
>
> Jeremy hit the same bug and set me a fix. It was only part of what
> I did in July, so I pulled in his fix and added the second part.
>
> Please pull the latest tip/perf/urgent tree, which can be found at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
> tip/perf/urgent
>
>
> Jeremy Fitzhardinge (1):
> tracing/x86: Don't use mcount in pvclock.c
>
> Steven Rostedt (1):
> tracing/x86: Don't use mcount in kvmclock.c
>
> ----
> arch/x86/kernel/Makefile | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
Pulled, thanks Steve!
Ingo
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-09-23 6:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-23 3:03 [PATCH 0/2] [GIT PULL][v2.6.36] tracing: fixes for tracing virt guests Steven Rostedt
2010-09-23 3:04 ` [PATCH 1/2] tracing/x86: Dont use mcount in pvclock.c Steven Rostedt
2010-09-23 3:04 ` [PATCH 2/2] tracing/x86: Dont use mcount in kvmclock.c Steven Rostedt
2010-09-23 6:48 ` [PATCH 0/2] [GIT PULL][v2.6.36] tracing: fixes for tracing virt guests Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).