From: Robin Murphy <robin.murphy@arm.com>
To: Christoph Hellwig <hch@lst.de>
Cc: Tom Lendacky <thomas.lendacky@amd.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Joerg Roedel <joro@8bytes.org>, Will Deacon <will.deacon@arm.com>,
linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 04/19] dma-iommu: remove the flush_page callback
Date: Fri, 1 Feb 2019 15:28:24 +0000 [thread overview]
Message-ID: <591d0c09-6361-fa28-06e5-faa98e60bcee@arm.com> (raw)
In-Reply-To: <20190114094159.27326-5-hch@lst.de>
On 14/01/2019 09:41, Christoph Hellwig wrote:
> We now have a arch_dma_prep_coherent architecture hook that is used
> for the generic DMA remap allocator, and we should use the same
> interface for the dma-iommu code.
Agreed - I'd definitely ack a version of this change which didn't depend
on patch #3 ;)
Robin.
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> arch/arm64/mm/dma-mapping.c | 8 +-------
> drivers/iommu/dma-iommu.c | 14 ++++----------
> include/linux/dma-iommu.h | 3 +--
> 3 files changed, 6 insertions(+), 19 deletions(-)
>
> diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
> index fb0908456a1f..75fe7273a1e4 100644
> --- a/arch/arm64/mm/dma-mapping.c
> +++ b/arch/arm64/mm/dma-mapping.c
> @@ -104,12 +104,6 @@ arch_initcall(arm64_dma_init);
> #include <linux/platform_device.h>
> #include <linux/amba/bus.h>
>
> -/* Thankfully, all cache ops are by VA so we can ignore phys here */
> -static void flush_page(struct device *dev, const void *virt, phys_addr_t phys)
> -{
> - __dma_flush_area(virt, PAGE_SIZE);
> -}
> -
> static void *__iommu_alloc_attrs(struct device *dev, size_t size,
> dma_addr_t *handle, gfp_t gfp,
> unsigned long attrs)
> @@ -186,7 +180,7 @@ static void *__iommu_alloc_attrs(struct device *dev, size_t size,
> struct page **pages;
>
> pages = iommu_dma_alloc(dev, iosize, gfp, attrs, ioprot,
> - handle, flush_page);
> + handle);
> if (!pages)
> return NULL;
>
> diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
> index 4f5546a103d8..d6a437385b26 100644
> --- a/drivers/iommu/dma-iommu.c
> +++ b/drivers/iommu/dma-iommu.c
> @@ -22,6 +22,7 @@
> #include <linux/acpi_iort.h>
> #include <linux/device.h>
> #include <linux/dma-iommu.h>
> +#include <linux/dma-noncoherent.h>
> #include <linux/gfp.h>
> #include <linux/huge_mm.h>
> #include <linux/iommu.h>
> @@ -533,8 +534,6 @@ void iommu_dma_free(struct device *dev, struct page **pages, size_t size,
> * @attrs: DMA attributes for this allocation
> * @prot: IOMMU mapping flags
> * @handle: Out argument for allocated DMA handle
> - * @flush_page: Arch callback which must ensure PAGE_SIZE bytes from the
> - * given VA/PA are visible to the given non-coherent device.
> *
> * If @size is less than PAGE_SIZE, then a full CPU page will be allocated,
> * but an IOMMU which supports smaller pages might not map the whole thing.
> @@ -543,8 +542,7 @@ void iommu_dma_free(struct device *dev, struct page **pages, size_t size,
> * or NULL on failure.
> */
> struct page **iommu_dma_alloc(struct device *dev, size_t size, gfp_t gfp,
> - unsigned long attrs, int prot, dma_addr_t *handle,
> - void (*flush_page)(struct device *, const void *, phys_addr_t))
> + unsigned long attrs, int prot, dma_addr_t *handle)
> {
> struct iommu_domain *domain = iommu_get_dma_domain(dev);
> struct iommu_dma_cookie *cookie = domain->iova_cookie;
> @@ -580,12 +578,8 @@ struct page **iommu_dma_alloc(struct device *dev, size_t size, gfp_t gfp,
> for (i = 0; i < count; i++) {
> phys_addr_t phys = page_to_phys(pages[i]);
>
> - if (!(prot & IOMMU_CACHE)) {
> - void *vaddr = kmap_atomic(pages[i]);
> -
> - flush_page(dev, vaddr, phys);
> - kunmap_atomic(vaddr);
> - }
> + if (!(prot & IOMMU_CACHE))
> + arch_dma_prep_coherent(pages[i], PAGE_SIZE);
>
> if (iommu_map(domain, iova + mapped, phys, PAGE_SIZE, prot))
> goto out_unmap;
> diff --git a/include/linux/dma-iommu.h b/include/linux/dma-iommu.h
> index 65aa888c2768..59e606f78626 100644
> --- a/include/linux/dma-iommu.h
> +++ b/include/linux/dma-iommu.h
> @@ -43,8 +43,7 @@ int dma_info_to_prot(enum dma_data_direction dir, bool coherent,
> * the arch code to take care of attributes and cache maintenance
> */
> struct page **iommu_dma_alloc(struct device *dev, size_t size, gfp_t gfp,
> - unsigned long attrs, int prot, dma_addr_t *handle,
> - void (*flush_page)(struct device *, const void *, phys_addr_t));
> + unsigned long attrs, int prot, dma_addr_t *handle);
> void iommu_dma_free(struct device *dev, struct page **pages, size_t size,
> dma_addr_t *handle);
>
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-02-01 15:28 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-14 9:41 implement generic dma_map_ops for IOMMUs Christoph Hellwig
2019-01-14 9:41 ` [PATCH 01/19] dma-mapping: add a Kconfig symbol to indicated arch_dma_prep_coherent presence Christoph Hellwig
2019-02-01 14:22 ` Robin Murphy
2019-02-01 16:12 ` Christoph Hellwig
2019-01-14 9:41 ` [PATCH 02/19] dma-iommu: cleanup dma-iommu.h Christoph Hellwig
2019-02-01 14:47 ` Robin Murphy
2019-02-01 16:13 ` Christoph Hellwig
2019-02-06 15:08 ` Robin Murphy
2019-02-11 15:59 ` Christoph Hellwig
2019-01-14 9:41 ` [PATCH 03/19] dma-iommu: don't use a scatterlist in iommu_dma_alloc Christoph Hellwig
2019-02-01 15:24 ` Robin Murphy
2019-02-01 16:16 ` Christoph Hellwig
2019-02-06 15:28 ` Robin Murphy
2019-02-11 16:00 ` Christoph Hellwig
2019-01-14 9:41 ` [PATCH 04/19] dma-iommu: remove the flush_page callback Christoph Hellwig
2019-02-01 15:28 ` Robin Murphy [this message]
2019-01-14 9:41 ` [PATCH 05/19] dma-iommu: move the arm64 wrappers to common code Christoph Hellwig
2019-01-14 9:41 ` [PATCH 06/19] dma-iommu: fix and refactor iommu_dma_mmap Christoph Hellwig
2019-02-05 15:02 ` Robin Murphy
2019-02-11 16:03 ` Christoph Hellwig
2019-01-14 9:41 ` [PATCH 07/19] dma-iommu: fix and refactor iommu_dma_get_sgtable Christoph Hellwig
2019-01-14 9:41 ` [PATCH 08/19] dma-iommu: move __iommu_dma_map Christoph Hellwig
2019-01-14 9:41 ` [PATCH 09/19] dma-iommu: refactor page array remap helpers Christoph Hellwig
2019-01-14 9:41 ` [PATCH 10/19] dma-iommu: factor atomic pool allocations into helpers Christoph Hellwig
2019-01-14 9:41 ` [PATCH 11/19] dma-iommu: factor contiguous " Christoph Hellwig
2019-01-14 9:41 ` [PATCH 12/19] dma-iommu: refactor iommu_dma_free Christoph Hellwig
2019-01-14 9:41 ` [PATCH 13/19] dma-iommu: don't remap contiguous allocations for coherent devices Christoph Hellwig
2019-01-14 9:41 ` [PATCH 14/19] dma-iommu: factor contiguous remapped allocations into helpers Christoph Hellwig
2019-01-14 9:41 ` [PATCH 15/19] dma-iommu: refactor iommu_dma_alloc Christoph Hellwig
2019-01-14 9:41 ` [PATCH 16/19] dma-iommu: don't depend on CONFIG_DMA_DIRECT_REMAP Christoph Hellwig
2019-02-06 11:55 ` Robin Murphy
2019-02-11 16:39 ` Christoph Hellwig
2019-01-14 9:41 ` [PATCH 17/19] dma-iommu: switch copyright boilerplace to SPDX Christoph Hellwig
2019-02-06 11:57 ` Robin Murphy
2019-01-14 9:41 ` [PATCH 18/19] arm64: switch copyright boilerplace to SPDX in dma-mapping.c Christoph Hellwig
2019-02-06 12:19 ` Robin Murphy
2019-01-14 9:41 ` [PATCH 19/19] arm64: trim includes " Christoph Hellwig
2019-01-28 7:53 ` implement generic dma_map_ops for IOMMUs Christoph Hellwig
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=591d0c09-6361-fa28-06e5-faa98e60bcee@arm.com \
--to=robin.murphy@arm.com \
--cc=catalin.marinas@arm.com \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=thomas.lendacky@amd.com \
--cc=will.deacon@arm.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).