From: Eric Auger <eric.auger@redhat.com> To: eric.auger@redhat.com, eric.auger.pro@gmail.com, christoffer.dall@linaro.org, marc.zyngier@arm.com, robin.murphy@arm.com, alex.williamson@redhat.com, will.deacon@arm.com, joro@8bytes.org, tglx@linutronix.de, jason@lakedaemon.net, linux-arm-kernel@lists.infradead.org Cc: kvm@vger.kernel.org, drjones@redhat.com, linux-kernel@vger.kernel.org, Bharat.Bhushan@freescale.com, pranav.sawargaonkar@gmail.com, p.fedin@samsung.com, iommu@lists.linux-foundation.org, Jean-Philippe.Brucker@arm.com, yehuday@marvell.com, Manish.Jaggi@caviumnetworks.com Subject: [RFC 09/11] vfio/type1: Reserve IOVAs for IOMMU_DOMAIN_MIXED domains Date: Tue, 27 Sep 2016 20:48:36 +0000 [thread overview] Message-ID: <1475009318-2617-10-git-send-email-eric.auger@redhat.com> (raw) In-Reply-To: <1475009318-2617-1-git-send-email-eric.auger@redhat.com> For IOMMU_DOMAIN_MIXED domain types, the user space defines most of the IOVA regions (UNMANAGED) and map them. Since we want to allow the kernel to allocate spare IOVAs within the holes we need to reserve the user space defined IOVA regions. in vfio_test_domain_fgsp, we keep the original iommu_(un)map since the purpose just is to try map/unmap and not to keep it. Signed-off-by: Eric Auger <eric.auger@redhat.com> --- drivers/vfio/vfio_iommu_type1.c | 42 ++++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index ad08fd0..2d1eede 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -37,6 +37,7 @@ #include <linux/vfio.h> #include <linux/workqueue.h> #include <linux/dma-iommu.h> +#include <linux/iova.h> #define DRIVER_VERSION "0.2" #define DRIVER_AUTHOR "Alex Williamson <alex.williamson@redhat.com>" @@ -255,6 +256,32 @@ static int vaddr_get_pfn(unsigned long vaddr, int prot, unsigned long *pfn) return ret; } +static int iommu_dma_map(struct iommu_domain *domain, unsigned long iova, + phys_addr_t paddr, size_t size, int prot) +{ + switch (domain->type) { + case IOMMU_DOMAIN_UNMANAGED: + return iommu_map(domain, iova, paddr, size, prot); + case IOMMU_DOMAIN_MIXED: + return iommu_dma_map_mixed(domain, iova, paddr, size, prot); + default: + return -ENOENT; + } +} + +static size_t iommu_dma_unmap(struct iommu_domain *domain, unsigned long iova, + size_t size) +{ + switch (domain->type) { + case IOMMU_DOMAIN_UNMANAGED: + return iommu_unmap(domain, iova, size); + case IOMMU_DOMAIN_MIXED: + return iommu_dma_unmap_mixed(domain, iova, size); + default: + return -ENOENT; + } +} + /* * Attempt to pin pages. We really don't want to track all the pfns and * the iommu can only map chunks of consecutive pfns anyway, so get the @@ -353,7 +380,7 @@ static void vfio_unmap_unpin(struct vfio_iommu *iommu, struct vfio_dma *dma) struct vfio_domain, next); list_for_each_entry_continue(d, &iommu->domain_list, next) { - iommu_unmap(d->domain, dma->iova, dma->size); + iommu_dma_unmap(d->domain, dma->iova, dma->size); cond_resched(); } @@ -379,7 +406,7 @@ static void vfio_unmap_unpin(struct vfio_iommu *iommu, struct vfio_dma *dma) break; } - unmapped = iommu_unmap(domain->domain, iova, len); + unmapped = iommu_dma_unmap(domain->domain, iova, len); if (WARN_ON(!unmapped)) break; @@ -519,7 +546,7 @@ static int map_try_harder(struct vfio_domain *domain, dma_addr_t iova, int ret = 0; for (i = 0; i < npage; i++, pfn++, iova += PAGE_SIZE) { - ret = iommu_map(domain->domain, iova, + ret = iommu_dma_map(domain->domain, iova, (phys_addr_t)pfn << PAGE_SHIFT, PAGE_SIZE, prot | domain->prot); if (ret) @@ -527,7 +554,7 @@ static int map_try_harder(struct vfio_domain *domain, dma_addr_t iova, } for (; i < npage && i > 0; i--, iova -= PAGE_SIZE) - iommu_unmap(domain->domain, iova, PAGE_SIZE); + iommu_dma_unmap(domain->domain, iova, PAGE_SIZE); return ret; } @@ -539,7 +566,8 @@ static int vfio_iommu_map(struct vfio_iommu *iommu, dma_addr_t iova, int ret; list_for_each_entry(d, &iommu->domain_list, next) { - ret = iommu_map(d->domain, iova, (phys_addr_t)pfn << PAGE_SHIFT, + ret = iommu_dma_map(d->domain, iova, + (phys_addr_t)pfn << PAGE_SHIFT, npage << PAGE_SHIFT, prot | d->prot); if (ret) { if (ret != -EBUSY || @@ -554,7 +582,7 @@ static int vfio_iommu_map(struct vfio_iommu *iommu, dma_addr_t iova, unwind: list_for_each_entry_continue_reverse(d, &iommu->domain_list, next) - iommu_unmap(d->domain, iova, npage << PAGE_SHIFT); + iommu_dma_unmap(d->domain, iova, npage << PAGE_SHIFT); return ret; } @@ -690,7 +718,7 @@ static int vfio_iommu_replay(struct vfio_iommu *iommu, iova + size)) size += PAGE_SIZE; - ret = iommu_map(domain->domain, iova, phys, + ret = iommu_dma_map(domain->domain, iova, phys, size, dma->prot | domain->prot); if (ret) return ret; -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Eric Auger <eric.auger-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> To: eric.auger-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, eric.auger.pro-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, christoffer.dall-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, marc.zyngier-5wv7dgnIgG8@public.gmane.org, robin.murphy-5wv7dgnIgG8@public.gmane.org, alex.williamson-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, will.deacon-5wv7dgnIgG8@public.gmane.org, joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org, tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org, jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org Cc: drjones-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Manish.Jaggi-M3mlKVOIwJVv6pq1l3V1OdBPR1lH4CV8@public.gmane.org, p.fedin-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, pranav.sawargaonkar-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, yehuday-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org Subject: [RFC 09/11] vfio/type1: Reserve IOVAs for IOMMU_DOMAIN_MIXED domains Date: Tue, 27 Sep 2016 20:48:36 +0000 [thread overview] Message-ID: <1475009318-2617-10-git-send-email-eric.auger@redhat.com> (raw) In-Reply-To: <1475009318-2617-1-git-send-email-eric.auger-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> For IOMMU_DOMAIN_MIXED domain types, the user space defines most of the IOVA regions (UNMANAGED) and map them. Since we want to allow the kernel to allocate spare IOVAs within the holes we need to reserve the user space defined IOVA regions. in vfio_test_domain_fgsp, we keep the original iommu_(un)map since the purpose just is to try map/unmap and not to keep it. Signed-off-by: Eric Auger <eric.auger-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> --- drivers/vfio/vfio_iommu_type1.c | 42 ++++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index ad08fd0..2d1eede 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -37,6 +37,7 @@ #include <linux/vfio.h> #include <linux/workqueue.h> #include <linux/dma-iommu.h> +#include <linux/iova.h> #define DRIVER_VERSION "0.2" #define DRIVER_AUTHOR "Alex Williamson <alex.williamson-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>" @@ -255,6 +256,32 @@ static int vaddr_get_pfn(unsigned long vaddr, int prot, unsigned long *pfn) return ret; } +static int iommu_dma_map(struct iommu_domain *domain, unsigned long iova, + phys_addr_t paddr, size_t size, int prot) +{ + switch (domain->type) { + case IOMMU_DOMAIN_UNMANAGED: + return iommu_map(domain, iova, paddr, size, prot); + case IOMMU_DOMAIN_MIXED: + return iommu_dma_map_mixed(domain, iova, paddr, size, prot); + default: + return -ENOENT; + } +} + +static size_t iommu_dma_unmap(struct iommu_domain *domain, unsigned long iova, + size_t size) +{ + switch (domain->type) { + case IOMMU_DOMAIN_UNMANAGED: + return iommu_unmap(domain, iova, size); + case IOMMU_DOMAIN_MIXED: + return iommu_dma_unmap_mixed(domain, iova, size); + default: + return -ENOENT; + } +} + /* * Attempt to pin pages. We really don't want to track all the pfns and * the iommu can only map chunks of consecutive pfns anyway, so get the @@ -353,7 +380,7 @@ static void vfio_unmap_unpin(struct vfio_iommu *iommu, struct vfio_dma *dma) struct vfio_domain, next); list_for_each_entry_continue(d, &iommu->domain_list, next) { - iommu_unmap(d->domain, dma->iova, dma->size); + iommu_dma_unmap(d->domain, dma->iova, dma->size); cond_resched(); } @@ -379,7 +406,7 @@ static void vfio_unmap_unpin(struct vfio_iommu *iommu, struct vfio_dma *dma) break; } - unmapped = iommu_unmap(domain->domain, iova, len); + unmapped = iommu_dma_unmap(domain->domain, iova, len); if (WARN_ON(!unmapped)) break; @@ -519,7 +546,7 @@ static int map_try_harder(struct vfio_domain *domain, dma_addr_t iova, int ret = 0; for (i = 0; i < npage; i++, pfn++, iova += PAGE_SIZE) { - ret = iommu_map(domain->domain, iova, + ret = iommu_dma_map(domain->domain, iova, (phys_addr_t)pfn << PAGE_SHIFT, PAGE_SIZE, prot | domain->prot); if (ret) @@ -527,7 +554,7 @@ static int map_try_harder(struct vfio_domain *domain, dma_addr_t iova, } for (; i < npage && i > 0; i--, iova -= PAGE_SIZE) - iommu_unmap(domain->domain, iova, PAGE_SIZE); + iommu_dma_unmap(domain->domain, iova, PAGE_SIZE); return ret; } @@ -539,7 +566,8 @@ static int vfio_iommu_map(struct vfio_iommu *iommu, dma_addr_t iova, int ret; list_for_each_entry(d, &iommu->domain_list, next) { - ret = iommu_map(d->domain, iova, (phys_addr_t)pfn << PAGE_SHIFT, + ret = iommu_dma_map(d->domain, iova, + (phys_addr_t)pfn << PAGE_SHIFT, npage << PAGE_SHIFT, prot | d->prot); if (ret) { if (ret != -EBUSY || @@ -554,7 +582,7 @@ static int vfio_iommu_map(struct vfio_iommu *iommu, dma_addr_t iova, unwind: list_for_each_entry_continue_reverse(d, &iommu->domain_list, next) - iommu_unmap(d->domain, iova, npage << PAGE_SHIFT); + iommu_dma_unmap(d->domain, iova, npage << PAGE_SHIFT); return ret; } @@ -690,7 +718,7 @@ static int vfio_iommu_replay(struct vfio_iommu *iommu, iova + size)) size += PAGE_SIZE; - ret = iommu_map(domain->domain, iova, phys, + ret = iommu_dma_map(domain->domain, iova, phys, size, dma->prot | domain->prot); if (ret) return ret; -- 1.9.1
next prev parent reply other threads:[~2016-09-27 20:50 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-09-27 20:48 [RFC 00/11] KVM PCIe/MSI passthrough on ARM/ARM64: re-design with transparent MSI mapping Eric Auger 2016-09-27 20:48 ` Eric Auger 2016-09-27 20:48 ` Eric Auger 2016-09-27 20:48 ` [RFC 01/11] iommu: Add iommu_domain_msi_geometry and DOMAIN_ATTR_MSI_GEOMETRY Eric Auger 2016-09-27 20:48 ` Eric Auger 2016-09-27 20:48 ` [RFC 02/11] iommu: Introduce IOMMU_CAP_TRANSLATE_MSI capability Eric Auger 2016-09-27 20:48 ` Eric Auger 2016-09-27 20:48 ` [RFC 03/11] iommu: Introduce IOMMU_DOMAIN_MIXED Eric Auger 2016-09-27 20:48 ` Eric Auger 2016-09-27 20:48 ` [RFC 04/11] iommu/dma: Allow MSI-only cookies Eric Auger 2016-09-27 20:48 ` Eric Auger 2016-09-27 20:48 ` [RFC 05/11] iommu/dma: iommu_dma_(un)map_mixed Eric Auger 2016-09-27 20:48 ` Eric Auger 2016-09-30 13:24 ` Robin Murphy 2016-09-30 13:24 ` Robin Murphy 2016-09-30 13:24 ` Robin Murphy 2016-10-02 9:56 ` Christoffer Dall 2016-10-02 9:56 ` Christoffer Dall 2016-10-02 9:56 ` Christoffer Dall 2016-10-04 17:18 ` Robin Murphy 2016-10-04 17:18 ` Robin Murphy 2016-10-04 17:37 ` Auger Eric 2016-10-04 17:37 ` Auger Eric 2016-10-03 9:38 ` Auger Eric 2016-10-03 9:38 ` Auger Eric 2016-10-03 9:38 ` Auger Eric 2016-09-27 20:48 ` [RFC 06/11] iommu/arm-smmu: Allow IOMMU_DOMAIN_MIXED domain allocation Eric Auger 2016-09-27 20:48 ` Eric Auger 2016-09-27 20:48 ` [RFC 07/11] iommu: Use IOMMU_DOMAIN_MIXED typed domain when IOMMU translates MSI Eric Auger 2016-09-27 20:48 ` Eric Auger 2016-09-27 20:48 ` [RFC 08/11] vfio/type1: Sets the IOVA window in case MSI IOVA need to be allocated Eric Auger 2016-09-27 20:48 ` Eric Auger 2016-09-27 20:48 ` Eric Auger [this message] 2016-09-27 20:48 ` [RFC 09/11] vfio/type1: Reserve IOVAs for IOMMU_DOMAIN_MIXED domains Eric Auger 2016-09-27 20:48 ` [RFC 10/11] iommu/arm-smmu: Do not advertise IOMMU_CAP_INTR_REMAP Eric Auger 2016-09-27 20:48 ` Eric Auger 2016-09-27 20:48 ` [RFC 11/11] iommu/arm-smmu: Advertise IOMMU_CAP_TRANSLATE_MSI Eric Auger 2016-09-27 20:48 ` Eric Auger
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1475009318-2617-10-git-send-email-eric.auger@redhat.com \ --to=eric.auger@redhat.com \ --cc=Bharat.Bhushan@freescale.com \ --cc=Jean-Philippe.Brucker@arm.com \ --cc=Manish.Jaggi@caviumnetworks.com \ --cc=alex.williamson@redhat.com \ --cc=christoffer.dall@linaro.org \ --cc=drjones@redhat.com \ --cc=eric.auger.pro@gmail.com \ --cc=iommu@lists.linux-foundation.org \ --cc=jason@lakedaemon.net \ --cc=joro@8bytes.org \ --cc=kvm@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=marc.zyngier@arm.com \ --cc=p.fedin@samsung.com \ --cc=pranav.sawargaonkar@gmail.com \ --cc=robin.murphy@arm.com \ --cc=tglx@linutronix.de \ --cc=will.deacon@arm.com \ --cc=yehuday@marvell.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.