From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A11FCC63697 for ; Mon, 16 Nov 2020 16:45:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6117A2222C for ; Mon, 16 Nov 2020 16:45:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="tB1cLbMi"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="F/YPYk5/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732305AbgKPQpA (ORCPT ); Mon, 16 Nov 2020 11:45:00 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:42256 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729645AbgKPQo7 (ORCPT ); Mon, 16 Nov 2020 11:44:59 -0500 Date: Mon, 16 Nov 2020 16:44:56 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1605545097; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0F9DWkx/uxEZH3vSu2wV0DsB7ElZv3L7hkTxeVg3vIY=; b=tB1cLbMiHUcbv50D03dt9djxXLpr3KJ0lzK3BTVFQo/7W2jy3zY0VCCptzX/m6sKw9aZfu XuVf03AItjcxdm4Rl+SaC8bbo/CDkize0zjkV6t/Wnb7HB/XKCWZHQWmLkvAWwoLbRz/gf 13COpW3VWluLa+j7Aopf7OCc2GJmQUOKxGLVN6gPI48jmEcI6jvAwN1z9kb+PZkxUpERcV yxCtk236ELbraAeDH4iAU5NfuTDd7SI+MITS6ZyURj6pLQWWQhJkaoeYR5UqNhLefMudb9 pwOXPh3Wzk+GJ81vc4RWxWMc++KbFkxLUftU19mLRZEEcrhudg/eacdJaXPPVA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1605545097; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0F9DWkx/uxEZH3vSu2wV0DsB7ElZv3L7hkTxeVg3vIY=; b=F/YPYk5/gB4SguXF2h9+nmj6wYRFVKAodTuD1HS5QRO/cDCPxwao96wwUbo3dDjzKewl0Y yH1JiZ1C0vZb0ZBQ== From: "tip-bot2 for Tony Luck" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: ras/core] x86/mce: Use "safe" MSR functions when enabling additional error logging Cc: Qian Cai , Tony Luck , Borislav Petkov , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20201111003954.GA11878@agluck-desk2.amr.corp.intel.com> References: <20201111003954.GA11878@agluck-desk2.amr.corp.intel.com> MIME-Version: 1.0 Message-ID: <160554509642.11244.15619784651926454924.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the ras/core branch of tip: Commit-ID: 098416e6986127f7e4c8ce4fd6bbbd80e55b0386 Gitweb: https://git.kernel.org/tip/098416e6986127f7e4c8ce4fd6bbbd80e55b0386 Author: Tony Luck AuthorDate: Tue, 10 Nov 2020 16:39:54 -08:00 Committer: Borislav Petkov CommitterDate: Mon, 16 Nov 2020 17:34:08 +01:00 x86/mce: Use "safe" MSR functions when enabling additional error logging Booting as a guest under KVM results in error messages about unchecked MSR access: unchecked MSR access error: RDMSR from 0x17f at rIP: 0xffffffff84483f16 (mce_intel_feature_init+0x156/0x270) because KVM doesn't provide emulation for random model specific registers. Switch to using rdmsrl_safe()/wrmsrl_safe() to avoid the message. Fixes: 68299a42f842 ("x86/mce: Enable additional error logging on certain Intel CPUs") Reported-by: Qian Cai Signed-off-by: Tony Luck Signed-off-by: Borislav Petkov Link: https://lkml.kernel.org/r/20201111003954.GA11878@agluck-desk2.amr.corp.intel.com --- arch/x86/kernel/cpu/mce/intel.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/intel.c b/arch/x86/kernel/cpu/mce/intel.c index b47883e..c2476fe 100644 --- a/arch/x86/kernel/cpu/mce/intel.c +++ b/arch/x86/kernel/cpu/mce/intel.c @@ -521,9 +521,10 @@ static void intel_imc_init(struct cpuinfo_x86 *c) case INTEL_FAM6_SANDYBRIDGE_X: case INTEL_FAM6_IVYBRIDGE_X: case INTEL_FAM6_HASWELL_X: - rdmsrl(MSR_ERROR_CONTROL, error_control); + if (rdmsrl_safe(MSR_ERROR_CONTROL, &error_control)) + return; error_control |= 2; - wrmsrl(MSR_ERROR_CONTROL, error_control); + wrmsrl_safe(MSR_ERROR_CONTROL, error_control); break; } }