From patchwork Wed Jan 4 12:39:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 9496659 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5E76A606B5 for ; Wed, 4 Jan 2017 12:48:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 50E0727F85 for ; Wed, 4 Jan 2017 12:48:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 45BE927F8C; Wed, 4 Jan 2017 12:48:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E8FF627F85 for ; Wed, 4 Jan 2017 12:48:16 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cOkxX-0005YI-Ds; Wed, 04 Jan 2017 12:46:27 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cOkxW-0005WT-EN for xen-devel@lists.xen.org; Wed, 04 Jan 2017 12:46:26 +0000 Received: from [193.109.254.147] by server-3.bemta-6.messagelabs.com id CF/EC-09053-1AEEC685; Wed, 04 Jan 2017 12:46:25 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpikeJIrShJLcpLzFFi42JxWrrBXnfhu5w Ig7N/xCyWfFzM4sDocXT3b6YAxijWzLyk/IoE1oxnHzIKFghVnNx9j7mBcRZvFyMnh4SAv8Su jttsIDabgL7E7hefmEBsEQF1idMdF1m7GDk4mAX8JA498AUJCwvESdyc9o8ZJMwioCLx+qgDS JhXwFPiV/N0RoiJchLnj/9kBrE5geLPNq4DiwsJeEhMubiMHcJWk7jWf4kdoldQ4uTMJywgNr OAhMTBFy+YJzDyzkKSmoUktYCRaRWjRnFqUVlqka6xgV5SUWZ6RkluYmaOrqGBmV5uanFxYnp qTmJSsV5yfu4mRmDYMADBDsa/awMPMUpyMCmJ8va150QI8SXlp1RmJBZnxBeV5qQWH2KU4eBQ kuAVeguUEyxKTU+tSMvMAQYwTFqCg0dJhDcdJM1bXJCYW5yZDpE6xagoJc5rDJIQAElklObBt cGi5hKjrJQwLyPQIUI8BalFuZklqPKvGMU5GJWEeW1ApvBk5pXATX8FtJgJaPH2gGyQxSWJCC mpBkbjX+l9qlMqIwPvni8/6P9k5g7hPS4/zzxTf3N9fYLi61lmHCENnoUuW3VkXWveP138I+r Xst1vfm4SZZu6Zmv95Nvqv+ZNti5a5rEwKYGNI3+HVlVvkQ+zqhnTtpO3T8nvnJc688Rptc5u nqr5B1O3+5xlba8VXqYlaniGe9/2Op6b3xo/p35XYinOSDTUYi4qTgQA4Tgr9pUCAAA= X-Env-Sender: prvs=1701003ad=Andrew.Cooper3@citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1483533983!78783516!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: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19866 invoked from network); 4 Jan 2017 12:46:25 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-12.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 4 Jan 2017 12:46:25 -0000 X-IronPort-AV: E=Sophos;i="5.33,459,1477958400"; d="scan'208";a="406724754" From: Andrew Cooper To: Xen-devel Date: Wed, 4 Jan 2017 12:39:34 +0000 Message-ID: <1483533584-8015-18-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1483533584-8015-1-git-send-email-andrew.cooper3@citrix.com> References: <1483533584-8015-1-git-send-email-andrew.cooper3@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Jan Beulich Subject: [Xen-devel] [PATCH 17/27] x86/pv: Use per-domain policy information when calculating the cpumasks X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP ... rather than dynamically claming against the PV maximum policy. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich --- xen/arch/x86/domctl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index c7e74dd..c1a4d00 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -99,8 +99,8 @@ static void update_domain_cpuid_info(struct domain *d, if ( is_pv_domain(d) && ((levelling_caps & LCAP_1cd) == LCAP_1cd) ) { uint64_t mask = cpuidmask_defaults._1cd; - uint32_t ecx = ctl->ecx & pv_featureset[FEATURESET_1c]; - uint32_t edx = ctl->edx & pv_featureset[FEATURESET_1d]; + uint32_t ecx = p->basic._1c; + uint32_t edx = p->basic._1d; /* * Must expose hosts HTT and X2APIC value so a guest using native @@ -174,7 +174,7 @@ static void update_domain_cpuid_info(struct domain *d, { uint64_t mask = cpuidmask_defaults._7ab0; uint32_t eax = ctl->eax; - uint32_t ebx = ctl->ebx & pv_featureset[FEATURESET_7b0]; + uint32_t ebx = p->feat._7b0; if ( boot_cpu_data.x86_vendor == X86_VENDOR_AMD ) mask &= ((uint64_t)eax << 32) | ebx; @@ -190,7 +190,7 @@ static void update_domain_cpuid_info(struct domain *d, if ( is_pv_domain(d) && ((levelling_caps & LCAP_Da1) == LCAP_Da1) ) { uint64_t mask = cpuidmask_defaults.Da1; - uint32_t eax = ctl->eax & pv_featureset[FEATURESET_Da1]; + uint32_t eax = p->xstate.Da1; if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL ) mask &= (~0ULL << 32) | eax; @@ -203,8 +203,8 @@ static void update_domain_cpuid_info(struct domain *d, if ( is_pv_domain(d) && ((levelling_caps & LCAP_e1cd) == LCAP_e1cd) ) { uint64_t mask = cpuidmask_defaults.e1cd; - uint32_t ecx = ctl->ecx & pv_featureset[FEATURESET_e1c]; - uint32_t edx = ctl->edx & pv_featureset[FEATURESET_e1d]; + uint32_t ecx = p->extd.e1c; + uint32_t edx = p->extd.e1d; /* * Must expose hosts CMP_LEGACY value so a guest using native