From patchwork Fri Jul 21 20:18:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 124075 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp445046vqg; Fri, 21 Jul 2023 13:21:32 -0700 (PDT) X-Google-Smtp-Source: APBJJlE4lTcbApYADhdrgWppXFk+s3nE82xzSJanG6+rUwIplnbYGAcyX4LJg35RfDJP1MsSD8qH X-Received: by 2002:aa7:c41a:0:b0:51d:d27a:6d3 with SMTP id j26-20020aa7c41a000000b0051dd27a06d3mr2568966edq.11.1689970892011; Fri, 21 Jul 2023 13:21:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689970891; cv=none; d=google.com; s=arc-20160816; b=OPsvLPIyrb3+qLveJYloLgCqk0CW3oqCAY98/+j1uIvx40FK6DR69QmKtdovHwXldj +mFubrWcs9JzPIUqc6ul4HKfJj8F49mDSEb4/CDp/n+frzn36fD9TFw9nk46mbcgmOsx AFWLWhJ7U+qov9KcKU8l8m9HjTsR0ZzqJyXvPDg65Tol95oe/xHkrM6WRqsWhJIcTbT4 O9fzO6ylHEqoYCKjTIhENJmCLOx8TeoxyiBS748yKewbE3B1zWoZCyRfLhXf2KUSHDm8 yn9Ka87HfKcG2JW9L+KpFfwOMLei1pwUuGoCvw86eyGFzaeApceXGpyMWCyuUD/XpYGC 9cag== 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=BxIdNivQmBNQSOlXPPIQGt5Qzqr/3+s4YS24y1+Qiwc=; fh=GitwJflddDxrBBVhnTGEzIZYOBTU7RKSqL+OyCDv/0M=; b=iMSEExmsN7sj5YQTg8pSGN4f7570eHXM0eL/xBdlkFcPgnoakmmbwH65Y0QfOdU0nP 9ymPH+oFy9fD6FFq8sCU+zdXj3NjK0EKuZRfae0Yj7INiaEguDD+NNEe2QuHJ7/ZGeIW Dg+A8/CrTmadksY0uv+eZNIgRWx3vrRSqyNFRzx8zftz8yhN95cuuwdZNRmMAi89d4SS LOL6mz/VMsu0DV4HAxwtDL4l/sxKWAS/Dut6DN7nFPYkHRVleOQoLkgOBXvHfOVd1qx0 RUIez3bzBCtVnwAO44a7ZyyT8e5CIUfc+DB3zBGNnj6hprY1hgMXS//qOAe9UMvvFghf 92IQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=Gu6EPZof; 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 m17-20020aa7d351000000b0051df4787a2esi2869995edr.218.2023.07.21.13.21.07; Fri, 21 Jul 2023 13:21:31 -0700 (PDT) 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=20221208 header.b=Gu6EPZof; 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 S231405AbjGUUTz (ORCPT + 99 others); Fri, 21 Jul 2023 16:19:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231228AbjGUUTb (ORCPT ); Fri, 21 Jul 2023 16:19:31 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE35C35BB for ; Fri, 21 Jul 2023 13:19:23 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5834d9ec5f7so55179147b3.1 for ; Fri, 21 Jul 2023 13:19:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1689970763; x=1690575563; 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=BxIdNivQmBNQSOlXPPIQGt5Qzqr/3+s4YS24y1+Qiwc=; b=Gu6EPZofnedmVcu0puGF5uwGMb+h5xD1qVMdFfjhDXwf0ojqQzZcD1qu3BQJegbXvr KLDtNr2gxNXiIGG01q1nWzcC8TWglrMhxSng4NJhIYe0BpCdke22vxvfKTVbuomgvUAN S0b2LRn9a7StmxWvePSakXfo0f6VjA0axqDjd3pZE1xoRBMdZO313rBIR4eu9qDLo1wM usH/HLHPIkA/2/CyF4G08TZ7X9D3vVMe5uXA535W675kmFLdT8+6jOaYRnBeap6S3TBj xg8Pj92dho+Sxc3VU4JDANpOH3JDVZFimXcHgJArCZfVA+xuGI+5RJ5z3B3A6VLxOY+a DVPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689970763; x=1690575563; 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=BxIdNivQmBNQSOlXPPIQGt5Qzqr/3+s4YS24y1+Qiwc=; b=VgknbKuV9GgHZQ3qnwgEUYwTAMn1YVYPVIinZM/Xn3vij2MJAUkPnVUVGud7nn8bTh HfLEZ8u6VoQrTdp0IvQNDXN3RksyYj45Z/wB6yCOe2rY5lpeA89V7Prvm7jNdCM45PTK oyc8sXs2X354RoVOaPDSVlL4hGpvXKEA+iYZjp0Gf7ZkCvtCgVaYZEMwkPlbUOxjxA5g 7WsgFUaz1FEmdfTfuRYkUIOA/YFf76mwZ/GSzpJ8Tgn8V5guUwXVCbZDsbPTktOnFW8A cfHSrVYcflKw+4QUf1Nf2VptELdfrw6xqyNf0Py1wOVwQnnzdwWTmHcDTNWRxcp5VWtH tTNA== X-Gm-Message-State: ABy/qLbYj06gyFgavmWUB1EYKMM1mgDhcr1Ctkoy6XBXoYQfgYvFvxDq 2ZC6ONtGXVSm+dzK/+VNKig/OwCNzRg= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a5b:a8d:0:b0:d04:6d5e:4ded with SMTP id h13-20020a5b0a8d000000b00d046d5e4dedmr25333ybq.6.1689970762838; Fri, 21 Jul 2023 13:19:22 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 21 Jul 2023 13:18:49 -0700 In-Reply-To: <20230721201859.2307736-1-seanjc@google.com> Mime-Version: 1.0 References: <20230721201859.2307736-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.487.g6d72f3e995-goog Message-ID: <20230721201859.2307736-10-seanjc@google.com> Subject: [PATCH v4 09/19] x86/virt: KVM: Open code cpu_has_vmx() in KVM VMX From: Sean Christopherson To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Sean Christopherson , Paolo Bonzini Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Andrew Cooper , Kai Huang , Chao Gao 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,T_SCC_BODY_TEXT_LINE,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: INBOX X-GMAIL-THRID: 1772062917877110248 X-GMAIL-MSGID: 1772062917877110248 Fold the raw CPUID check for VMX into kvm_is_vmx_supported(), its sole user. Keep the check even though KVM also checks X86_FEATURE_VMX, as the intent is to provide a unique error message if VMX is unsupported by hardware, whereas X86_FEATURE_VMX may be clear due to firmware and/or kernel actions. No functional change intended. Reviewed-by: Kai Huang Signed-off-by: Sean Christopherson --- arch/x86/include/asm/virtext.h | 10 ---------- arch/x86/kvm/vmx/vmx.c | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/arch/x86/include/asm/virtext.h b/arch/x86/include/asm/virtext.h index aaed66249ccf..b1171a5ad452 100644 --- a/arch/x86/include/asm/virtext.h +++ b/arch/x86/include/asm/virtext.h @@ -22,14 +22,6 @@ /* * VMX functions: */ - -static inline int cpu_has_vmx(void) -{ - unsigned long ecx = cpuid_ecx(1); - return test_bit(5, &ecx); /* CPUID.1:ECX.VMX[bit 5] -> VT */ -} - - /** * cpu_vmxoff() - Disable VMX on the current CPU * @@ -61,8 +53,6 @@ static inline int cpu_vmx_enabled(void) } /** Disable VMX if it is enabled on the current CPU - * - * You shouldn't call this if cpu_has_vmx() returns 0. */ static inline void __cpu_emergency_vmxoff(void) { diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 682c20b33a96..71571cd9adbb 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -2718,7 +2718,7 @@ static bool kvm_is_vmx_supported(void) { int cpu = raw_smp_processor_id(); - if (!cpu_has_vmx()) { + if (!(cpuid_ecx(1) & feature_bit(VMX))) { pr_err("VMX not supported by CPU %d\n", cpu); return false; }