Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1512280

[PATCH v7 1/2] x86/msr: Add write msr notrace

Show all headers | View raw

From: Wanpeng Li <wanpeng.li@hotmail.com>

Add write msr notrace, it will be used by later patch.

Suggested-by: Peter Zijlstra <peterz@infradead.org>
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com>
---
 arch/x86/include/asm/msr.h | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
index b5fee97..eec29a7 100644
--- a/arch/x86/include/asm/msr.h
+++ b/arch/x86/include/asm/msr.h
@@ -115,17 +115,29 @@ static inline unsigned long long native_read_msr_safe(unsigned int msr,
 }
 
 /* Can be uninlined because referenced by paravirt */
-notrace static inline void native_write_msr(unsigned int msr,
+static notrace inline void __native_write_msr_notrace(unsigned int msr,
 					    unsigned low, unsigned high)
 {
 	asm volatile("1: wrmsr\n"
 		     "2:\n"
 		     _ASM_EXTABLE_HANDLE(1b, 2b, ex_handler_wrmsr_unsafe)
 		     : : "c" (msr), "a"(low), "d" (high) : "memory");
+}
+
+/* Can be uninlined because referenced by paravirt */
+static notrace inline void native_write_msr(unsigned int msr,
+					    unsigned low, unsigned high)
+{
+	__native_write_msr_notrace(msr, low, high);
 	if (msr_tracepoint_active(__tracepoint_write_msr))
 		do_trace_write_msr(msr, ((u64)high << 32 | low), 0);
 }
 
+static inline void wrmsr_notrace(unsigned msr, unsigned low, unsigned high)
+{
+	__native_write_msr_notrace(msr, low, high);
+}
+
 /* Can be uninlined because referenced by paravirt */
 notrace static inline int native_write_msr_safe(unsigned int msr,
 					unsigned low, unsigned high)
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v7 0/2] x86/apic: x2apic write eoi msr notrace Wanpeng Li <kernellwp@gmail.com> - 2016-10-31 02:40 +0100
  [PATCH v7 1/2] x86/msr: Add write msr notrace  Wanpeng Li <kernellwp@gmail.com> - 2016-10-31 02:40 +0100
    Re: [PATCH v7 1/2] x86/msr: Add write msr notrace Borislav Petkov <bp@alien8.de> - 2016-11-02 22:20 +0100
  [PATCH v7 2/2] x86/apic: x2apic write eoi msr notrace Wanpeng Li <kernellwp@gmail.com> - 2016-10-31 02:40 +0100
    Re: [PATCH v7 2/2] x86/apic: x2apic write eoi msr notrace Borislav Petkov <bp@alien8.de> - 2016-11-02 22:20 +0100
      Re: [PATCH v7 2/2] x86/apic: x2apic write eoi msr notrace Wanpeng Li <kernellwp@gmail.com> - 2016-11-07 05:40 +0100
  Re: [PATCH v7 0/2] x86/apic: x2apic write eoi msr notrace Borislav Petkov <bp@alien8.de> - 2016-11-02 22:20 +0100

csiph-web