From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wanpeng Li Subject: [PATCH v8 1/2] x86/msr: Add write msr notrace Date: Mon, 7 Nov 2016 11:13:39 +0800 Message-ID: <1478488420-5982-2-git-send-email-wanpeng.li@hotmail.com> References: <1478488420-5982-1-git-send-email-wanpeng.li@hotmail.com> Cc: Ingo Molnar , Mike Galbraith , Peter Zijlstra , Thomas Gleixner , Paolo Bonzini , Borislav Petkov , Wanpeng Li To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Return-path: In-Reply-To: <1478488420-5982-1-git-send-email-wanpeng.li@hotmail.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: kvm.vger.kernel.org From: Wanpeng Li Add write msr notrace, it will be used by later patch. Suggested-by: Peter Zijlstra Suggested-by: Paolo Bonzini Acked-by: Paolo Bonzini Reviewed-by: Borislav Petkov Cc: Ingo Molnar Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Paolo Bonzini Cc: Borislav Petkov Signed-off-by: Wanpeng Li --- 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