Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030945AbcDMLrU (ORCPT ); Wed, 13 Apr 2016 07:47:20 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57040 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030430AbcDMLrR (ORCPT ); Wed, 13 Apr 2016 07:47:17 -0400 Date: Wed, 13 Apr 2016 04:46:05 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: tglx@linutronix.de, pbonzini@redhat.com, bp@alien8.de, torvalds@linux-foundation.org, luto@kernel.org, arjan@linux.intel.com, hpa@zytor.com, peterz@infradead.org, Xen-devel@lists.xen.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, boris.ostrovsky@oracle.com, mingo@kernel.org, kvm@vger.kernel.org Reply-To: torvalds@linux-foundation.org, bp@alien8.de, pbonzini@redhat.com, tglx@linutronix.de, kvm@vger.kernel.org, mingo@kernel.org, boris.ostrovsky@oracle.com, linux-kernel@vger.kernel.org, Xen-devel@lists.xen.org, akpm@linux-foundation.org, peterz@infradead.org, hpa@zytor.com, arjan@linux.intel.com, luto@kernel.org In-Reply-To: <414fabd6d3527703077c6c2a797223d0a9c3b081.1459605520.git.luto@kernel.org> References: <414fabd6d3527703077c6c2a797223d0a9c3b081.1459605520.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/paravirt: Make "unsafe" MSR accesses unsafe even if PARAVIRT=y Git-Commit-ID: 4985ce15a397e9b6541548efe3b9ffac2dda9127 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 Content-Length: 2301 Lines: 62 Commit-ID: 4985ce15a397e9b6541548efe3b9ffac2dda9127 Gitweb: http://git.kernel.org/tip/4985ce15a397e9b6541548efe3b9ffac2dda9127 Author: Andy Lutomirski AuthorDate: Sat, 2 Apr 2016 07:01:39 -0700 Committer: Ingo Molnar CommitDate: Wed, 13 Apr 2016 11:37:46 +0200 x86/paravirt: Make "unsafe" MSR accesses unsafe even if PARAVIRT=y Enabling CONFIG_PARAVIRT had an unintended side effect: rdmsr() turned into rdmsr_safe() and wrmsr() turned into wrmsr_safe(), even on bare metal. Undo that by using the new unsafe paravirt MSR callbacks. Tested-by: Boris Ostrovsky Signed-off-by: Andy Lutomirski Acked-by: Linus Torvalds Cc: Andrew Morton Cc: Arjan van de Ven Cc: Borislav Petkov Cc: KVM list Cc: Paolo Bonzini Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: xen-devel Link: http://lkml.kernel.org/r/414fabd6d3527703077c6c2a797223d0a9c3b081.1459605520.git.luto@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/include/asm/paravirt.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h index 97839fa..3c73141 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h @@ -152,24 +152,21 @@ static inline int paravirt_write_msr_safe(unsigned msr, return PVOP_CALL3(int, pv_cpu_ops.write_msr_safe, msr, low, high); } -/* These should all do BUG_ON(_err), but our headers are too tangled. */ #define rdmsr(msr, val1, val2) \ do { \ - int _err; \ - u64 _l = paravirt_read_msr_safe(msr, &_err); \ + u64 _l = paravirt_read_msr(msr); \ val1 = (u32)_l; \ val2 = _l >> 32; \ } while (0) #define wrmsr(msr, val1, val2) \ do { \ - paravirt_write_msr_safe(msr, val1, val2); \ + paravirt_write_msr(msr, val1, val2); \ } while (0) #define rdmsrl(msr, val) \ do { \ - int _err; \ - val = paravirt_read_msr_safe(msr, &_err); \ + val = paravirt_read_msr(msr); \ } while (0) static inline void wrmsrl(unsigned msr, u64 val)