From patchwork Thu Dec 4 08:24:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wanpeng Li X-Patchwork-Id: 5436421 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 01C159F1C5 for ; Thu, 4 Dec 2014 08:25:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4B330202B8 for ; Thu, 4 Dec 2014 08:25:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 524D120295 for ; Thu, 4 Dec 2014 08:25:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753103AbaLDIYh (ORCPT ); Thu, 4 Dec 2014 03:24:37 -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 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 04 Dec 2014 00:24:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,514,1413270000"; d="scan'208";a="642209486" Received: from unknown (HELO vt-hsw2.tsp.org) ([10.239.48.107]) by fmsmga002.fm.intel.com with ESMTP; 04 Dec 2014 00:24:34 -0800 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: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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;