Commit 08dd8cd0 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Thomas Gleixner

x86/msr: Use the proper trace point conditional for writes

The msr tracing for writes is incorrectly conditional on the read trace.

Fixes: 7f47d8cc "x86, tracing, perf: Add trace point for MSR accesses"
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Cc: stable@vger.kernel.org
Cc: ak@linux.intel.com
Link: http://lkml.kernel.org/r/1464976859-21850-1-git-send-email-dgilbert@redhat.comSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent af8c34ce
...@@ -122,7 +122,7 @@ notrace static inline void native_write_msr(unsigned int msr, ...@@ -122,7 +122,7 @@ notrace static inline void native_write_msr(unsigned int msr,
"2:\n" "2:\n"
_ASM_EXTABLE_HANDLE(1b, 2b, ex_handler_wrmsr_unsafe) _ASM_EXTABLE_HANDLE(1b, 2b, ex_handler_wrmsr_unsafe)
: : "c" (msr), "a"(low), "d" (high) : "memory"); : : "c" (msr), "a"(low), "d" (high) : "memory");
if (msr_tracepoint_active(__tracepoint_read_msr)) if (msr_tracepoint_active(__tracepoint_write_msr))
do_trace_write_msr(msr, ((u64)high << 32 | low), 0); do_trace_write_msr(msr, ((u64)high << 32 | low), 0);
} }
...@@ -141,7 +141,7 @@ notrace static inline int native_write_msr_safe(unsigned int msr, ...@@ -141,7 +141,7 @@ notrace static inline int native_write_msr_safe(unsigned int msr,
: "c" (msr), "0" (low), "d" (high), : "c" (msr), "0" (low), "d" (high),
[fault] "i" (-EIO) [fault] "i" (-EIO)
: "memory"); : "memory");
if (msr_tracepoint_active(__tracepoint_read_msr)) if (msr_tracepoint_active(__tracepoint_write_msr))
do_trace_write_msr(msr, ((u64)high << 32 | low), err); do_trace_write_msr(msr, ((u64)high << 32 | low), err);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment