linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Robin Murphy <robin.murphy@arm.com>
Cc: Tom Murphy <tmurphy@arista.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: [PATCH 14/24] iommu/dma: Don't remap CMA unnecessarily
Date: Mon, 20 May 2019 09:29:38 +0200	[thread overview]
Message-ID: <20190520072948.11412-15-hch@lst.de> (raw)
In-Reply-To: <20190520072948.11412-1-hch@lst.de>

From: Robin Murphy <robin.murphy@arm.com>

Always remapping CMA allocations was largely a bodge to keep the freeing
logic manageable when it was split between here and an arch wrapper. Now
that it's all together and streamlined, we can relax that limitation.

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/iommu/dma-iommu.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index 4134f13b5529..cffd30810d41 100644
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -973,7 +973,6 @@ static void *iommu_dma_alloc(struct device *dev, size_t size,
 {
 	bool coherent = dev_is_dma_coherent(dev);
 	int ioprot = dma_info_to_prot(DMA_BIDIRECTIONAL, coherent, attrs);
-	pgprot_t prot = arch_dma_mmap_pgprot(dev, PAGE_KERNEL, attrs);
 	size_t iosize = size;
 	struct page *page;
 	void *addr;
@@ -1021,13 +1020,19 @@ static void *iommu_dma_alloc(struct device *dev, size_t size,
 	if (*handle == DMA_MAPPING_ERROR)
 		goto out_free_pages;
 
-	addr = dma_common_contiguous_remap(page, size, VM_USERMAP, prot,
-			__builtin_return_address(0));
-	if (!addr)
-		goto out_unmap;
+	if (!coherent || PageHighMem(page)) {
+		pgprot_t prot = arch_dma_mmap_pgprot(dev, PAGE_KERNEL, attrs);
 
-	if (!coherent)
-		arch_dma_prep_coherent(page, iosize);
+		addr = dma_common_contiguous_remap(page, size, VM_USERMAP, prot,
+				__builtin_return_address(0));
+		if (!addr)
+			goto out_unmap;
+
+		if (!coherent)
+			arch_dma_prep_coherent(page, iosize);
+	} else {
+		addr = page_address(page);
+	}
 	memset(addr, 0, size);
 	return addr;
 out_unmap:
-- 
2.20.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2019-05-20  7:34 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-20  7:29 implement generic dma_map_ops for IOMMUs v5 Christoph Hellwig
2019-05-20  7:29 ` [PATCH 01/24] arm64/iommu: handle non-remapped addresses in ->mmap and ->get_sgtable Christoph Hellwig
2019-05-22 12:54   ` Will Deacon
2019-05-20  7:29 ` [PATCH 02/24] iommu/dma: Cleanup dma-iommu.h Christoph Hellwig
2019-05-20  7:29 ` [PATCH 03/24] iommu/dma: Remove the flush_page callback Christoph Hellwig
2019-05-20  7:29 ` [PATCH 04/24] iommu/dma: Use for_each_sg in iommu_dma_alloc Christoph Hellwig
2019-05-20  7:29 ` [PATCH 05/24] iommu/dma: move the arm64 wrappers to common code Christoph Hellwig
2019-05-20  7:29 ` [PATCH 06/24] iommu/dma: Move __iommu_dma_map Christoph Hellwig
2019-05-20  7:29 ` [PATCH 07/24] iommu/dma: Move domain lookup into __iommu_dma_{map, unmap} Christoph Hellwig
2019-05-22 13:34   ` Robin Murphy
2019-05-22 15:57     ` Christoph Hellwig
2019-07-29 12:12   ` Shameerali Kolothum Thodi
2019-07-29 13:13     ` Robin Murphy
2019-05-20  7:29 ` [PATCH 08/24] iommu/dma: Squash __iommu_dma_{map,unmap}_page helpers Christoph Hellwig
2019-05-20  7:29 ` [PATCH 09/24] iommu/dma: Factor out remapped pages lookup Christoph Hellwig
2019-05-20  7:29 ` [PATCH 10/24] iommu/dma: Refactor the page array remapping allocator Christoph Hellwig
2019-05-20  7:29 ` [PATCH 11/24] iommu/dma: Remove __iommu_dma_free Christoph Hellwig
2019-05-20  7:29 ` [PATCH 12/24] iommu/dma: Refactor iommu_dma_free Christoph Hellwig
2019-05-20  7:29 ` [PATCH 13/24] iommu/dma: Refactor iommu_dma_alloc Christoph Hellwig
2019-05-20  7:29 ` Christoph Hellwig [this message]
2019-05-20  7:29 ` [PATCH 15/24] iommu/dma: Merge the CMA and alloc_pages allocation paths Christoph Hellwig
2019-05-20  7:29 ` [PATCH 16/24] iommu/dma: Split iommu_dma_free Christoph Hellwig
2019-05-20  7:29 ` [PATCH 17/24] iommu/dma: Cleanup variable naming in iommu_dma_alloc Christoph Hellwig
2019-05-20  7:29 ` [PATCH 18/24] iommu/dma: Refactor iommu_dma_alloc, part 2 Christoph Hellwig
2019-05-20  7:29 ` [PATCH 19/24] iommu/dma: Refactor iommu_dma_get_sgtable Christoph Hellwig
2019-05-20  7:29 ` [PATCH 20/24] iommu/dma: Refactor iommu_dma_mmap Christoph Hellwig
2019-05-22 17:11   ` Robin Murphy
2019-05-20  7:29 ` [PATCH 21/24] iommu/dma: Don't depend on CONFIG_DMA_DIRECT_REMAP Christoph Hellwig
2019-05-20  7:29 ` [PATCH 22/24] iommu/dma: Switch copyright boilerplace to SPDX Christoph Hellwig
2019-05-20  7:29 ` [PATCH 23/24] arm64: switch copyright boilerplace to SPDX in dma-mapping.c Christoph Hellwig
2019-05-20  7:29 ` [PATCH 24/24] arm64: trim includes " Christoph Hellwig
2019-05-27 15:37 ` implement generic dma_map_ops for IOMMUs v5 Joerg Roedel
2019-05-27 15:38   ` Christoph Hellwig
2019-05-27 15:45     ` Joerg Roedel

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=20190520072948.11412-15-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=tmurphy@arista.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).