From patchwork Wed Jan 4 12:39:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 9496669 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 55599606B5 for ; Wed, 4 Jan 2017 12:48:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4712027F85 for ; Wed, 4 Jan 2017 12:48:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C3A427F88; Wed, 4 Jan 2017 12:48:23 +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 E626A27F8D for ; Wed, 4 Jan 2017 12:48:22 +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 1cOkxh-0005uL-Pw; Wed, 04 Jan 2017 12:46:37 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cOkxf-0005nT-RI for xen-devel@lists.xen.org; Wed, 04 Jan 2017 12:46:35 +0000 Received: from [193.109.254.147] by server-10.bemta-6.messagelabs.com id 7A/C1-13192-AAEEC685; Wed, 04 Jan 2017 12:46:34 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpmkeJIrShJLcpLzFFi42JxWrrBXnflu5w Ig+1TDS2WfFzM4sDocXT3b6YAxijWzLyk/IoE1oydD44yFfTxVFy/fpi9gfEgZxcjB4eEgL/E 7ntCXYycHGwC+hK7X3xiArFFBNQlTndcZAUpYRbwkzj0wBckLCzgKdG/fiIjiM0ioCLRdfk4C 4jNCxQ/uPUUmC0hICdx/vhPZhCbEyj+bOM6sHohAQ+JKReXsUPYahLX+i+xQ/QKSpyc+QSsl1 lAQuLgixfMExh5ZyFJzUKSWsDItIpRozi1qCy1SNfQRC+pKDM9oyQ3MTNH19DATC83tbg4MT0 1JzGpWC85P3cTIzBwGIBgB+P1jQGHGCU5mJREefvacyKE+JLyUyozEosz4otKc1KLDzHKcHAo SfDOeAuUEyxKTU+tSMvMAYYwTFqCg0dJhPchSJq3uCAxtzgzHSJ1ilFRSpx3CUhCACSRUZoH1 waLm0uMslLCvIxAhwjxFKQW5WaWoMq/YhTnYFQS5t0LMoUnM68EbvoroMVMQIu3B2SDLC5JRE hJNTBqiRmFMPX82FufXy48mblrTff9y5M3Fz+Y3vlpmojZFAWDU757b3XaTPmoILrx4qe3jl3 q1z+uZbx04Vtdff6ExpqDR1buq/n80PZxXTdX5TEHXrejr0WinQQv2pVUz6zadUXyWev79ysL yze84Fgqk+K57U4I920hy00XSs4d1Bf/2OXjvuObEktxRqKhFnNRcSIAvNwEjpYCAAA= X-Env-Sender: prvs=1701003ad=Andrew.Cooper3@citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1483533991!49789778!2 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 54595 invoked from network); 4 Jan 2017 12:46:33 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-11.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 4 Jan 2017 12:46:33 -0000 X-IronPort-AV: E=Sophos;i="5.33,459,1477958400"; d="scan'208";a="406724768" From: Andrew Cooper To: Xen-devel Date: Wed, 4 Jan 2017 12:39:41 +0000 Message-ID: <1483533584-8015-25-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 24/27] x86/hvm: Use guest_cpuid() rather than hvm_cpuid() 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 More work is required before maxphysaddr can be read straight out of the cpuid_policy block, but in the meantime hvm_cpuid() wants to disappear so update the code to use the newer interface. Use the behaviour of max_leaf handling (returning all zeros) to avoid a double call into guest_cpuid(). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich --- xen/arch/x86/hvm/mtrr.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 228dac1..709759c 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -440,7 +440,7 @@ bool_t mtrr_fix_range_msr_set(struct domain *d, struct mtrr_state *m, bool_t mtrr_var_range_msr_set( struct domain *d, struct mtrr_state *m, uint32_t msr, uint64_t msr_content) { - uint32_t index, phys_addr, eax; + uint32_t index, phys_addr; uint64_t msr_mask; uint64_t *var_range_base = (uint64_t*)m->var_ranges; @@ -453,13 +453,10 @@ bool_t mtrr_var_range_msr_set( if ( d == current->domain ) { - phys_addr = 36; - hvm_cpuid(0x80000000, &eax, NULL, NULL, NULL); - if ( (eax >> 16) == 0x8000 && eax >= 0x80000008 ) - { - hvm_cpuid(0x80000008, &eax, NULL, NULL, NULL); - phys_addr = (uint8_t)eax; - } + struct cpuid_leaf res; + + guest_cpuid(current, 0x80000008, 0, &res); + phys_addr = (uint8_t)res.a ?: 36; } else phys_addr = paddr_bits;