linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dmitry Osipenko <digetx@gmail.com>
To: Thierry Reding <thierry.reding@gmail.com>,
	Jonathan Hunter <jonathanh@nvidia.com>,
	Joerg Roedel <joro@8bytes.org>
Cc: Robin Murphy <robin.murphy@arm.com>,
	iommu@lists.linux-foundation.org, devicetree@vger.kernel.org,
	linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v6 04/21] iommu: Introduce iotlb_sync_map callback
Date: Sun,  9 Dec 2018 23:29:33 +0300	[thread overview]
Message-ID: <20181209202950.31486-5-digetx@gmail.com> (raw)
In-Reply-To: <20181209202950.31486-1-digetx@gmail.com>

Introduce iotlb_sync_map() callback that is invoked in the end of
iommu_map(). This new callback allows IOMMU drivers to avoid syncing
after mapping of each contiguous chunk and sync only when the whole
mapping is completed, optimizing performance of the mapping operation.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
---
 drivers/iommu/iommu.c | 8 ++++++--
 include/linux/iommu.h | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index cc25ec6d4c06..79e7c49ed16a 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -1582,13 +1582,14 @@ static size_t iommu_pgsize(struct iommu_domain *domain,
 int iommu_map(struct iommu_domain *domain, unsigned long iova,
 	      phys_addr_t paddr, size_t size, int prot)
 {
+	const struct iommu_ops *ops = domain->ops;
 	unsigned long orig_iova = iova;
 	unsigned int min_pagesz;
 	size_t orig_size = size;
 	phys_addr_t orig_paddr = paddr;
 	int ret = 0;
 
-	if (unlikely(domain->ops->map == NULL ||
+	if (unlikely(ops->map == NULL ||
 		     domain->pgsize_bitmap == 0UL))
 		return -ENODEV;
 
@@ -1617,7 +1618,7 @@ int iommu_map(struct iommu_domain *domain, unsigned long iova,
 		pr_debug("mapping: iova 0x%lx pa %pa pgsize 0x%zx\n",
 			 iova, &paddr, pgsize);
 
-		ret = domain->ops->map(domain, iova, paddr, pgsize, prot);
+		ret = ops->map(domain, iova, paddr, pgsize, prot);
 		if (ret)
 			break;
 
@@ -1626,6 +1627,9 @@ int iommu_map(struct iommu_domain *domain, unsigned long iova,
 		size -= pgsize;
 	}
 
+	if (ops->iotlb_sync_map)
+		ops->iotlb_sync_map(domain);
+
 	/* unroll mapping in case something went wrong */
 	if (ret)
 		iommu_unmap(domain, orig_iova, orig_size - size);
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 11db18b9ffe8..0e90c5cc72db 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -201,6 +201,7 @@ struct iommu_ops {
 	void (*flush_iotlb_all)(struct iommu_domain *domain);
 	void (*iotlb_range_add)(struct iommu_domain *domain,
 				unsigned long iova, size_t size);
+	void (*iotlb_sync_map)(struct iommu_domain *domain);
 	void (*iotlb_sync)(struct iommu_domain *domain);
 	phys_addr_t (*iova_to_phys)(struct iommu_domain *domain, dma_addr_t iova);
 	int (*add_device)(struct device *dev);
-- 
2.19.1


  parent reply	other threads:[~2018-12-09 20:31 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-09 20:29 [PATCH v6 00/21] IOMMU: Tegra GART driver clean up and optimization Dmitry Osipenko
2018-12-09 20:29 ` [PATCH v6 01/21] iommu/tegra: gart: Remove pr_fmt and clean up includes Dmitry Osipenko
2018-12-09 20:29 ` [PATCH v6 02/21] iommu/tegra: gart: Clean up driver probe errors handling Dmitry Osipenko
2018-12-09 20:29 ` [PATCH v6 03/21] iommu/tegra: gart: Ignore devices without IOMMU phandle in DT Dmitry Osipenko
2018-12-09 20:29 ` Dmitry Osipenko [this message]
2018-12-09 20:29 ` [PATCH v6 05/21] iommu/tegra: gart: Optimize mapping / unmapping performance Dmitry Osipenko
2018-12-09 20:29 ` [PATCH v6 06/21] dt-bindings: memory: tegra: Squash tegra20-gart into tegra20-mc Dmitry Osipenko
2018-12-12 10:02   ` Thierry Reding
2018-12-09 20:29 ` [PATCH v6 07/21] ARM: dts: tegra20: Update Memory Controller node to the new binding Dmitry Osipenko
2018-12-12 10:02   ` Thierry Reding
2018-12-09 20:29 ` [PATCH v6 08/21] memory: tegra: Don't invoke Tegra30+ specific memory timing setup on Tegra20 Dmitry Osipenko
2018-12-12 10:02   ` Thierry Reding
2018-12-09 20:29 ` [PATCH v6 09/21] memory: tegra: Adapt to Tegra20 device-tree binding changes Dmitry Osipenko
2018-12-12 10:05   ` Thierry Reding
2018-12-09 20:29 ` [PATCH v6 10/21] memory: tegra: Read client ID on GART page fault Dmitry Osipenko
2018-12-12 10:05   ` Thierry Reding
2018-12-09 20:29 ` [PATCH v6 11/21] memory: tegra: Use of_device_get_match_data() Dmitry Osipenko
2018-12-12 10:05   ` Thierry Reding
2018-12-09 20:29 ` [PATCH v6 12/21] memory: tegra: Use relaxed versions of readl/writel Dmitry Osipenko
2018-12-12 10:05   ` Thierry Reding
2018-12-09 20:29 ` [PATCH v6 13/21] iommu/tegra: gart: Integrate with Memory Controller driver Dmitry Osipenko
2018-12-12 10:14   ` Thierry Reding
2018-12-12 13:52     ` Dmitry Osipenko
2018-12-09 20:29 ` [PATCH v6 14/21] iommu/tegra: gart: Fix spinlock recursion Dmitry Osipenko
2018-12-09 20:29 ` [PATCH v6 15/21] iommu/tegra: gart: Fix NULL pointer dereference Dmitry Osipenko
2018-12-09 20:29 ` [PATCH v6 16/21] iommu/tegra: gart: Allow only one active domain at a time Dmitry Osipenko
2018-12-09 20:29 ` [PATCH v6 17/21] iommu/tegra: gart: Don't use managed resources Dmitry Osipenko
2018-12-09 20:29 ` [PATCH v6 18/21] iommu/tegra: gart: Prepend error/debug messages with "gart:" Dmitry Osipenko
2018-12-12 10:20   ` Thierry Reding
2018-12-09 20:29 ` [PATCH v6 19/21] iommu/tegra: gart: Don't detach devices from inactive domains Dmitry Osipenko
2018-12-09 20:29 ` [PATCH v6 20/21] iommu/tegra: gart: Simplify clients-tracking code Dmitry Osipenko
2018-12-09 20:29 ` [PATCH v6 21/21] iommu/tegra: gart: Perform code refactoring Dmitry Osipenko
2018-12-12 10:20   ` Thierry Reding
2018-12-11  9:53 ` [PATCH v6 00/21] IOMMU: Tegra GART driver clean up and optimization Joerg Roedel
2018-12-11 13:22   ` Dmitry Osipenko
2018-12-12 10:24   ` Thierry Reding
2018-12-12 10:43     ` Joerg Roedel
2018-12-12 12:49       ` Dmitry Osipenko

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=20181209202950.31486-5-digetx@gmail.com \
    --to=digetx@gmail.com \
    --cc=devicetree@vger.kernel.org \
    --cc=iommu@lists.linux-foundation.org \
    --cc=jonathanh@nvidia.com \
    --cc=joro@8bytes.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=robin.murphy@arm.com \
    --cc=thierry.reding@gmail.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).