Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp3584200pxb; Mon, 9 Nov 2020 15:26:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJzFA8t21/mtkMzou2xhipEYapXXj+xWavgr86Re2uHuT6vXOmgzGhrrI2coCWlW+83LhTGH X-Received: by 2002:a17:906:ad8c:: with SMTP id la12mr16881440ejb.521.1604964398324; Mon, 09 Nov 2020 15:26:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604964398; cv=none; d=google.com; s=arc-20160816; b=1KjS2EXtbGHkGHaCjPklLZWx/excTZyDqzrybErDxOnnHgFK1vixEqEaMm732OgdMX cvXxxETqsBUlNb4f0c7il59gzypdA303AsCuMAW5kTcn2uBJZPschGub59T3wSYRLVxT pTQnf9XrwrA71dbUwpkfs7rDtPcHEbyLqFD4xl3Gr+D7NCGxYfHhxhHHF151DJS9C8uN UwKUte/WppLrAk06LXH6wtxeWUDQ8CIk89tNTdqAw0H3J8GUl/0gDrPvot5c21vksoYw aibIbi3Yt61RoP/jWhE5ijQZJ+p0LwxAKjDAJKW4DNIOyGiXhhpmzPCnV6uuotbgIS48 MJ3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:ironport-sdr :ironport-sdr; bh=vQ3ZBTbhRtPuHQlF+PzMIE9tZik6cTr6577WWL2SFHs=; b=thnkeHbV7KkwRiMXYFzzMlh5+LB8L/uHmUODraXbseDs+hqshEcNOcy5LrJ9IBp2iB SCYWWOS7/HCGvbcRwGJ1s4X7U9bKl6dqkXfZdCQqnTvKWbDPiobWos7xFexOdjaISdir F/CadM+zW14PC2bYe4HXXXyPBPtpDq+NvB0m/3SZIGnEzveJS189dX2gcaycbjV9X4I7 FtG1dYB85q6lVvg7jjE09Nzdq2UtM+5mtBU06yg+XZpRJnUM3fzuZawtxm+bBo8G3VJP WjtdyXfmjYgWnseh94MJpaL7JfpJ4piL4K7f5rCiOqyp9qCWVOjxee7pjoQP06dfWBJ+ 6Nog== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id hh9si8288255ejb.38.2020.11.09.15.26.14; Mon, 09 Nov 2020 15:26:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731338AbgKIXYF (ORCPT + 99 others); Mon, 9 Nov 2020 18:24:05 -0500 Received: from mga09.intel.com ([134.134.136.24]:7001 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729740AbgKIXYE (ORCPT ); Mon, 9 Nov 2020 18:24:04 -0500 IronPort-SDR: ID0Hd7zq6ENP88mZc7V0tz9D0YDzA4YLVkszv6mgrxKfpJX+Js0e0v4Qy5pox5+D3lPx/5SCan PazxTL9ggC5Q== X-IronPort-AV: E=McAfee;i="6000,8403,9800"; a="170038978" X-IronPort-AV: E=Sophos;i="5.77,464,1596524400"; d="scan'208";a="170038978" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Nov 2020 15:24:03 -0800 IronPort-SDR: GpZbytWzBTV4P7UoNJU0CtTmo7uvwa2hvA0jdHPZGeGaba7dR/GNinokcc8VgiKXTCs/iFFDHk g3eGxblBjDOQ== X-IronPort-AV: E=Sophos;i="5.77,464,1596524400"; d="scan'208";a="473180423" Received: from agluck-desk2.sc.intel.com (HELO agluck-desk2.amr.corp.intel.com) ([10.3.52.68]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Nov 2020 15:24:03 -0800 Date: Mon, 9 Nov 2020 15:24:02 -0800 From: "Luck, Tony" To: Borislav Petkov , Jim Mattson Cc: Qian Cai , "linux-kernel@vger.kernel.org" , "linux-tip-commits@vger.kernel.org" , Boris Petkov , Borislav Petkov , x86 , Paolo Bonzini , "kvm@vger.kernel.org" Subject: [PATCH] x86/mce: Check for hypervisor before enabling additional error logging Message-ID: <20201109232402.GA25492@agluck-desk2.amr.corp.intel.com> References: <20201030190807.GA13884@agluck-desk2.amr.corp.intel.com> <160431588828.397.16468104725047768957.tip-bot2@tip-bot2> <3f863634cd75824907e8ccf8164548c2ef036f20.camel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Booting as a guest under KVM results in error messages about unchecked MSR access: [ 6.814328][ T0] 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. Check for X86_FEATURE_HYPERVISOR and skip trying to enable the mode (a guest shouldn't be concerned with corrected errors anyway). Reported-by: Qian Cai Fixes: 68299a42f842 ("x86/mce: Enable additional error logging on certain Intel CPUs") Signed-off-by: Tony Luck --- arch/x86/kernel/cpu/mce/intel.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/kernel/cpu/mce/intel.c b/arch/x86/kernel/cpu/mce/intel.c index b47883e364b4..7f7d863400b7 100644 --- a/arch/x86/kernel/cpu/mce/intel.c +++ b/arch/x86/kernel/cpu/mce/intel.c @@ -517,6 +517,9 @@ static void intel_imc_init(struct cpuinfo_x86 *c) { u64 error_control; + if (boot_cpu_has(X86_FEATURE_HYPERVISOR)) + return; + switch (c->x86_model) { case INTEL_FAM6_SANDYBRIDGE_X: case INTEL_FAM6_IVYBRIDGE_X: -- 2.21.1