From patchwork Sat Jul 29 01:15:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 128002 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp842917vqg; Fri, 28 Jul 2023 21:36:05 -0700 (PDT) X-Google-Smtp-Source: APBJJlG5SIPIozmWJHHFXo8MnQniR6Dt9VaF9UyMM9vhcvQ4/riYOhM1ShCecUjfwUQfFx+YoWo7 X-Received: by 2002:a05:6a20:7d8a:b0:135:6ef6:17f with SMTP id v10-20020a056a207d8a00b001356ef6017fmr4494807pzj.43.1690605365462; Fri, 28 Jul 2023 21:36:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690605365; cv=none; d=google.com; s=arc-20160816; b=p7at9ZDUzF0i6wL3hy3sBAEa1H5wYG9GelTgFElvznXdj47XHxatErwEFfpQQsnBtx 9Y3Vb//wTUF62s2NkRws2FOtYjfngjiiyfRv3/s2JNStkxNv5ik5AYSy37vYn6i4YO6S V8JHd5vwS0jZ2fH5Z/XJzPyK7MAJ9/GR57CMedDvARHcYBjsHa59qG5ML9z0hGz1SCmC 1B4IKIHTSHVEr4hxVax3KikQiYvVowKoYKGX/Ia7beNS7eQwsAuNDRqiFZfI/z69HQDw X65TRcyvfMtv/EokTJHA6CPrfzG3tsOLMjLpp0nIB+6l/0scSM+QjitoHXwks1WCSI0m aiOg== 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=/Va/MWC5DRY46k94Uc8qLWdNEj91Xq1TuiBAGty68F8=; fh=8Mc5uyvARtESo7rBGdZxKoor3rxsuqGYA/iIBYLTTUU=; b=u4YKlz73SZRBHBbAsPN0VcmAh9sA2UPvWif1WY/93QRkfQdmrge5FNHtNp+FGuyrzX 4zR4pWGnOlz14Ye3RmKB5ptirGztrupPGN07nY1SfMPeke7Qxn9F8KXSuDqGFXWFDDky ohA+GuhUP25TKUml2ILgostCKE3dL5socW9bSUN/Ck/N0zMHiBMY8hnDlAHuLvPhb/WK L33Ffoe5esJ5MQ1GbTybvlF7qU9IJUtz6FSbRA8qH2/fGHFL3yAaLT4nOXCP1+psL8ij tfCL9/G1G/1mgugQ7+qH3Zynvppjdb7Uubla6CG5uhoQ3R1WoUgDrRsB/ZxFfv3iavLR VydA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=yRqDe6hn; 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 l65-20020a639144000000b005642019ea7csi1714102pge.864.2023.07.28.21.35.52; Fri, 28 Jul 2023 21:36:05 -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=yRqDe6hn; 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 S237507AbjG2BRi (ORCPT + 99 others); Fri, 28 Jul 2023 21:17:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237394AbjG2BRN (ORCPT ); Fri, 28 Jul 2023 21:17:13 -0400 Received: from mail-pl1-x64a.google.com (mail-pl1-x64a.google.com [IPv6:2607:f8b0:4864:20::64a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DC3C44B1 for ; Fri, 28 Jul 2023 18:16:48 -0700 (PDT) Received: by mail-pl1-x64a.google.com with SMTP id d9443c01a7336-1bbd4f526caso20313835ad.3 for ; Fri, 28 Jul 2023 18:16:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1690593392; x=1691198192; 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=/Va/MWC5DRY46k94Uc8qLWdNEj91Xq1TuiBAGty68F8=; b=yRqDe6hnQT3wYKRPtH+TorJeNAyO7rJdwfhdzAa8+zEHsyF8WvTsItjBPD+rKS0Bre AWLVyXBfQ54MW4JkJ0PV5hWRO1Fxd0rFnJdzJfj+6026Wy296jACG2ypQTWOPOTxnm58 hc2QwMRTYw5zBjGNrKdbTgeJQRTl0AXfMn7T05nG5aiuEMzUZmIZWtCkP+omOr++FrxB L7ENLl09CAGiAgDkJr/jQ27vcqMUjXRP0JP7gCAc28Rd7+WWeW9u2YkmTg8Sqqf2cTBy D4BXD3n8j8znlME2TL5r/kHdBzikHOsATdn4giB+mgOwpVwUEiQ07zQ9RlC8q4nywObi deTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690593392; x=1691198192; 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=/Va/MWC5DRY46k94Uc8qLWdNEj91Xq1TuiBAGty68F8=; b=iw/avOnQfsE3oldf3I1QPI3gdaor0qYrJ4TLXfBmDHeF14/YylY/w/ju45HKdqHlCu Z1U542kKk9cvDo9AiCLl/TDIp/ZmiSfD8JFqAuPz48WyxZOBv6IAFki6nBrIt9MwLUuk xtfmWXkDNkMLADw6tTlO5Dz5SEYW0qgTMlsZLwXwH6CD4qQtcvgM7e9QUIpJjFxAMGdN E74aOK9G3VyNa2kPpuSLeO9nLv6nCuyC2oWtUVi3FAPKFW9luX+4Ak/Ytt/tvv3k22uB p1Lb2mnJclJGmbs3RJnLypsp2cr5K4HfoVReGqWV83CpO33S6ACtnfq8sQDVrOQiqmcF xUlA== X-Gm-Message-State: ABy/qLbFNYZSunySjFFYeJl7R4h3pMgLgJUojwcjwjNoYUDzx5NbJ8MX sALeDjI9m+lhTJNzpKrOf9Ppm719XkE= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:c409:b0:1b8:2055:fc1f with SMTP id k9-20020a170902c40900b001b82055fc1fmr12348plk.2.1690593392373; Fri, 28 Jul 2023 18:16:32 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 28 Jul 2023 18:15:57 -0700 In-Reply-To: <20230729011608.1065019-1-seanjc@google.com> Mime-Version: 1.0 References: <20230729011608.1065019-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.487.g6d72f3e995-goog Message-ID: <20230729011608.1065019-11-seanjc@google.com> Subject: [PATCH v2 10/21] KVM: VMX: Check KVM CPU caps, not just VMX MSR support, for XSAVE enabling From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Vitaly Kuznetsov Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Maxim Levitsky 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=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: 1772728211547503601 X-GMAIL-MSGID: 1772728211547503601 Check KVM CPU capabilities instead of raw VMX support for XSAVES when determining whether or not XSAVER can/should be exposed to the guest. Practically speaking, it's nonsensical/impossible for a CPU to support "enable XSAVES" without XSAVES being supported natively. The real motivation for checking to kvm_cpu_cap_has() is to allow using the governed feature's standard check-and-set logic. Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/vmx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 307d73749185..e358e3fa1ced 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -7718,7 +7718,7 @@ static void vmx_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu) * to the guest. XSAVES depends on CR4.OSXSAVE, and CR4.OSXSAVE can be * set if and only if XSAVE is supported. */ - vcpu->arch.xsaves_enabled = cpu_has_vmx_xsaves() && + vcpu->arch.xsaves_enabled = kvm_cpu_cap_has(X86_FEATURE_XSAVES) && boot_cpu_has(X86_FEATURE_XSAVE) && guest_cpuid_has(vcpu, X86_FEATURE_XSAVE) && guest_cpuid_has(vcpu, X86_FEATURE_XSAVES);