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: [PATCH v14 03/16] iommu/dma: Allow MSI-only cookies Date: Wed, 12 Oct 2016 13:22:11 +0000 [thread overview] Message-ID: <1476278544-3397-4-git-send-email-eric.auger@redhat.com> (raw) In-Reply-To: <1476278544-3397-1-git-send-email-eric.auger@redhat.com> From: Robin Murphy <robin.murphy@arm.com> IOMMU domain users such as VFIO face a similar problem to DMA API ops with regard to mapping MSI messages in systems where the MSI write is subject to IOMMU translation. With the relevant infrastructure now in place for managed DMA domains, it's actually really simple for other users to piggyback off that and reap the benefits without giving up their own IOVA management, and without having to reinvent their own wheel in the MSI layer. Allow such users to opt into automatic MSI remapping by dedicating a region of their IOVA space to a managed cookie. Signed-off-by: Robin Murphy <robin.murphy@arm.com> Signed-off-by: Eric Auger <eric.auger@redhat.com> --- v13 -> v14: - restore reserve_iova for iova >= base + size v1 -> v13 incorpration: - compared to Robin's version - add NULL last param to iommu_dma_init_domain - set the msi_geometry aperture - I removed if (base < U64_MAX - size) reserve_iova(iovad, iova_pfn(iovad, base + size), ULONG_MAX); don't get why we would reserve something out of the scope of the iova domain? what do I miss? --- drivers/iommu/dma-iommu.c | 39 +++++++++++++++++++++++++++++++++++++++ include/linux/dma-iommu.h | 9 +++++++++ 2 files changed, 48 insertions(+) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index c5ab866..d45f9a0 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -716,3 +716,42 @@ void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg) msg->address_lo += lower_32_bits(msi_page->iova); } } + +/** + * iommu_get_dma_msi_region_cookie - Configure a domain for MSI remapping only + * @domain: IOMMU domain to prepare + * @base: Base address of IOVA region to use as the MSI remapping aperture + * @size: Size of the desired MSI aperture + * + * Users who manage their own IOVA allocation and do not want DMA API support, + * but would still like to take advantage of automatic MSI remapping, can use + * this to initialise their own domain appropriately. + */ +int iommu_get_dma_msi_region_cookie(struct iommu_domain *domain, + dma_addr_t base, u64 size) +{ + struct iommu_dma_cookie *cookie; + struct iova_domain *iovad; + int ret; + + if (domain->type == IOMMU_DOMAIN_DMA) + return -EINVAL; + + ret = iommu_get_dma_cookie(domain); + if (ret) + return ret; + + ret = iommu_dma_init_domain(domain, base, size, NULL); + if (ret) { + iommu_put_dma_cookie(domain); + return ret; + } + + cookie = domain->iova_cookie; + iovad = &cookie->iovad; + if (base < U64_MAX - size) + reserve_iova(iovad, iova_pfn(iovad, base + size), ULONG_MAX); + + return 0; +} +EXPORT_SYMBOL(iommu_get_dma_msi_region_cookie); diff --git a/include/linux/dma-iommu.h b/include/linux/dma-iommu.h index 32c5890..05ab5b4 100644 --- a/include/linux/dma-iommu.h +++ b/include/linux/dma-iommu.h @@ -67,6 +67,9 @@ int iommu_dma_mapping_error(struct device *dev, dma_addr_t dma_addr); /* The DMA API isn't _quite_ the whole story, though... */ void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg); +int iommu_get_dma_msi_region_cookie(struct iommu_domain *domain, + dma_addr_t base, u64 size); + #else struct iommu_domain; @@ -90,6 +93,12 @@ static inline void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg) { } +static inline int iommu_get_dma_msi_region_cookie(struct iommu_domain *domain, + dma_addr_t base, u64 size) +{ + return -ENODEV; +} + #endif /* CONFIG_IOMMU_DMA */ #endif /* __KERNEL__ */ #endif /* __DMA_IOMMU_H */ -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: eric.auger@redhat.com (Eric Auger) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v14 03/16] iommu/dma: Allow MSI-only cookies Date: Wed, 12 Oct 2016 13:22:11 +0000 [thread overview] Message-ID: <1476278544-3397-4-git-send-email-eric.auger@redhat.com> (raw) In-Reply-To: <1476278544-3397-1-git-send-email-eric.auger@redhat.com> From: Robin Murphy <robin.murphy@arm.com> IOMMU domain users such as VFIO face a similar problem to DMA API ops with regard to mapping MSI messages in systems where the MSI write is subject to IOMMU translation. With the relevant infrastructure now in place for managed DMA domains, it's actually really simple for other users to piggyback off that and reap the benefits without giving up their own IOVA management, and without having to reinvent their own wheel in the MSI layer. Allow such users to opt into automatic MSI remapping by dedicating a region of their IOVA space to a managed cookie. Signed-off-by: Robin Murphy <robin.murphy@arm.com> Signed-off-by: Eric Auger <eric.auger@redhat.com> --- v13 -> v14: - restore reserve_iova for iova >= base + size v1 -> v13 incorpration: - compared to Robin's version - add NULL last param to iommu_dma_init_domain - set the msi_geometry aperture - I removed if (base < U64_MAX - size) reserve_iova(iovad, iova_pfn(iovad, base + size), ULONG_MAX); don't get why we would reserve something out of the scope of the iova domain? what do I miss? --- drivers/iommu/dma-iommu.c | 39 +++++++++++++++++++++++++++++++++++++++ include/linux/dma-iommu.h | 9 +++++++++ 2 files changed, 48 insertions(+) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index c5ab866..d45f9a0 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -716,3 +716,42 @@ void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg) msg->address_lo += lower_32_bits(msi_page->iova); } } + +/** + * iommu_get_dma_msi_region_cookie - Configure a domain for MSI remapping only + * @domain: IOMMU domain to prepare + * @base: Base address of IOVA region to use as the MSI remapping aperture + * @size: Size of the desired MSI aperture + * + * Users who manage their own IOVA allocation and do not want DMA API support, + * but would still like to take advantage of automatic MSI remapping, can use + * this to initialise their own domain appropriately. + */ +int iommu_get_dma_msi_region_cookie(struct iommu_domain *domain, + dma_addr_t base, u64 size) +{ + struct iommu_dma_cookie *cookie; + struct iova_domain *iovad; + int ret; + + if (domain->type == IOMMU_DOMAIN_DMA) + return -EINVAL; + + ret = iommu_get_dma_cookie(domain); + if (ret) + return ret; + + ret = iommu_dma_init_domain(domain, base, size, NULL); + if (ret) { + iommu_put_dma_cookie(domain); + return ret; + } + + cookie = domain->iova_cookie; + iovad = &cookie->iovad; + if (base < U64_MAX - size) + reserve_iova(iovad, iova_pfn(iovad, base + size), ULONG_MAX); + + return 0; +} +EXPORT_SYMBOL(iommu_get_dma_msi_region_cookie); diff --git a/include/linux/dma-iommu.h b/include/linux/dma-iommu.h index 32c5890..05ab5b4 100644 --- a/include/linux/dma-iommu.h +++ b/include/linux/dma-iommu.h @@ -67,6 +67,9 @@ int iommu_dma_mapping_error(struct device *dev, dma_addr_t dma_addr); /* The DMA API isn't _quite_ the whole story, though... */ void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg); +int iommu_get_dma_msi_region_cookie(struct iommu_domain *domain, + dma_addr_t base, u64 size); + #else struct iommu_domain; @@ -90,6 +93,12 @@ static inline void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg) { } +static inline int iommu_get_dma_msi_region_cookie(struct iommu_domain *domain, + dma_addr_t base, u64 size) +{ + return -ENODEV; +} + #endif /* CONFIG_IOMMU_DMA */ #endif /* __KERNEL__ */ #endif /* __DMA_IOMMU_H */ -- 1.9.1
next prev parent reply other threads:[~2016-10-12 13:23 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-10-12 13:22 [PATCH v14 00/16] KVM PCIe/MSI passthrough on ARM/ARM64 Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` [PATCH v14 01/16] iommu/iova: fix __alloc_and_insert_iova_range Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` [PATCH v14 02/16] iommu: Introduce DOMAIN_ATTR_MSI_RESV Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` Eric Auger [this message] 2016-10-12 13:22 ` [PATCH v14 03/16] iommu/dma: Allow MSI-only cookies Eric Auger 2016-10-12 13:22 ` [PATCH v14 04/16] iommu/dma: MSI doorbell alloc/free Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-14 11:25 ` Punit Agrawal 2016-10-14 11:25 ` Punit Agrawal 2016-10-17 14:25 ` Auger Eric 2016-10-17 14:25 ` Auger Eric 2016-10-17 14:25 ` Auger Eric 2016-10-12 13:22 ` [PATCH v14 05/16] iommu/dma: Introduce iommu_calc_msi_resv Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` [PATCH v14 06/16] iommu/arm-smmu: Implement domain_get_attr for DOMAIN_ATTR_MSI_RESV Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` [PATCH v14 07/16] irqchip/gic-v2m: Register the MSI doorbell Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` [PATCH v14 08/16] irqchip/gicv3-its: " Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` [PATCH v14 09/16] vfio: Introduce a vfio_dma type field Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` [PATCH v14 10/16] vfio/type1: vfio_find_dma accepting a type argument Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` [PATCH v14 11/16] vfio/type1: Implement recursive vfio_find_dma_from_node Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` [PATCH v14 12/16] vfio/type1: Handle unmap/unpin and replay for VFIO_IOVA_RESERVED slots Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` [PATCH v14 13/16] vfio: Allow reserved msi iova registration Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` [PATCH v14 14/16] vfio/type1: Check doorbell safety Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-11-03 13:45 ` Diana Madalina Craciun 2016-11-03 13:45 ` Diana Madalina Craciun 2016-11-03 13:45 ` Diana Madalina Craciun 2016-11-03 14:14 ` Auger Eric 2016-11-03 14:14 ` Auger Eric 2016-11-03 14:14 ` Auger Eric 2016-10-12 13:22 ` [PATCH v14 15/16] iommu/arm-smmu: Do not advertise IOMMU_CAP_INTR_REMAP Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` [PATCH v14 16/16] vfio/type1: Introduce MSI_RESV capability Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-12 13:22 ` Eric Auger 2016-10-14 11:24 ` [PATCH v14 00/16] KVM PCIe/MSI passthrough on ARM/ARM64 Punit Agrawal 2016-10-14 11:24 ` Punit Agrawal 2016-10-14 11:24 ` Punit Agrawal 2016-10-17 14:19 ` Auger Eric 2016-10-17 14:19 ` Auger Eric 2016-10-17 14:19 ` Auger Eric 2016-10-17 15:08 ` Punit Agrawal 2016-10-17 15:08 ` Punit Agrawal 2016-10-17 15:08 ` Punit Agrawal 2016-10-20 17:32 ` Will Deacon 2016-10-20 17:32 ` Will Deacon 2016-10-20 17:32 ` Will Deacon 2016-10-21 9:26 ` Auger Eric 2016-10-21 9:26 ` Auger Eric 2016-10-21 9:26 ` Auger Eric 2016-10-24 19:39 ` Robin Murphy 2016-10-24 19:39 ` Robin Murphy 2016-10-24 19:39 ` Robin Murphy 2016-11-02 16:15 ` Auger Eric 2016-11-02 16:15 ` Auger Eric
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=1476278544-3397-4-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.