From patchwork Fri Mar 10 21:42:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 67758 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1121351wrd; Fri, 10 Mar 2023 14:06:16 -0800 (PST) X-Google-Smtp-Source: AK7set+I02zoYxn1yKML2mF3fJZRmMjH0T0VYXhE06D3KgH4FnSscc+IQgItHeNgNVJ7gw/UfPV5 X-Received: by 2002:aa7:9d11:0:b0:602:7c0:3afe with SMTP id k17-20020aa79d11000000b0060207c03afemr24078767pfp.26.1678485976286; Fri, 10 Mar 2023 14:06:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678485976; cv=none; d=google.com; s=arc-20160816; b=Uvys0O1QzF6HCupSvrCWxRijypzfFYHgmFRlobgiSzcdELpt5lIPgdCtnp1EbMn9TG lZy0unJ57/zC6kLvpXOyYOA20icGH2p8Naec1BVAE/EEch/XdUr8fgPmVAkfq1RxI8nk OsW++4vlof9L6O+nMIs77MEqGiTYQ+8VwkyPaEV+PMQ5yZ7M/ip2oiq7wuJljWz2SBwO BztzBj14Pc3RYFyLwmhF2pGPyl6IZ0OssML+q+aicO30ZbUGfxwbGeKTrGPWdiFj25Qk 9LqHGRcKLJYC8imqsVml2id7Qb0TuC3A77TNxQwb5a3B/2BAGXJwMQ6Lty7aaJuHTqaq eQtA== 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=O58/NX1IZ5N1NsjCSGJf7yl9B5xM2yhJshLYbTitfTw=; b=VsNYI41xfBzWP6DdJB4orTq1u6y0Q+tNHBwmnrUMj38fgBgtAJRNFsURNtpfZg02Lw sP94fMLQ8gbRpNcJjN5dkGV2PkPNNF8KijQmmrALYzK+vLmOkGoFy5HJpF5VrW4qPmk+ pKMZm0ZotGGFT+p4PnmlW1Iwp4hBQ2C6KvNkVznHQfxWjnAX4Y8rR+I1Ib7QEBKR/w1d YN66eVjd5q+lha6WzRoHpRiDHC5Kzegs/Dc7PKei0a1TIPPTfTMqPkgVkKRBJQIOn1Ss FDIYfNWLq+poT4nPfz0BCWawf0xiJeS7SodllnwUBqEU3T0yc2YtTZvHRRnGhUxhKfxg alYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=ePEeLMGO; 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 p14-20020aa79e8e000000b005935dae4234si605290pfq.306.2023.03.10.14.06.02; Fri, 10 Mar 2023 14:06:16 -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=ePEeLMGO; 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 S232009AbjCJVo3 (ORCPT + 99 others); Fri, 10 Mar 2023 16:44:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231623AbjCJVnu (ORCPT ); Fri, 10 Mar 2023 16:43:50 -0500 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 853372E82E for ; Fri, 10 Mar 2023 13:43:11 -0800 (PST) Received: by mail-pl1-x649.google.com with SMTP id p10-20020a170902e74a00b0019ec1acba17so3444727plf.0 for ; Fri, 10 Mar 2023 13:43:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678484580; 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=O58/NX1IZ5N1NsjCSGJf7yl9B5xM2yhJshLYbTitfTw=; b=ePEeLMGOuIYsC67LI0QfBPXgJubkE/M9f8ZKhDvPBktm//0MigobdfesQdehm+HoIF 4k7Q3bKwvt4tdL0bpEstVgMdYaxqxFitCqcT8J76JdedPjiP9uHj8At1j2Ep1bt+Qyss 1Y0V1Yw52nFYMpBt+LAtY15BwdEk4PljV3VOvdGy3uJqoBF69H3D0f9I2ocnJ0d52EVG oDg2W/79S92oQL08l/DdZG+9/MjLj6wNEP+wMwKX85bWLniR63oOFp4S7QZBRJR360Xb n/tY2XUTdNDY9ZWkrRyfL8CsOVWQHwl6hgT1bhDFQZmWMokic4FqhoXv6e9RbeEtLW4f pARQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678484580; 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=O58/NX1IZ5N1NsjCSGJf7yl9B5xM2yhJshLYbTitfTw=; b=OGGHP6ZuA1H7Hnvzo4P0FgN5SBPvYlLAf9PD1JRF6Gy46RH3o7JVPxMNjOgyFl5seM 2Q+JCUWJW7RRyrseA7+tBW6RIjnzYxN3yTT3RBHeTcX64Vi30KObx0f3zhf76JFooxHf Tqc0eFxPG/zVnBx1OTujUiL7Mu4luLIMyS+qzIjJBZIf/iu+CD5w/Z4yd9Gb2MSo5VcY QbohRacHf8UZUTNYINSaRPJs6xkVTgdHhNytWZzHrCKoXlAKuQFQaVkK8OpxXfmgpJYg eS/BpgnW8yzGrmm90mdoR8oLZKirL3X0o+qADWocPlhVhnG1Bwh8QUNpgQaVV7ipblGV ucEQ== X-Gm-Message-State: AO0yUKUTocTh5NSYqtS6oXn7AawTRPNStoQkFTOnxRwmG2dybHZaSSeA juXxZC1vt/79Ndu0B/1rry04RZJ1u9k= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:714b:b0:19f:22b3:508d with SMTP id u11-20020a170902714b00b0019f22b3508dmr187900plm.11.1678484580595; Fri, 10 Mar 2023 13:43:00 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 10 Mar 2023 13:42:26 -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-13-seanjc@google.com> Subject: [PATCH v2 12/18] x86/virt: Drop unnecessary check on extended CPUID level in cpu_has_svm() 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?1760020111007060127?= X-GMAIL-MSGID: =?utf-8?q?1760020111007060127?= Drop the explicit check on the extended CPUID level in cpu_has_svm(), the kernel's cached CPUID info will leave the entire SVM leaf unset if said leaf is not supported by hardware. Prior to using cached information, the check was needed to avoid false positives due to Intel's rather crazy CPUID behavior of returning the values of the maximum supported leaf if the specified leaf is unsupported. Fixes: 682a8108872f ("x86/kvm/svm: Simplify cpu_has_svm()") Signed-off-by: Sean Christopherson --- arch/x86/include/asm/virtext.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/x86/include/asm/virtext.h b/arch/x86/include/asm/virtext.h index a27801f2bc71..be50c414efe4 100644 --- a/arch/x86/include/asm/virtext.h +++ b/arch/x86/include/asm/virtext.h @@ -39,12 +39,6 @@ static inline int cpu_has_svm(const char **msg) return 0; } - if (boot_cpu_data.extended_cpuid_level < SVM_CPUID_FUNC) { - if (msg) - *msg = "can't execute cpuid_8000000a"; - return 0; - } - if (!boot_cpu_has(X86_FEATURE_SVM)) { if (msg) *msg = "svm not available";