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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 20427C433FF for ; Fri, 2 Aug 2019 09:36:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EE19320679 for ; Fri, 2 Aug 2019 09:36:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564738602; bh=9e+qZckbaJQmwEnIicl3WnS9YT3igfdelpfQL5AwbPk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EsdH3OgWQwVpP1mR0C1Ry/LTjrC9VU0Oau+TfjfzYUaMHm+4Aoo/4evpxBsgMYzrn P/1qcrXr4trFUZaNnxxq1ZPiJGEr9TzaFxxKyGQSQb0hMacsQx7noKpDRPCEg+2bK8 Jl/4xXRfzVz9j6GWPss9+jOThmSB0qTtG3idsva4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404436AbfHBJgk (ORCPT ); Fri, 2 Aug 2019 05:36:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:37662 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731185AbfHBJgj (ORCPT ); Fri, 2 Aug 2019 05:36:39 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1E4CE2086A; Fri, 2 Aug 2019 09:36:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564738598; bh=9e+qZckbaJQmwEnIicl3WnS9YT3igfdelpfQL5AwbPk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gFER5DYSF8X76PRZuj9YONO3DBiyuaI2EZjofQVBTrVX0GY140R07FyXXSYPJfOlA DAOeLO7Vq0T8pjG5D20Tp3Edd1jlyzQn+qGIiWBs4zt8En/XZZXDzw5FFg3UE1ycDU U1aLD682tXoHenpCllch0L6S+YdmfO2O41G2qvdw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zhenzhong Duan , Thomas Gleixner Subject: [PATCH 4.4 142/158] x86/speculation/mds: Apply more accurate check on hypervisor platform Date: Fri, 2 Aug 2019 11:29:23 +0200 Message-Id: <20190802092231.632580014@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802092203.671944552@linuxfoundation.org> References: <20190802092203.671944552@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhenzhong Duan commit 517c3ba00916383af6411aec99442c307c23f684 upstream. X86_HYPER_NATIVE isn't accurate for checking if running on native platform, e.g. CONFIG_HYPERVISOR_GUEST isn't set or "nopv" is enabled. Checking the CPU feature bit X86_FEATURE_HYPERVISOR to determine if it's running on native platform is more accurate. This still doesn't cover the platforms on which X86_FEATURE_HYPERVISOR is unsupported, e.g. VMware, but there is nothing which can be done about this scenario. Fixes: 8a4b06d391b0 ("x86/speculation/mds: Add sysfs reporting for MDS") Signed-off-by: Zhenzhong Duan Signed-off-by: Thomas Gleixner Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/1564022349-17338-1-git-send-email-zhenzhong.duan@oracle.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/cpu/bugs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -1094,7 +1094,7 @@ static void __init l1tf_select_mitigatio static ssize_t mds_show_state(char *buf) { #ifdef CONFIG_HYPERVISOR_GUEST - if (x86_hyper) { + if (boot_cpu_has(X86_FEATURE_HYPERVISOR)) { return sprintf(buf, "%s; SMT Host state unknown\n", mds_strings[mds_mitigation]); }