From patchwork Fri Jul 21 20:18:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 124098 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp468133vqg; Fri, 21 Jul 2023 14:14:58 -0700 (PDT) X-Google-Smtp-Source: APBJJlHXzgbo1ul4njWN3/t1LrHV61IDUW0ZAsYJA7oAHupRa0Z7pg0AbQ7Myv+//97fAAfCZHZz X-Received: by 2002:a17:907:77d1:b0:99b:65fa:fc24 with SMTP id kz17-20020a17090777d100b0099b65fafc24mr3109953ejc.36.1689974098226; Fri, 21 Jul 2023 14:14:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689974098; cv=none; d=google.com; s=arc-20160816; b=Xe2ytTocRFSoXwWz376oBlGGCIUe7phkLwUcV/wraS6DhX8JqfdSjxukr0uG4oEBQA ZxrlBZKTeCTfTp1txfZ6yTS++5HB6ePSdMNr3FhESphQvEFsiLCz2Dgp0hgaeD/239/k cS+MHUVwaVUPqD1DeUmhlzn0QnfXfHxE7oUD/e8pousLyLdzCH4onAlN/0GZRv1BAOgN 2T+EQr4G/GZkZYLFR7B7Y1MIBc2Vj63MYwSXMpUkvI0tJNGzIQ6lbfY0yoO6+y25BpAl +X+IJIOO1ZKakt7lFJLWuFwSR2zEfw0fTb61shOpKRzwmnT/SGWiawjlAMJv8yP2iQVC DN3A== 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=crVRYHKBiix+9k25sqJYwYQ0PSqShcL9j1oDpcsA6Dw=; fh=GitwJflddDxrBBVhnTGEzIZYOBTU7RKSqL+OyCDv/0M=; b=W+KLPszCO3PQC1VA5/pDm5bDXnGen/rQcIRupUEv1y4VGG5kxrtVaBba9aQVByKE0a p/Heq1mav7EJSWSyyx+v/Iwwd6G3fcMEr+wB5OqAHbObaaza4hE/cf/djrDsPgPosgm+ BOb9iwQCtXOqEIlgkEbgIvPGpZmFLbUBIO8ZBDWTiusVyuvAsWnaQDWxi92NYmkW5R1x hjmB/dnt2H+NgvcIYV8JWPxqY1i0904RfeXmxVFVg+WKx+h0InKjLN8R5hFiiPWoTnMI 21E3uH2E3rC13RyOYmIj7SQzNEVALwechqbvnmrKvVVcFfRpMvSfu7q6bd14b9uGCLQ9 +Jdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=RBMLDqiH; 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 l17-20020a1709065a9100b00992f45c9350si2579256ejq.1018.2023.07.21.14.14.34; Fri, 21 Jul 2023 14:14:58 -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=RBMLDqiH; 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 S230476AbjGUUUK (ORCPT + 99 others); Fri, 21 Jul 2023 16:20:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231235AbjGUUTx (ORCPT ); Fri, 21 Jul 2023 16:19:53 -0400 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 5B2223C0F for ; Fri, 21 Jul 2023 13:19:30 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-cbcffb18afeso2290121276.2 for ; Fri, 21 Jul 2023 13:19:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1689970769; x=1690575569; 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=crVRYHKBiix+9k25sqJYwYQ0PSqShcL9j1oDpcsA6Dw=; b=RBMLDqiHzxUqzpaXDgFLDPjpgSNfDoJR5XmTJs6L39FY207ornlD4wCggqqn+VPvnX obC6S0TQlHfM4bAlkMqGJoQfHMjSkF5rRIvGYLw0fKnXaYAG4jlkOuczjYzK20mkYAdj 2YUb2v/3KZQC34lVsFniXRfYO+rQiS7vKyeoW2e8jLhiydA8oIrl9Lk83BpOAAzGHwsS yQz2W/AOA95nN24PfMg8quSvL9++qNmgUOm8rU4FPZqMM/ZKEf4dQ+KjsJIEJm7VODr3 hN10+m9kznfjnNbZSm7xnVwZJq9pQnA6bgdEHbuu2VCvgb2oKlx6c+qOmdjYfoKCXoAa vzwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689970769; x=1690575569; 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=crVRYHKBiix+9k25sqJYwYQ0PSqShcL9j1oDpcsA6Dw=; b=CPKSZsjCld4Q0qE63aXH/2q91ntZg5q+Uj8EtdLI6rSWV7rKUx8R6zUCNIpKdCUu+Q shuCBuwvM8YNumZ0OMpPJI1oKQ+5WoUCNQzdea4cfssc0hofbA5Peb2VShm6bYcflRsS //7UvyDGbsOFaQZ7zT1+SMh1RwzjrvJKHiFGtmLxNYC/4BFxst4LBSy9v+c9N1Rr7uo9 nVWZ2w1rotvUtoQxQkR2YgGhQgKwPvwQduU4znBf6iWW1m8B/SwpLD3gFIzfGzj7W/mF JMf0ryDl0VgHWJZBSiDzoglLjfUURwU/9/n7zo0dAC0omuE3KbNkYklQI50Ml0B/GDFm NGFQ== X-Gm-Message-State: ABy/qLYQLkWN19viOfmaHB3I4+UgnPmmMNq4x7nkvgdcVsjvwXgNRGl2 YvAOEuYZE4/e3K53x9JRv2Yy/P2PDJY= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:188b:0:b0:cab:e42c:876b with SMTP id 133-20020a25188b000000b00cabe42c876bmr18130yby.3.1689970768563; Fri, 21 Jul 2023 13:19:28 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 21 Jul 2023 13:18:52 -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-13-seanjc@google.com> Subject: [PATCH v4 12/19] 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_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=ham 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: 1772066279927829860 X-GMAIL-MSGID: 1772066279927829860 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";