From patchwork Mon Feb 8 17:26:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 8253201 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 93BD6BEEE5 for ; Mon, 8 Feb 2016 17:29:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C28D9201EC for ; Mon, 8 Feb 2016 17:28:59 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E031D2014A for ; Mon, 8 Feb 2016 17:28:58 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aSpZq-0000ls-FL; Mon, 08 Feb 2016 17:26:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aSpZo-0000lZ-KE for xen-devel@lists.xen.org; Mon, 08 Feb 2016 17:26:16 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id E5/C0-09708-7BFC8B65; Mon, 08 Feb 2016 17:26:15 +0000 X-Env-Sender: prvs=839174cdf=Andrew.Cooper3@citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1454952373!14623255!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4206 invoked from network); 8 Feb 2016 17:26:15 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-11.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 8 Feb 2016 17:26:15 -0000 X-IronPort-AV: E=Sophos;i="5.22,417,1449532800"; d="scan'208";a="336806452" From: Andrew Cooper To: Xen-devel Date: Mon, 8 Feb 2016 17:26:10 +0000 Message-ID: <1454952370-31432-1-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1454679743-18133-1-git-send-email-andrew.cooper3@citrix.com> References: <1454679743-18133-1-git-send-email-andrew.cooper3@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Andrew Cooper , Jan Beulich Subject: [Xen-devel] [PATCH v2.5 31/30] Fix PV guest XSAVE handling with levelling X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 Will be folded into appropriate patches in v3. --- xen/arch/x86/cpu/amd.c | 15 +++++++++++++-- xen/arch/x86/domctl.c | 15 +++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index deb98ea..3e345fe 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -265,7 +265,15 @@ static void __init noinline amd_init_levelling(void) edx &= m->edx; } - cpuidmask_defaults._1cd &= ((uint64_t)ecx << 32) | edx; + /* Fast-forward bits - Must be set. */ + if (ecx & cpufeat_mask(X86_FEATURE_XSAVE)) + ecx |= cpufeat_mask(X86_FEATURE_OSXSAVE); + edx |= cpufeat_mask(X86_FEATURE_APIC); + + /* Allow the HYPERVISOR bit to be set via guest policy. */ + ecx |= cpufeat_mask(X86_FEATURE_HYPERVISOR); + + cpuidmask_defaults._1cd = ((uint64_t)ecx << 32) | edx; } if ((levelling_caps & LCAP_e1cd) == LCAP_e1cd) { @@ -281,7 +289,10 @@ static void __init noinline amd_init_levelling(void) edx &= m->ext_edx; } - cpuidmask_defaults.e1cd &= ((uint64_t)ecx << 32) | edx; + /* Fast-forward bits - Must be set. */ + edx |= cpufeat_mask(X86_FEATURE_APIC); + + cpuidmask_defaults.e1cd = ((uint64_t)ecx << 32) | edx; } if ((levelling_caps & LCAP_7ab0) == LCAP_7ab0) { diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index f06bc02..613bb5c 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -103,6 +103,15 @@ static void update_domain_cpuid_info(struct domain *d, case X86_VENDOR_AMD: mask &= ((uint64_t)ecx << 32) | edx; + + /* Fast-forward bits - Must be set. */ + if (ecx & cpufeat_mask(X86_FEATURE_XSAVE)) + ecx = cpufeat_mask(X86_FEATURE_OSXSAVE); + else + ecx = 0; + edx = cpufeat_mask(X86_FEATURE_APIC); + + mask |= ((uint64_t)ecx << 32) | edx; break; } @@ -170,6 +179,12 @@ static void update_domain_cpuid_info(struct domain *d, case X86_VENDOR_AMD: mask &= ((uint64_t)ecx << 32) | edx; + + /* Fast-forward bits - Must be set. */ + ecx = 0; + edx = cpufeat_mask(X86_FEATURE_APIC); + + mask |= ((uint64_t)ecx << 32) | edx; break; }