This is a note to let you know that I've just added the patch titled
x86/msr: Use the proper trace point conditional for writes
to the 4.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-msr-use-the-proper-trace-point-conditional-for-writes.patch
and it can be found in the queue-4.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 08dd8cd06ed95625b9e2fac43c78fcb45b7eaf94 Mon Sep 17 00:00:00 2001
From: "Dr. David Alan Gilbert" <dgilbert@xxxxxxxxxx>
Date: Fri, 3 Jun 2016 19:00:59 +0100
Subject: x86/msr: Use the proper trace point conditional for writes
From: Dr. David Alan Gilbert <dgilbert@xxxxxxxxxx>
commit 08dd8cd06ed95625b9e2fac43c78fcb45b7eaf94 upstream.
The msr tracing for writes is incorrectly conditional on the read trace.
Fixes: 7f47d8cc039f "x86, tracing, perf: Add trace point for MSR accesses"
Signed-off-by: Dr. David Alan Gilbert <dgilbert@xxxxxxxxxx>
Cc: ak@xxxxxxxxxxxxxxx
Link: http://lkml.kernel.org/r/1464976859-21850-1-git-send-email-dgilbert@xxxxxxxxxx
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/x86/include/asm/msr.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/arch/x86/include/asm/msr.h
+++ b/arch/x86/include/asm/msr.h
@@ -112,7 +112,7 @@ static inline void native_write_msr(unsi
unsigned low, unsigned high)
{
asm volatile("wrmsr" : : "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);
}
@@ -131,7 +131,7 @@ notrace static inline int native_write_m
: "c" (msr), "0" (low), "d" (high),
[fault] "i" (-EIO)
: "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);
return err;
}
Patches currently in stable-queue which might be from dgilbert@xxxxxxxxxx are
queue-4.6/x86-msr-use-the-proper-trace-point-conditional-for-writes.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html