From patchwork Fri Mar 10 21:42:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 67761 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1121523wrd; Fri, 10 Mar 2023 14:06:40 -0800 (PST) X-Google-Smtp-Source: AK7set8edLiAumQQN+RTNfsq7b8pQgeMHniLWZvYVI4lnMIqPMywpw7sTChZu98sUW8VgtkZiRgO X-Received: by 2002:a05:6a21:6d9a:b0:be:a9c7:5d12 with SMTP id wl26-20020a056a216d9a00b000bea9c75d12mr30106879pzb.18.1678486000354; Fri, 10 Mar 2023 14:06:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678486000; cv=none; d=google.com; s=arc-20160816; b=aD/XLHchh3FZDM9HrFoXcq4vSI5HYi5lU+dDdMrrK9nvGWGsDRma2pCRMyZfUoOyJ3 h1dJXSjehDpjhZnpzXW8JHP+7e92OCdx16XD5g8xwTdSpqmesLDx79APUlTuJO6GLJlb XCixZSDUQuODcr5kEFOJ3ijnWBqjHOM1Pk6Lxh3yi5Ehh2STgY0w0LNj6wwgFPTD6iLN MnWn4X/McoWjoXPkfvj8dKjnxLfEN8ZG2ZmODpY70RMWs3CS4YMjaG15OdO/YjQ7swzR ON9x6d/wM09OMyZhl2gsPl/fCMlgYJASs3kM/QQZwBnwnqTecYzB3A2jE1wvXlVzVEpx Ho8A== 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=4wFJBbDcDIknYvP9PkVIkSgktI2hIe9TbO9oei+TFB8=; b=IHB4LrIE8ONHHtF2/4j0c4wBSmyxsnYcI+iAPqjdhAyIyZftIWb/mA75fytDOQZpS3 53V6qyhAL2kOTnXpaDdn/qp71JMepq6dZjykcxXbDFHK37GF9PbnVQEgGOXsFCbqX4lm MRQr1rz8Wzw57SxdxiT6khVyoFwhKAjq3Xm0m/Nus4WZ+Ew3AtQbHiPCsmSHflvj6Dv8 myiwtjRRzoWvv5Tyn/PWOE/4pZKJc8VgdL5IAC9CSNisC58g7cI0ani6Lj3E04u0ve1j 0x5nCUuy5soafiIWNMnP5cQgpx+bo8PexEsjYgwOf4FeI40Uveg6L29pF+XKtM2aiSZa jsvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="i+JQY/cI"; 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 w141-20020a627b93000000b005a8d85904e1si569216pfc.361.2023.03.10.14.06.25; Fri, 10 Mar 2023 14:06:40 -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="i+JQY/cI"; 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 S232007AbjCJVnw (ORCPT + 99 others); Fri, 10 Mar 2023 16:43:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232003AbjCJVnU (ORCPT ); Fri, 10 Mar 2023 16:43:20 -0500 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1FDFB13F6BA for ; Fri, 10 Mar 2023 13:42:56 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id x64-20020a25ce43000000b00ae6d5855d78so7084629ybe.12 for ; Fri, 10 Mar 2023 13:42:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678484575; 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=4wFJBbDcDIknYvP9PkVIkSgktI2hIe9TbO9oei+TFB8=; b=i+JQY/cIPm1ONBBu2vV2F1Z236I/PD9d+Aj/AOkXUu69DFE1aUVEaCP945YiAOGsR1 KMADHV1bu3vvetWTbijcdZf4xFCxrDPqO9FVCv9Ig+GZd+rKebfskzjYKJ16dEbB6gLW LeJlzI21BJzSSNZLl3btrR4lvKYww+gX3hlkmVBaKnjUz2/uAt/gnzV57D3Qtu8X4Z6s X8jAtxiuZL+guarwCViDUEa2uGgc7vx58h/MAcIizqlNLZs5uK9ihabv5F3yVzes/P22 WM0UwQcsnPgu1DkUV8XhvVUxp6LNZ1jYuOqSqwyQC8ix+6/szkAO6ExwuU1A0nmHKVwk fNdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678484575; 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=4wFJBbDcDIknYvP9PkVIkSgktI2hIe9TbO9oei+TFB8=; b=ltox51fmZKo+oSMgs0uIr5c+/KijFUb+zzelKiHZ71B82/uww2iPiURF9Yug3tU5j1 iGtNhhyNQT901jfFNEzL1DUK24+JjZHOe/NH9xcJOf48yt5k/JtfBu0otadidK9K41j9 sPjEAQPDZDAUEVYhzQ408GIodIv05hQx8EHvWg72OflfW5TrK7wzvRy/N1I8QxIpxg1M I8jdKwKQkhxO3SUKgy3979lo6tcqergO1ThHUrhLxbpwusQTQyn6+BC2h9inp0LmVmhS uBkWUO5ehIGSEdPbBD2n5Ma0QgInTIdRj2zI3Fuob3Oq4RgeNQFbW+SMMKODf5+0Akoh F+BA== X-Gm-Message-State: AO0yUKXRV2h3nVIb8RB8ogO2XiV+Dbc/QSqMVgOA63TcVuORgjBWTVPy kNLuk7xZeYWaE1V2eowEtnfM2QVzF9g= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a81:ae62:0:b0:53c:6fda:b469 with SMTP id g34-20020a81ae62000000b0053c6fdab469mr17681347ywk.0.1678484574891; Fri, 10 Mar 2023 13:42:54 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 10 Mar 2023 13:42:23 -0800 In-Reply-To: <20230310214232.806108-1-seanjc@google.com> Mime-Version: 1.0 References: <20230310214232.806108-1-seanjc@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Message-ID: <20230310214232.806108-10-seanjc@google.com> Subject: [PATCH v2 09/18] 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,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?1760020136080384625?= X-GMAIL-MSGID: =?utf-8?q?1760020136080384625?= 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. 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 9e196b9fe183..58856e196536 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -2747,7 +2747,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; }