From: Christoph Hellwig <hch@lst.de>
To: Robin Murphy <robin.murphy@arm.com>
Cc: Joerg Roedel <joro@8bytes.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
iommu@lists.linux-foundation.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 08/21] dma-iommu: refactor iommu_dma_mmap
Date: Wed, 13 Feb 2019 19:29:07 +0100 [thread overview]
Message-ID: <20190213182920.16764-9-hch@lst.de> (raw)
In-Reply-To: <20190213182920.16764-1-hch@lst.de>
Move the vm_area handling into __iommu_dma_mmap, which is renamed
to iommu_dma_mmap_remap.
Inline __iommu_dma_mmap_pfn into the main function to simplify the code
flow a bit.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/iommu/dma-iommu.c | 50 ++++++++++++++-------------------------
1 file changed, 18 insertions(+), 32 deletions(-)
diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index c320c52cdac4..ed2ef8409806 100644
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -598,23 +598,27 @@ static struct page **__iommu_dma_alloc(struct device *dev, size_t size,
}
/**
- * __iommu_dma_mmap - Map a buffer into provided user VMA
- * @pages: Array representing buffer from __iommu_dma_alloc()
+ * iommu_dma_mmap_remap - Map a remapped page array into provided user VMA
+ * @cpu_addr: virtual address of the memory to be remapped
* @size: Size of buffer in bytes
* @vma: VMA describing requested userspace mapping
*
- * Maps the pages of the buffer in @pages into @vma. The caller is responsible
+ * Maps the pages pointed to by @cpu_addr into @vma. The caller is responsible
* for verifying the correct size and protection of @vma beforehand.
*/
-static int __iommu_dma_mmap(struct page **pages, size_t size,
+static int iommu_dma_mmap_remap(void *cpu_addr, size_t size,
struct vm_area_struct *vma)
{
+ struct vm_struct *area = find_vm_area(cpu_addr);
unsigned long uaddr = vma->vm_start;
unsigned int i, count = PAGE_ALIGN(size) >> PAGE_SHIFT;
int ret = -ENXIO;
+ if (WARN_ON(!area || !area->pages))
+ return -ENXIO;
+
for (i = vma->vm_pgoff; i < count && uaddr < vma->vm_end; i++) {
- ret = vm_insert_page(vma, uaddr, pages[i]);
+ ret = vm_insert_page(vma, uaddr, area->pages[i]);
if (ret)
break;
uaddr += PAGE_SIZE;
@@ -1053,21 +1057,13 @@ static void iommu_dma_free(struct device *dev, size_t size, void *cpu_addr,
}
}
-static int __iommu_dma_mmap_pfn(struct vm_area_struct *vma,
- unsigned long pfn, size_t size)
-{
- return remap_pfn_range(vma, vma->vm_start, pfn + vma->vm_pgoff,
- vma->vm_end - vma->vm_start,
- vma->vm_page_prot);
-}
-
static int iommu_dma_mmap(struct device *dev, struct vm_area_struct *vma,
void *cpu_addr, dma_addr_t dma_addr, size_t size,
unsigned long attrs)
{
unsigned long nr_pages = PAGE_ALIGN(size) >> PAGE_SHIFT;
unsigned long off = vma->vm_pgoff;
- struct vm_struct *area;
+ unsigned long pfn;
int ret;
vma->vm_page_prot = arch_dma_mmap_pgprot(dev, vma->vm_page_prot, attrs);
@@ -1078,25 +1074,15 @@ static int iommu_dma_mmap(struct device *dev, struct vm_area_struct *vma,
if (off >= nr_pages || vma_pages(vma) > nr_pages - off)
return -ENXIO;
- if (!is_vmalloc_addr(cpu_addr)) {
- unsigned long pfn = page_to_pfn(virt_to_page(cpu_addr));
- return __iommu_dma_mmap_pfn(vma, pfn, size);
- }
+ if (is_vmalloc_addr(cpu_addr)) {
+ if (!(attrs & DMA_ATTR_FORCE_CONTIGUOUS))
+ return iommu_dma_mmap_remap(cpu_addr, size, vma);
+ pfn = vmalloc_to_pfn(cpu_addr);
+ } else
+ pfn = page_to_pfn(virt_to_page(cpu_addr));
- if (attrs & DMA_ATTR_FORCE_CONTIGUOUS) {
- /*
- * DMA_ATTR_FORCE_CONTIGUOUS allocations are always remapped,
- * hence in the vmalloc space.
- */
- unsigned long pfn = vmalloc_to_pfn(cpu_addr);
- return __iommu_dma_mmap_pfn(vma, pfn, size);
- }
-
- area = find_vm_area(cpu_addr);
- if (WARN_ON(!area || !area->pages))
- return -ENXIO;
-
- return __iommu_dma_mmap(area->pages, size, vma);
+ return remap_pfn_range(vma, vma->vm_start, pfn + vma->vm_pgoff,
+ vma_pages(vma) << PAGE_SHIFT, vma->vm_page_prot);
}
static int __iommu_dma_get_sgtable_page(struct sg_table *sgt, struct page *page,
--
2.20.1
next prev parent reply other threads:[~2019-02-13 18:31 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-13 18:28 implement generic dma_map_ops for IOMMUs v2 Christoph Hellwig
2019-02-13 18:29 ` [PATCH 01/21] arm64/iommu: handle non-remapped addresses in ->mmap and ->get_sgtable Christoph Hellwig
2019-02-13 18:29 ` [PATCH 02/21] arm64/iommu: improve mmap bounds checking Christoph Hellwig
2019-02-13 18:29 ` [PATCH 03/21] dma-mapping: add a Kconfig symbol to indicated arch_dma_prep_coherent presence Christoph Hellwig
2019-02-13 18:29 ` [PATCH 04/21] dma-iommu: cleanup dma-iommu.h Christoph Hellwig
2019-02-13 18:29 ` [PATCH 05/21] dma-iommu: remove the flush_page callback Christoph Hellwig
2019-02-13 18:29 ` [PATCH 06/21] dma-iommu: use for_each_sg in iommu_dma_alloc Christoph Hellwig
2019-02-13 18:29 ` [PATCH 07/21] dma-iommu: move the arm64 wrappers to common code Christoph Hellwig
2019-02-13 18:29 ` Christoph Hellwig [this message]
2019-02-13 18:29 ` [PATCH 09/21] dma-iommu: refactor iommu_dma_get_sgtable Christoph Hellwig
2019-02-13 18:29 ` [PATCH 10/21] dma-iommu: move __iommu_dma_map Christoph Hellwig
2019-02-13 18:29 ` [PATCH 11/21] dma-iommu: refactor page array remap helpers Christoph Hellwig
2019-02-13 18:29 ` [PATCH 12/21] dma-iommu: factor atomic pool allocations into helpers Christoph Hellwig
2019-02-13 18:29 ` [PATCH 13/21] dma-iommu: factor contiguous " Christoph Hellwig
2019-02-13 18:29 ` [PATCH 14/21] dma-iommu: refactor iommu_dma_free Christoph Hellwig
2019-02-13 18:29 ` [PATCH 15/21] dma-iommu: don't remap contiguous allocations for coherent devices Christoph Hellwig
2019-02-13 18:29 ` [PATCH 16/21] dma-iommu: factor contiguous remapped allocations into helpers Christoph Hellwig
2019-02-13 18:29 ` [PATCH 17/21] dma-iommu: refactor iommu_dma_alloc Christoph Hellwig
2019-02-13 18:29 ` [PATCH 18/21] dma-iommu: don't depend on CONFIG_DMA_DIRECT_REMAP Christoph Hellwig
2019-02-13 18:29 ` [PATCH 19/21] dma-iommu: switch copyright boilerplace to SPDX Christoph Hellwig
2019-02-13 18:29 ` [PATCH 20/21] arm64: switch copyright boilerplace to SPDX in dma-mapping.c Christoph Hellwig
2019-02-13 18:29 ` [PATCH 21/21] arm64: trim includes " Christoph Hellwig
2019-03-27 8:04 implement generic dma_map_ops for IOMMUs v2 [rebase + resend] Christoph Hellwig
2019-03-27 8:04 ` [PATCH 08/21] dma-iommu: refactor iommu_dma_mmap Christoph Hellwig
2019-04-09 15:29 ` Robin Murphy
2019-04-09 17:25 ` 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=20190213182920.16764-9-hch@lst.de \
--to=hch@lst.de \
--cc=catalin.marinas@arm.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--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).