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 04/11] iommu/dma: Allow MSI-only cookies Date: Tue, 27 Sep 2016 20:48:31 +0000 [thread overview] Message-ID: <1475009318-2617-5-git-send-email-eric.auger@redhat.com> (raw) In-Reply-To: <1475009318-2617-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> --- v1 -> v2: - add NULL last param to iommu_dma_init_domain - use cookie_iovad() - check against IOMMU_DOMAIN_MIXED domain type --- drivers/iommu/dma-iommu.c | 43 +++++++++++++++++++++++++++++++++++++++++++ include/linux/dma-iommu.h | 9 +++++++++ 2 files changed, 52 insertions(+) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index c5ab866..04bbc85 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -716,3 +716,46 @@ 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 iova_domain *iovad; + int ret; + + if (domain->type != IOMMU_DOMAIN_MIXED) + return -EINVAL; + + /* check the iova domain intersects the MSI window */ + if (iommu_domain_msi_aperture_valid(domain) && + (domain->msi_geometry.aperture_end < base || + domain->msi_geometry.aperture_start > base + size - 1)) + 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; + } + + iovad = cookie_iovad(domain); + 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..1c55413 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 <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 04/11] iommu/dma: Allow MSI-only cookies Date: Tue, 27 Sep 2016 20:48:31 +0000 [thread overview] Message-ID: <1475009318-2617-5-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> From: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org> 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-5wv7dgnIgG8@public.gmane.org> Signed-off-by: Eric Auger <eric.auger-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> --- v1 -> v2: - add NULL last param to iommu_dma_init_domain - use cookie_iovad() - check against IOMMU_DOMAIN_MIXED domain type --- drivers/iommu/dma-iommu.c | 43 +++++++++++++++++++++++++++++++++++++++++++ include/linux/dma-iommu.h | 9 +++++++++ 2 files changed, 52 insertions(+) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index c5ab866..04bbc85 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -716,3 +716,46 @@ 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 iova_domain *iovad; + int ret; + + if (domain->type != IOMMU_DOMAIN_MIXED) + return -EINVAL; + + /* check the iova domain intersects the MSI window */ + if (iommu_domain_msi_aperture_valid(domain) && + (domain->msi_geometry.aperture_end < base || + domain->msi_geometry.aperture_start > base + size - 1)) + 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; + } + + iovad = cookie_iovad(domain); + 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..1c55413 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-09-27 20:49 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 ` Eric Auger [this message] 2016-09-27 20:48 ` [RFC 04/11] iommu/dma: Allow MSI-only cookies 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 ` [RFC 09/11] vfio/type1: Reserve IOVAs for IOMMU_DOMAIN_MIXED domains Eric Auger 2016-09-27 20:48 ` 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-5-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.