From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751708AbbCKWwn (ORCPT ); Wed, 11 Mar 2015 18:52:43 -0400 Received: from mail-by2on0136.outbound.protection.outlook.com ([207.46.100.136]:62324 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750853AbbCKWwl (ORCPT ); Wed, 11 Mar 2015 18:52:41 -0400 X-Greylist: delayed 2002 seconds by postgrey-1.27 at vger.kernel.org; Wed, 11 Mar 2015 18:52:40 EDT X-WSS-ID: 0NL2JBZ-08-A7M-02 X-M-MSG: From: To: CC: Joel Schopp , Tony Luck , Borislav Petkov , Thomas Gleixner , "Ingo Molnar" , "H. Peter Anvin" , , , Jesse Larrew Subject: [PATCH] mce: use safe MSR accesses Date: Wed, 11 Mar 2015 17:09:38 -0500 Message-ID: <1426111778-17942-1-git-send-email-jesse.larrew@amd.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 Authentication-Results: spf=none (sender IP is 165.204.84.222) smtp.mailfrom=Jesse.Larrew@amd.com; alien8.de; dkim=none (message not signed) header.d=none; X-Forefront-Antispam-Report: CIP:165.204.84.222;CTRY:US;IPV:NLI;EFV:NLI;BMV:1;SFV:NSPM;SFS:(10019020)(6009001)(428002)(199003)(189002)(50466002)(101416001)(86152002)(229853001)(86362001)(92566002)(47776003)(2351001)(33646002)(77096005)(50226001)(36756003)(53416004)(110136001)(105586002)(106466001)(87936001)(46102003)(19580405001)(48376002)(50986999)(77156002)(19580395003)(62966003);DIR:OUT;SFP:1102;SCL:1;SRVR:CY1PR0201MB1049;H:atltwp02.amd.com;FPR:;SPF:None;MLV:sfv;A:1;MX:1;LANG:en; X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0201MB1049; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5002009)(5005006);SRVR:CY1PR0201MB1049;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0201MB1049; X-Forefront-PRVS: 0512CC5201 X-OriginatorOrg: amd4.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Mar 2015 22:19:15.7220 (UTC) X-MS-Exchange-CrossTenant-Id: fde4dada-be84-483f-92cc-e026cbee8e96 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fde4dada-be84-483f-92cc-e026cbee8e96;Ip=[165.204.84.222];Helo=[atltwp02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0201MB1049 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jesse Larrew When running as a guest under kvm, it's possible that the MSR being accessed may not be implemented. All MSR accesses should be prepared to handle exceptions. Signed-off-by: Jesse Larrew --- arch/x86/kernel/cpu/mcheck/mce.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 61a9668ce..4151ba9 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -1556,12 +1556,12 @@ static int __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c) wrmsrl(MSR_K7_HWCR, hwcr | BIT(18)); for (i = 0; i < ARRAY_SIZE(msrs); i++) { - rdmsrl(msrs[i], val); + rdmsrl_safe(msrs[i], &val); /* CntP bit set? */ if (val & BIT_64(62)) { val &= ~BIT_64(62); - wrmsrl(msrs[i], val); + wrmsrl_safe(msrs[i], val); } } -- 1.9.1