From patchwork Thu Dec 4 11:11:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wanpeng Li X-Patchwork-Id: 5437701 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 83B069F319 for ; Thu, 4 Dec 2014 11:32:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BE71120266 for ; Thu, 4 Dec 2014 11:32:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D7ADF20353 for ; Thu, 4 Dec 2014 11:32:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754101AbaLDLbg (ORCPT ); Thu, 4 Dec 2014 06:31:36 -0500 Received: from mga01.intel.com ([192.55.52.88]:40557 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754010AbaLDLbe (ORCPT ); Thu, 4 Dec 2014 06:31:34 -0500 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP; 04 Dec 2014 03:31:34 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,862,1389772800"; d="scan'208";a="424996383" Received: from kernel.bj.intel.com ([10.238.154.157]) by FMSMGA003.fm.intel.com with ESMTP; 04 Dec 2014 03:21:14 -0800 From: Wanpeng Li To: Paolo Bonzini Cc: Nadav Amit , , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Wanpeng Li Subject: [PATCH v2 2/4] kvm: cpuid: fix the size of xsaves area Date: Thu, 4 Dec 2014 19:11:08 +0800 Message-Id: <1417691470-5221-2-git-send-email-wanpeng.li@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1417691470-5221-1-git-send-email-wanpeng.li@linux.intel.com> References: <1417691470-5221-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 --- v1 -> v2: * add F(XSAVEC) check 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..5b78e9b 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) | F(XSAVEC))) + 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;