From patchwork Sat Dec 3 00:37:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 29177 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1142608wrr; Fri, 2 Dec 2022 16:41:31 -0800 (PST) X-Google-Smtp-Source: AA0mqf4RAIfqWByBtvrMSWapJ0T0f24cXt1nEd81gAmwMhGM/vsE6Il02vrBrVRxppbv56dWqmUz X-Received: by 2002:a17:907:c70a:b0:7ad:d6c6:eb7c with SMTP id ty10-20020a170907c70a00b007add6c6eb7cmr53564078ejc.249.1670028091830; Fri, 02 Dec 2022 16:41:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670028091; cv=none; d=google.com; s=arc-20160816; b=N3918BoqPVCmo6B2qJzC/rp6Gd72qZhfpcnlCU09leb8Pj6PqtHPUtZza6mwqu7KST IDXVnhwHImgt//Jbgy6S1PW44pcNpLGjSzSatRB6VVeYp5LIBVSXmZZM5m/6XkyBgwxG rd5f53rbnfMahHOuMknhfgYzYCy/VKHlLO57bLQemih455qs1WQ5cfxlqAZGr2wIGyFK 0KkeOifnkVsfBfdnd3Ug1uLk+Yu7oWO+BV7hvng83D++r9jwjW0SSwPgQil3Ki2fvt7S 9PNjeMIb5UqAYVw5NS54OHsf9Eafy2DAmkPq5mxIANGFi6bmy7d13SS5B+YvAukgiZ27 cENw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=MC/w1VbeKPVS25p2PBg2D3e4noKU6INLaclNyyEmubA=; b=QwofJVGRwsN1pY44WQyetHVT0WlbiqvDSqyKUNW5nJYPOmr2jpij90JIiRcU40Y6gg zQYoCsDDO0vVOx28LWnZLI9exJcffwOgFdV3f6AqidS102quzL9Oq0w66fAHDVOm1AX1 K44IMdBHp6FTwHLjlJySHoz4F6nfYx2vwcoNZpKL3hxc4s5/Q/9dnKkrPpYZ5kZb6cub 4LLIxOaGfnv3yCkpebGU3/QtBmks6iquP4mnjp67rUPB0xwZlOGgdkBTBoq/cvZEpF6Y 4EZljFit6AzTtLmcubgc2SiAEMhES8Ns6LXjZzB9mNOhJRZh2LysF9y8gnKx0Bcwd2yT 136A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=lRQYhjIc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i5-20020a50d745000000b00469058297afsi3014415edj.92.2022.12.02.16.41.08; Fri, 02 Dec 2022 16:41:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=lRQYhjIc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235062AbiLCAkj (ORCPT + 99 others); Fri, 2 Dec 2022 19:40:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234962AbiLCAkK (ORCPT ); Fri, 2 Dec 2022 19:40:10 -0500 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A58028E34 for ; Fri, 2 Dec 2022 16:37:54 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-3d2994e2d7dso65031047b3.9 for ; Fri, 02 Dec 2022 16:37:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=MC/w1VbeKPVS25p2PBg2D3e4noKU6INLaclNyyEmubA=; b=lRQYhjIc4/WNKpsAG3TSnyxqKZMKkMSQrtjb2IXntcDwtksdx2B0jag/JkM/mVKjeq mc3EGMC02yQVWZycq4T/tbx1RHPVDaCltg20PVtI8v84pyouV1kLZIxn4mc0NXpND4ca RJbuaVprWxsxEW5libijt60tMCYit/NO3mK/ak0mQZOmHxggxsFpPhUPr6XNx8JitC7b RwlzTIXU8NxpZVPHfGZbwWj2boX770JttTo67pfOyj5WDUylTgaLPD7zCSCO0D9GO5fn WS1xXi8D4YWG73cb+ZgaF60pz2LScS+S24QdWF785CSoRJXSdYm/AHtAU9NQsL3AOoAW SD4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=MC/w1VbeKPVS25p2PBg2D3e4noKU6INLaclNyyEmubA=; b=M5igaCbuZfykt7/v2YXkAWsaBjSprdjDg8wXii9B67Tp7Lm2bGY2TS4pHXNcdkO5Uv HgtWR7KDBWfn2ZIdHv647blmO7DrP95hrzIJaZF3Dy0P5iur2fKlxb1bIHJKCdEB8UyO cNkC7JDVcYy7HATt8IBLTwkaholctCch7ZQgjSY/eh0/MRDWONj7VDc5zEDH8kEIfduD W4qJqUTNCKuOwHZmskhkSposLR+vgqaDVhADwR5VchN+B7/iB4idAV9G2f94rFG5Ual1 h4XE299cvABD7jCkq+nGD2+CKtFhcM8dB5WUczg6NAUAafJnxzggMtU+piYLN05wbLYS 9b6w== X-Gm-Message-State: ANoB5pnosItIcvstTJAbHzivpILTbap9mVRYaV7WSnfdypYdBVQNcia7 4dhiv5yZzOmJbjLgkbri3/lntdCBr8w= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:5f50:0:b0:6f2:6848:d383 with SMTP id h16-20020a255f50000000b006f26848d383mr40249407ybm.39.1670027873963; Fri, 02 Dec 2022 16:37:53 -0800 (PST) Reply-To: Sean Christopherson Date: Sat, 3 Dec 2022 00:37:45 +0000 In-Reply-To: <20221203003745.1475584-1-seanjc@google.com> Mime-Version: 1.0 References: <20221203003745.1475584-1-seanjc@google.com> X-Mailer: git-send-email 2.39.0.rc0.267.gcb52ba06e7-goog Message-ID: <20221203003745.1475584-4-seanjc@google.com> Subject: [PATCH 3/3] KVM: VMX: Drop manual checks on X86_FEATURE_MSR_IA32_FEAT_CTL From: Sean Christopherson To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Sean Christopherson , Paolo Bonzini Cc: "H. Peter Anvin" , linux-kernel@vger.kernel.org, kvm@vger.kernel.org X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751151376023178451?= X-GMAIL-MSGID: =?utf-8?q?1751151376023178451?= Drop manual checks on X86_FEATURE_MSR_IA32_FEAT_CTL and instead rely solely on the X86_FEATURE_VMX check to detect VMX support now that VMX is disabled via apply_cpuid_deps() if X86_FEATURE_MSR_IA32_FEAT_CTL isn't supported. Signed-off-by: Sean Christopherson --- arch/x86/kernel/cpu/bugs.c | 3 +-- arch/x86/kvm/vmx/vmx.c | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 9e84b685328f..3071e2a97f0d 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -2222,8 +2222,7 @@ static ssize_t l1tf_show_state(char *buf) static ssize_t itlb_multihit_show_state(char *buf) { - if (!boot_cpu_has(X86_FEATURE_MSR_IA32_FEAT_CTL) || - !boot_cpu_has(X86_FEATURE_VMX)) + if (!boot_cpu_has(X86_FEATURE_VMX)) return sysfs_emit(buf, "KVM: Mitigation: VMX unsupported\n"); else if (!(cr4_read_shadow() & X86_CR4_VMXE)) return sysfs_emit(buf, "KVM: Mitigation: VMX disabled\n"); diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 9dba04b6b019..de3fe3932ee8 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -2423,8 +2423,7 @@ static __init int cpu_has_kvm_support(void) static __init int vmx_disabled_by_bios(void) { - return !boot_cpu_has(X86_FEATURE_MSR_IA32_FEAT_CTL) || - !boot_cpu_has(X86_FEATURE_VMX); + return !boot_cpu_has(X86_FEATURE_VMX); } static int kvm_cpu_vmxon(u64 vmxon_pointer) @@ -7413,8 +7412,7 @@ static int __init vmx_check_processor_compat(void) struct vmcs_config vmcs_conf; struct vmx_capability vmx_cap; - if (!this_cpu_has(X86_FEATURE_MSR_IA32_FEAT_CTL) || - !this_cpu_has(X86_FEATURE_VMX)) { + if (!this_cpu_has(X86_FEATURE_VMX)) { pr_err("kvm: VMX is disabled on CPU %d\n", smp_processor_id()); return -EIO; }