From patchwork Wed Feb 10 10:10:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Crossley X-Patchwork-Id: 8269481 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 722209FBF9 for ; Wed, 10 Feb 2016 10:13:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EE0CC2010F for ; Wed, 10 Feb 2016 10:13:15 +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 08A8920145 for ; Wed, 10 Feb 2016 10:13:15 +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 1aTRjT-0004S7-Qf; Wed, 10 Feb 2016 10:10:47 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aTRjQ-0004NI-Vx for xen-devel@lists.xen.org; Wed, 10 Feb 2016 10:10:45 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 9F/CD-28228-4AC0BB65; Wed, 10 Feb 2016 10:10:44 +0000 X-Env-Sender: prvs=841434ba8=malcolm.crossley@citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1455099039!22745950!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 34251 invoked from network); 10 Feb 2016 10:10:41 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-13.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 10 Feb 2016 10:10:41 -0000 X-IronPort-AV: E=Sophos;i="5.22,425,1449532800"; d="scan'208";a="330776971" From: Malcolm Crossley To: Date: Wed, 10 Feb 2016 10:10:31 +0000 Message-ID: <1455099035-17649-4-git-send-email-malcolm.crossley@citrix.com> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1455099035-17649-1-git-send-email-malcolm.crossley@citrix.com> References: <1455099035-17649-1-git-send-email-malcolm.crossley@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Malcolm Crossley , feng.wu@intel.com, kevin.tian@intel.com, xen-devel@lists.xen.org Subject: [Xen-devel] [RFC PATCH 3/7] VT-d: Add iommu_lookup_page support 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 Function does not need to handle shared EPT use of IOMMU as core code already handles this. Signed-off-by: Malcolm Crossley --- Cc: kevin.tian@intel.com Cc: feng.wu@intel.com Cc: xen-devel@lists.xen.org --- xen/drivers/passthrough/vtd/iommu.c | 31 +++++++++++++++++++++++++++++++ xen/drivers/passthrough/vtd/iommu.h | 1 + 2 files changed, 32 insertions(+) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index ec31c6b..0c79b48 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1754,6 +1754,36 @@ static int intel_iommu_unmap_page(struct domain *d, unsigned long gfn) return 0; } +static int intel_iommu_lookup_page( + struct domain *d, unsigned long gfn, unsigned long *mfn) +{ + struct hvm_iommu *hd = domain_hvm_iommu(d); + struct dma_pte *page = NULL, *pte = NULL, old; + u64 pg_maddr; + + spin_lock(&hd->arch.mapping_lock); + + pg_maddr = addr_to_dma_page_maddr(d, (paddr_t)gfn << PAGE_SHIFT_4K, 1); + if ( pg_maddr == 0 ) + { + spin_unlock(&hd->arch.mapping_lock); + return -ENOMEM; + } + page = (struct dma_pte *)map_vtd_domain_page(pg_maddr); + pte = page + (gfn & LEVEL_MASK); + old = *pte; + if (!dma_pte_present(old)) { + unmap_vtd_domain_page(page); + spin_unlock(&hd->arch.mapping_lock); + return -ENOMEM; + } + unmap_vtd_domain_page(page); + spin_unlock(&hd->arch.mapping_lock); + + *mfn = dma_get_pte_addr(old) >> PAGE_SHIFT_4K; + return 0; +} + void iommu_pte_flush(struct domain *d, u64 gfn, u64 *pte, int order, int present) { @@ -2534,6 +2564,7 @@ const struct iommu_ops intel_iommu_ops = { .teardown = iommu_domain_teardown, .map_page = intel_iommu_map_page, .unmap_page = intel_iommu_unmap_page, + .lookup_page = intel_iommu_lookup_page, .free_page_table = iommu_free_page_table, .reassign_device = reassign_device_ownership, .get_device_group_id = intel_iommu_group_id, diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index c55ee08..03583ef 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -275,6 +275,7 @@ struct dma_pte { #define dma_pte_addr(p) ((p).val & PADDR_MASK & PAGE_MASK_4K) #define dma_set_pte_addr(p, addr) do {\ (p).val |= ((addr) & PAGE_MASK_4K); } while (0) +#define dma_get_pte_addr(p) (((p).val & PAGE_MASK_4K)) #define dma_pte_present(p) (((p).val & DMA_PTE_PROT) != 0) #define dma_pte_superpage(p) (((p).val & DMA_PTE_SP) != 0)