From patchwork Wed May 3 16:08:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 89781 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1454250vqo; Wed, 3 May 2023 09:24:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ79FhgxFutMjrmlOMbTDJQRf9ztl+klqBDlESUeOQ3F8IA6lw0PC2pk01kJQ972C37uoPzq X-Received: by 2002:a05:6a20:2302:b0:f2:13cc:2914 with SMTP id n2-20020a056a20230200b000f213cc2914mr20139959pzc.16.1683131090607; Wed, 03 May 2023 09:24:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683131090; cv=none; d=google.com; s=arc-20160816; b=iY8h6JbwJjs1swhbaFpQFa4WM2cCXKjsZghNWuA+XBh3ZiFDDky5+W9428HgCesSGi YpDKqrp4BSqOowPa+Y82Hrjv43YB5Mbk9PELfATEQS+Vd+dmWoAvgftjVa+qcSbRvfiO w0VCr61bj8wTfv2RJAsJOmbIuCXAfLDOsf+AsP54tTTpzuHJkMsAFD6zz3d62QPjO1NH bGKCEJRoyDt6wThZ53gPvGnQap9DBBXI1vqMnGNTw7Q2g5u5Z7RVqJZzP2ZpC63YJlV9 jv43b9UHbGR+MsJhLeZhgksxiakKqH0suaKzQFCva8SisDfu1rQnbvYLx7TBlm/XGagP BkzA== 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=UpESMHY3dXiGunARd4Ma9HdMNvInCBKyCNCSaFRW6Ms=; b=M+h8sYx6dAQ1kyXdL2qYsgUjYIwTedBFeCulC+TnqOlU8PrjcIRaOccjpPXRkAOdob /3dab9oZWirADI4xy771aXatJ6iuCCUsnHqyd5qzgqHvEEAHhZT4Qt7Um0mXCmDS36X0 zNvgvrbcm5AsJLxM0RuzFSEAe0tX3wJZG/UxI106sdHrtqvYWqtjeCYQrHMU80cB2pfb a+kYpb9PvuH2SH0Nxp/p9y/o31kJZNWQ8/b+4150GclsD3Y0NVFUoPtVQrgPuaLyEBSe SY61NX/RT0nlY9yvIihdYjLhckHwmIRN5e6uhSHSJjgVx4bHo4jbK/G7SyxuiyvqRWMh WvRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=wWTeQSe9; 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 k186-20020a633dc3000000b0051b53255837si448109pga.508.2023.05.03.09.24.37; Wed, 03 May 2023 09:24:50 -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=wWTeQSe9; 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 S230306AbjECQI5 (ORCPT + 99 others); Wed, 3 May 2023 12:08:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230425AbjECQIu (ORCPT ); Wed, 3 May 2023 12:08:50 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31A497282 for ; Wed, 3 May 2023 09:08:48 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-b9a7553f95dso10691475276.2 for ; Wed, 03 May 2023 09:08:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683130127; x=1685722127; 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=UpESMHY3dXiGunARd4Ma9HdMNvInCBKyCNCSaFRW6Ms=; b=wWTeQSe9JCCJ9pUvrrbudQKOTYO/i38kVcvsNhjPCCSRQyOR13ZqBKkCsMKvJO8ipA AUAokED4NY2vc/H9pYe41Pg+X5hIPEcIQpIJWr5NnqmigGPerJ3MtUKWbPYztN+VUJrr mnJUA/qxNDAR0r0LekD481sPNikHnSVY+cqmYJvxgd6hKMwNbcrUoOTlCKNA6uNMWSbE Q0BCvmEIiP24OXh3p2PhMIKcMV4Y4BqTZdm9ZSzMqEMhkrrlKNqVwXQ+sHqtsetsvlRc TZQdxlteiV2+NmkMidg9DbvStomj13XW9N1RgcA+4728Emo1iRtpcSbPxqfI6jxMZRnW JSqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683130127; x=1685722127; 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=UpESMHY3dXiGunARd4Ma9HdMNvInCBKyCNCSaFRW6Ms=; b=cqcjSbELncpiC1u/ZV33xDwzZRqeNWRe2/14+O23Dw0G1Rg3/fQ1jm9qrMTjpnD3O4 LogGdVLztOEOu6g4jCeEwJlmEAZE3FXsWt52otlzcMMwBDs86VotjgwtHc04mjZbqIgy oUCfN+T+ITQqm6S2Qy3RtaV5Rj2KLz46K1y4p1LS3o4IwyHXBJtYhuJEsp4wRQXPyVRg vDzBr2EyTOLBLuXqEAoHx0TFgqjKw3K0xi1QPqZ5fM+zh8IgBCWeM6/t4HsEkRPkgxgb h1QqLQgSL4Iwr2rPunwkILhQN0wZxQ2D59nuQHf6Cx9E6j7vHrr7baKWosk0ulcl3BpR pPIQ== X-Gm-Message-State: AC+VfDwqigYrvHnAcqF4h514RWrSK2t8y+2grprWAaFnCgW/GTil1Esi WMRRVaBQp2O2oyWZZjAb1NKmd5lxRJk= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:5e03:0:b0:b9e:91e0:ea0a with SMTP id s3-20020a255e03000000b00b9e91e0ea0amr2705234ybb.13.1683130127369; Wed, 03 May 2023 09:08:47 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 3 May 2023 09:08:38 -0700 In-Reply-To: <20230503160838.3412617-1-seanjc@google.com> Mime-Version: 1.0 References: <20230503160838.3412617-1-seanjc@google.com> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog Message-ID: <20230503160838.3412617-4-seanjc@google.com> Subject: [PATCH v2 3/3] KVM: x86: Open code supported XCR0 calculation in kvm_vcpu_after_set_cpuid() From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Kai Huang 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764890866779865969?= X-GMAIL-MSGID: =?utf-8?q?1764890866779865969?= Drop cpuid_get_supported_xcr0() now that its bastardized usage in __kvm_update_cpuid_runtime() is gone, and open code the logic in its sole caller, kvm_vcpu_after_set_cpuid(). No functional change intended. Reviewed-by: Kai Huang Tested-by: Kai Huang Signed-off-by: Sean Christopherson --- arch/x86/kvm/cpuid.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 0c9660a07b23..491c88e196c1 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -234,21 +234,6 @@ void kvm_update_pv_runtime(struct kvm_vcpu *vcpu) vcpu->arch.pv_cpuid.features = best->eax; } -/* - * Calculate guest's supported XCR0 taking into account guest CPUID data and - * KVM's supported XCR0 (comprised of host's XCR0 and KVM_SUPPORTED_XCR0). - */ -static u64 cpuid_get_supported_xcr0(struct kvm_cpuid_entry2 *entries, int nent) -{ - struct kvm_cpuid_entry2 *best; - - best = cpuid_entry2_find(entries, nent, 0xd, 0); - if (!best) - return 0; - - return (best->eax | ((u64)best->edx << 32)) & kvm_caps.supported_xcr0; -} - static void __kvm_update_cpuid_runtime(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *entries, int nent) { @@ -323,8 +308,16 @@ static void kvm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu) kvm_apic_set_version(vcpu); } - vcpu->arch.guest_supported_xcr0 = - cpuid_get_supported_xcr0(vcpu->arch.cpuid_entries, vcpu->arch.cpuid_nent); + /* + * Calculate guest's supported XCR0 taking into account guest CPUID data and + * KVM's supported XCR0 (comprised of host's XCR0 and KVM_SUPPORTED_XCR0). + */ + best = kvm_find_cpuid_entry_index(vcpu, 0xd, 0); + if (!best) + vcpu->arch.guest_supported_xcr0 = 0; + else + vcpu->arch.guest_supported_xcr0 = (best->eax | ((u64)best->edx << 32)) & + kvm_caps.supported_xcr0; /* * FP+SSE can always be saved/restored via KVM_{G,S}ET_XSAVE, even if