Commit 89e1be50 authored May 27, 2011 by Steven Rostedt Committed by Steven Rostedt May 27, 2011

x86: Put back -pg to tsc.o and add no GCOV to vread_tsc_64.o



The commit 44259b1a
    Author: Andy Lutomirski <luto@MIT.EDU>
    x86-64: Move vread_tsc into a new file with sensible options

Removed the -pg from tsc.o which caused the function graph tracer
to go into an infinite function call recursion as it uses the tsc
internally outside its recursion protection, thus tracing the tsc
breaks the function graph tracer.

This commit also added the file vread_tsc_64.c that gets used
by vdso but failed to prevent GCOV from monkeying with it,
causing userspace to try to access kernel data when GCOV was
enabled.

Thanks to Thomas Gleixner for pointing out GCOV as the likely
culprit that added strange kernel accesses into the vread_tsc()
call.

Cc: Author: Andy Lutomirski <luto@MIT.EDU>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

parent f23a5e14

arch/x86/kernel/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ CPPFLAGS_vmlinux.lds += -U$(UTS_MACHINE)

		ifdef CONFIG_FUNCTION_TRACER
		# Do not profile debug and lowlevel utilities
		CFLAGS_REMOVE_tsc.o = -pg
		CFLAGS_REMOVE_rtc.o = -pg
		CFLAGS_REMOVE_paravirt-spinlocks.o = -pg
		CFLAGS_REMOVE_pvclock.o = -pg
		@@ -28,6 +29,7 @@ CFLAGS_paravirt.o := $(nostackp)
		GCOV_PROFILE_vsyscall_64.o := n
		GCOV_PROFILE_hpet.o := n
		GCOV_PROFILE_tsc.o := n
		GCOV_PROFILE_vread_tsc_64.o := n
		GCOV_PROFILE_paravirt.o := n

		# vread_tsc_64 is hot and should be fully optimized:

Admin message