From patchwork Wed Feb 10 10:10:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Crossley X-Patchwork-Id: 8269461 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 77328BEEE5 for ; Wed, 10 Feb 2016 10:13:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 95AC5202E6 for ; Wed, 10 Feb 2016 10:13:13 +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 617EA2010F for ; Wed, 10 Feb 2016 10:13:12 +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 1aTRjP-0004My-S7; Wed, 10 Feb 2016 10:10:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aTRjO-0004Mh-6b for xen-devel@lists.xen.org; Wed, 10 Feb 2016 10:10:42 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 6E/2B-25435-1AC0BB65; Wed, 10 Feb 2016 10:10:41 +0000 X-Env-Sender: prvs=841434ba8=malcolm.crossley@citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1455099039!22745950!1 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 34164 invoked from network); 10 Feb 2016 10:10:40 -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:40 -0000 X-IronPort-AV: E=Sophos;i="5.22,425,1449532800"; d="scan'208";a="330776970" From: Malcolm Crossley To: Date: Wed, 10 Feb 2016 10:10:30 +0000 Message-ID: <1455099035-17649-3-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 , jbeulich@suse.com, xen-devel@lists.xen.org Subject: [Xen-devel] [RFC PATCH 2/7] iommu: add iommu_lookup_page to lookup guest gfn for a particular IOMMU mapping 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 If IOMMU driver does not implement lookup_page function then it returns -ENOMEM. Returns 0 on success and any other value on failure. Signed-off-by: Malcolm Crossley --- Cc: jbeulich@suse.com Cc: xen-devel@lists.xen.org --- xen/drivers/passthrough/iommu.c | 21 +++++++++++++++++++++ xen/include/xen/iommu.h | 2 ++ 2 files changed, 23 insertions(+) diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index 0b2abf4..06f21ee 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -257,6 +257,27 @@ int iommu_unmap_page(struct domain *d, unsigned long gfn) return hd->platform_ops->unmap_page(d, gfn); } +int iommu_lookup_page(struct domain *d, unsigned long bfn, unsigned long *gfn) +{ + struct hvm_iommu *hd = domain_hvm_iommu(d); + + /* + * BFN maps 1:1 to GFN when iommu passthrough is enabled or + * when IOMMU shared page tables is in use + */ + if ( iommu_use_hap_pt(d) || (iommu_passthrough && is_hardware_domain(d)) ) + { + *gfn = bfn; + return 0; + } + + if ( !iommu_enabled || !hd->platform_ops || + !hd->platform_ops->lookup_page ) + return -ENOMEM; + + return hd->platform_ops->lookup_page(d, bfn, gfn); +} + static void iommu_free_pagetables(unsigned long unused) { do { diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index 8217cb7..49ca087 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -77,6 +77,7 @@ void iommu_teardown(struct domain *d); int iommu_map_page(struct domain *d, unsigned long gfn, unsigned long mfn, unsigned int flags); int iommu_unmap_page(struct domain *d, unsigned long gfn); +int iommu_lookup_page(struct domain *d, unsigned long bfn, unsigned long *gfn); enum iommu_feature { @@ -151,6 +152,7 @@ struct iommu_ops { int (*map_page)(struct domain *d, unsigned long gfn, unsigned long mfn, unsigned int flags); int (*unmap_page)(struct domain *d, unsigned long gfn); + int (*lookup_page)(struct domain *d, unsigned long bfn, unsigned long *gfn); void (*free_page_table)(struct page_info *); #ifdef CONFIG_X86 void (*update_ire_from_apic)(unsigned int apic, unsigned int reg, unsigned int value);