From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754282AbcKIVKt (ORCPT ); Wed, 9 Nov 2016 16:10:49 -0500 Received: from terminus.zytor.com ([198.137.202.10]:53528 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752590AbcKIVKr (ORCPT ); Wed, 9 Nov 2016 16:10:47 -0500 Date: Wed, 9 Nov 2016 13:09:53 -0800 From: tip-bot for Wanpeng Li Message-ID: Cc: pbonzini@redhat.com, mingo@kernel.org, linux-kernel@vger.kernel.org, efault@gmx.de, tglx@linutronix.de, bp@alien8.de, peterz@infradead.org, wanpeng.li@hotmail.com, hpa@zytor.com Reply-To: mingo@kernel.org, linux-kernel@vger.kernel.org, pbonzini@redhat.com, hpa@zytor.com, peterz@infradead.org, wanpeng.li@hotmail.com, efault@gmx.de, bp@alien8.de, tglx@linutronix.de In-Reply-To: <1478488420-5982-2-git-send-email-wanpeng.li@hotmail.com> References: <1478488420-5982-2-git-send-email-wanpeng.li@hotmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/msr: Add wrmsr_notrace() Git-Commit-ID: b2c5ea4f759190ee9f75687a00035c1a66d0d743 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b2c5ea4f759190ee9f75687a00035c1a66d0d743 Gitweb: http://git.kernel.org/tip/b2c5ea4f759190ee9f75687a00035c1a66d0d743 Author: Wanpeng Li AuthorDate: Mon, 7 Nov 2016 11:13:39 +0800 Committer: Thomas Gleixner CommitDate: Wed, 9 Nov 2016 22:03:14 +0100 x86/msr: Add wrmsr_notrace() Required to remove the extra irq_enter()/irq_exit() in smp_reschedule_interrupt(). Suggested-by: Peter Zijlstra Suggested-by: Paolo Bonzini Signed-off-by: Wanpeng Li Acked-by: Paolo Bonzini Reviewed-by: Borislav Petkov Cc: kvm@vger.kernel.org Cc: Mike Galbraith Link: http://lkml.kernel.org/r/1478488420-5982-2-git-send-email-wanpeng.li@hotmail.com Signed-off-by: Thomas Gleixner --- 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..9b0a232 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)