Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753164AbaLDIYi (ORCPT ); Thu, 4 Dec 2014 03:24:38 -0500 Received: from mga11.intel.com ([192.55.52.93]:14908 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752138AbaLDIYg (ORCPT ); Thu, 4 Dec 2014 03:24:36 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,514,1413270000"; d="scan'208";a="642209486" From: Wanpeng Li To: Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Wanpeng Li Subject: [PATCH 2/4] kvm: cpuid: fix the size of xsaves area Date: Thu, 4 Dec 2014 16:24:26 +0800 Message-Id: <1417681468-7165-2-git-send-email-wanpeng.li@linux.intel.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1417681468-7165-1-git-send-email-wanpeng.li@linux.intel.com> References: <1417681468-7165-1-git-send-email-wanpeng.li@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The section of CPUID(EAX=0xd, ECX=1) in the spec which commit f5c2290cd01e (KVM: cpuid: mask more bits in leaf 0xd and subleaves) mentioned is older than SDM. EBX: Bits 31-00: The size in bytes of the XSAVE area containing all states enabled by XCR0|IA32_XSS. The the value of EBX should represent the size of XCR0 related XSAVE area since IA32_XSS is not used currently. Signed-off-by: Wanpeng Li --- arch/x86/kvm/cpuid.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 646e6e8..70f0fa1 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -477,7 +477,10 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, do_cpuid_1_ent(&entry[i], function, idx); if (idx == 1) { entry[i].eax &= kvm_supported_word10_x86_features; - entry[i].ebx = 0; + if (entry[i].eax & F(XSAVES)) + entry[i].ebx = xstate_required_size(supported, true); + else + entry[i].ebx = xstate_required_size(supported, false); } else { if (entry[i].eax == 0 || !(supported & mask)) continue; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/