Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp809253imu; Wed, 23 Jan 2019 06:08:08 -0800 (PST) X-Google-Smtp-Source: ALg8bN6dlI6zvmxn3pQQ6Hr1Z97L8uHBjGbTrj3PHutD5153/EbM3PYaDoOhMobOTZig9BWacmX7 X-Received: by 2002:a63:6103:: with SMTP id v3mr2017525pgb.75.1548252488412; Wed, 23 Jan 2019 06:08:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548252488; cv=none; d=google.com; s=arc-20160816; b=cZuJehAO+qgKCiydPyF4XN4N28zjYexZd6l3KdYNewU96YHATQCvmvrIr7+/WSKRrZ h/4j2jOPKlJB4hY72/kwVP2a6pqdFfwCR+ElC9nerjr+huZ4hczU3pg1kDTAud8rDMuw dRhC6AvvvJHk8mkuzAU7dyvLWixuA8ixleO7ZITRwCvTqqpKYQcCEgucmnrdGtzOcc55 ooyWypwx60MVQLCyFBU7IP1n6L4u3PwTM9vfFPK3bzGbQvmwbNNM1PAVz5iykkuCB9EV l8ZOai14fz4hd35GsP/gYWFRkhQ6pldU//TTsFIRTw/p0mWh+IWtC33nKROU4UPRIUWS P0pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=+fJGhttCvzp2TNTYD2BUJi3izAsfvWeLdD+PFy1s/AQ=; b=Yhw1LF4yeMry8KXncmf0FujdmpnDy5LAus0t7p4SCGn6i33Ms6zRNedRMyq+FgFXPI u1EL29WAYHJkSW7oshk+Am/wrXWugiuPG8H4pNsY44MxgQk8vmCaHlpMXQsWP86d0lJr VBv9vr2AK8+zRj+2JDJp1HwBg2q3OupjlX78Gpu1rmRfut8+rVHbKww40UTX50RMkhpj IEDH+kK+PR3VHJMXpKpsjkZiTWkj1RwViqwLk8z8HW984BiG9ahGJiy2uS40wKgEGxD4 JPYDNMygB5jACUkqnn9mCXBzEwRsNIxNd/TlM9cyb6kVg2sOLs6OhrI8NoCu6mzZpGS6 IhSQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k22si18769620pls.14.2019.01.23.06.07.53; Wed, 23 Jan 2019 06:08:08 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726963AbfAWOGf (ORCPT + 99 others); Wed, 23 Jan 2019 09:06:35 -0500 Received: from mga17.intel.com ([192.55.52.151]:53944 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726236AbfAWOGc (ORCPT ); Wed, 23 Jan 2019 09:06:32 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Jan 2019 06:06:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,511,1539673200"; d="scan'208";a="140622255" Received: from local-michael-cet-test.sh.intel.com ([10.239.159.128]) by fmsmga001.fm.intel.com with ESMTP; 23 Jan 2019 06:06:30 -0800 From: Yang Weijiang To: pbonzini@redhat.com, rkrcmar@redhat.com, sean.j.christopherson@intel.com, jmattson@google.com, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, mst@redhat.com, yu-cheng.yu@intel.com, yi.z.zhang@intel.com, hjl.tools@gmail.com Cc: weijiang.yang@intel.com, Zhang Yi Z Subject: [PATCH v2 4/7] KVM:CPUID: Fix xsaves area size calculation for CPUID.(EAX=0xD,ECX=1). Date: Wed, 23 Jan 2019 04:59:06 +0800 Message-Id: <20190122205909.24165-5-weijiang.yang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190122205909.24165-1-weijiang.yang@intel.com> References: <20190122205909.24165-1-weijiang.yang@intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org According to latest Software Development Manual vol.2/3.2, for CPUID.(EAX=0xD,ECX=1), it should report xsaves area size containing all states enabled by XCR0|IA32_MSR_XSS. Signed-off-by: Zhang Yi Z Signed-off-by: Yang Weijiang --- arch/x86/kvm/cpuid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index dbeb4e7904eb..67b464d1d749 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -136,7 +136,8 @@ int kvm_update_cpuid(struct kvm_vcpu *vcpu) best = kvm_find_cpuid_entry(vcpu, 0xD, 1); if (best && (best->eax & (F(XSAVES) | F(XSAVEC)))) - best->ebx = xstate_required_size(vcpu->arch.xcr0, true); + best->ebx = xstate_required_size(vcpu->arch.xcr0 | + kvm_supported_xss(), true); /* * The existing code assumes virtual address is 48-bit or 57-bit in the -- 2.17.1