From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5BBBAC38A2A for ; Fri, 8 May 2020 23:37:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 333C021974 for ; Fri, 8 May 2020 23:37:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728361AbgEHXh4 (ORCPT ); Fri, 8 May 2020 19:37:56 -0400 Received: from mga18.intel.com ([134.134.136.126]:18506 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727934AbgEHXh4 (ORCPT ); Fri, 8 May 2020 19:37:56 -0400 IronPort-SDR: G5QTfzukAK/xxcAVOFUpuQODtBlWQmp+H4pyWS/9qRXKNpgvjz555j4Y/ATYLHZmVKCKhuPgkB arynb8vK8VuQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2020 16:37:55 -0700 IronPort-SDR: nskYbpXcg3aL2xjCO5ZbZPqNER0UOODRipa26VvaWqS/3iYCRsu89UzDueaSj+1jFAmhzvCK+c T3Mkc/R1YfDg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,369,1583222400"; d="scan'208";a="279184846" Received: from sjchrist-coffee.jf.intel.com ([10.54.74.152]) by orsmga002.jf.intel.com with ESMTP; 08 May 2020 16:37:54 -0700 From: Sean Christopherson To: Paolo Bonzini Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Xiaoyao Li Subject: [PATCH] KVM: x86: Restore update of required xstate size in guest's CPUID Date: Fri, 8 May 2020 16:37:49 -0700 Message-Id: <20200508233749.3417-1-sean.j.christopherson@intel.com> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Restore a guest CPUID update that was unintentional collateral damage when the per-vCPU guest_xstate_size field was removed. Cc: Xiaoyao Li Fixes: d87277414b851 ("kvm: x86: Cleanup vcpu->arch.guest_xstate_size") Signed-off-by: Sean Christopherson --- There's nothing more thrilling than watching bisect home in on your own commits, only to land on someone else's on the very last step. arch/x86/kvm/cpuid.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 35845704cf57a..cd708b0b460a0 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -84,11 +84,13 @@ int kvm_update_cpuid(struct kvm_vcpu *vcpu) kvm_read_cr4_bits(vcpu, X86_CR4_PKE)); best = kvm_find_cpuid_entry(vcpu, 0xD, 0); - if (!best) + if (!best) { vcpu->arch.guest_supported_xcr0 = 0; - else + } else { vcpu->arch.guest_supported_xcr0 = (best->eax | ((u64)best->edx << 32)) & supported_xcr0; + best->ebx = xstate_required_size(vcpu->arch.xcr0, false); + } best = kvm_find_cpuid_entry(vcpu, 0xD, 1); if (best && (cpuid_entry_has(best, X86_FEATURE_XSAVES) || -- 2.26.0