From patchwork Fri Aug 11 16:43:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 9896311 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 C03CA60351 for ; Fri, 11 Aug 2017 16:47:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B1FEE28C58 for ; Fri, 11 Aug 2017 16:47:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A6CFC28C6A; Fri, 11 Aug 2017 16:47:00 +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 5C60B28C69 for ; Fri, 11 Aug 2017 16:46:57 +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 1dgD25-0003IL-Jj; Fri, 11 Aug 2017 16:43:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dgD24-0003IA-Jz for xen-devel@lists.xenproject.org; Fri, 11 Aug 2017 16:43:32 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id E4/AB-01994-3BEDD895; Fri, 11 Aug 2017 16:43:31 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrMIsWRWlGSWpSXmKPExsXitHRDpO6Ge72 RBov3Clh83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBn7P39hLWjgr5h84QBbA+Mn7i5GTg4JAX+J zb3zGUFsNgEdiYtzd7J1MXJwiAioSNzeawBiMguUS8y4EQ9SISzgJ/G94QwbiM0ioCqx6NsTM JtXwFJi5f23bBAT9STeTnwBNpFTwEqiaepDMFsIqKZ39hV2iHpBiZMzn7CA2MwCmhKt23+zQ9 jyEs1bZzND1CtK9M97wDaBkW8WkpZZSFpmIWlZwMi8ilGjOLWoLLVI19BML6koMz2jJDcxM0f X0MBULze1uDgxPTUnMalYLzk/dxMjMNAYgGAH49T3cYcYJTmYlER5E3x6I4X4kvJTKjMSizPi i0pzUosPMWpwcAhsXrv6AqMUS15+XqqSBK/aXaA6waLU9NSKtMwcYCzAlEpw8CiJ8E4ASfMWF yTmFmemQ6ROMepyvJrw/xuTENgMKXFeG5AiAZCijNI8uBGwuLzEKCslzMsIdKAQT0FqUW5mCa r8K0ZxDkYlYV4/kCk8mXklcJteAR3BBHREnw/YESWJCCmpBsap/gpZ6RYvtwUb9JxwXeh6llm tgvXQlfhlrP+aL4TO4q8zXry4Zt5Lz98fz4Sft+X455nQyM88893GsAeHp1476HSsZDPzjxWK gU9E33Ju3XtUd7Mty6rzR3Yx7Jp+3lSMt5/18aMipQVL78eHMT07oabmyxLB3NvSPuvLurZkG 8Og2D8/D6xUYinOSDTUYi4qTgQA+13qs8YCAAA= X-Env-Sender: prvs=389849213=roger.pau@citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1502469805!91018453!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12202 invoked from network); 11 Aug 2017 16:43:27 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-16.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 11 Aug 2017 16:43:27 -0000 X-IronPort-AV: E=Sophos;i="5.41,358,1498521600"; d="scan'208";a="435210814" From: Roger Pau Monne To: Date: Fri, 11 Aug 2017 17:43:20 +0100 Message-ID: <20170811164320.92899-5-roger.pau@citrix.com> X-Mailer: git-send-email 2.11.0 (Apple Git-81) In-Reply-To: <20170811164320.92899-1-roger.pau@citrix.com> References: <20170811164320.92899-1-roger.pau@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Jan Beulich , Roger Pau Monne Subject: [Xen-devel] [PATCH v2 4/4] x86/dom0: re-order DMA remapping enabling for PVH Dom0 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 Make sure the reserved regions are setup before enabling the DMA remapping in the IOMMU, by calling dom0_setup_permissions before iommu_hwdom_init. Also, in order to workaround IOMMU issues seen on pre-Haswell Intel hardware, as described in patch "introduce a PVH implementation of iommu_inclusive_mapping" make sure the DMA remapping is enabled after populating Dom0 p2m. Signed-off-by: Roger Pau Monné --- Cc: Jan Beulich Cc: Andrew Cooper --- Changes since RFC: - Expand commit message to reference patch #3. --- xen/arch/x86/hvm/dom0_build.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c index 020c355faf..0e7d06be95 100644 --- a/xen/arch/x86/hvm/dom0_build.c +++ b/xen/arch/x86/hvm/dom0_build.c @@ -605,13 +605,6 @@ static int __init pvh_setup_cpus(struct domain *d, paddr_t entry, return rc; } - rc = dom0_setup_permissions(d); - if ( rc ) - { - panic("Unable to setup Dom0 permissions: %d\n", rc); - return rc; - } - update_domain_wallclock_time(d); clear_bit(_VPF_down, &v->pause_flags); @@ -1059,7 +1052,12 @@ int __init dom0_construct_pvh(struct domain *d, const module_t *image, printk("** Building a PVH Dom0 **\n"); - iommu_hwdom_init(d); + rc = dom0_setup_permissions(d); + if ( rc ) + { + printk("Unable to setup Dom0 permissions: %d\n", rc); + return rc; + } rc = pvh_setup_p2m(d); if ( rc ) @@ -1068,6 +1066,8 @@ int __init dom0_construct_pvh(struct domain *d, const module_t *image, return rc; } + iommu_hwdom_init(d); + rc = pvh_load_kernel(d, image, image_headroom, initrd, bootstrap_map(image), cmdline, &entry, &start_info); if ( rc )