From: Tomasz Figa <tfiga@chromium.org>
To: iommu@lists.linux-foundation.org
Cc: Tomasz Figa <tfiga@chromium.org>, Vince Hsu <vinceh@nvidia.com>,
Joerg Roedel <joro@8bytes.org>, Hiroshi Doyu <hdoyu@nvidia.com>,
Stephen Warren <swarren@wwwdotorg.org>,
Thierry Reding <thierry.reding@gmail.com>,
Alexandre Courbot <gnurou@gmail.com>,
Vince Hsu <vince.h@nvidia.com>, Paul Walmsley <paul@pwsan.com>,
Russell King <rmk+kernel@arm.linux.org.uk>,
Mikko Perttunen <mperttunen@nvidia.com>,
Tomeu Vizoso <tomeu.vizoso@collabora.com>,
Will Deacon <will.deacon@arm.com>,
Alex Williamson <alex.williamson@redhat.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Arnd Bergmann <arnd@arndb.de>,
Antonios Motakis <a.motakis@virtualopensystems.com>,
Nicolas Iooss <nicolas.iooss_linux@m4x.org>,
Olav Haugan <ohaugan@codeaurora.org>,
linux-kernel@vger.kernel.org, linux-tegra@vger.kernel.org
Subject: [RFC PATCH 3/3] iommu/tegra-smmu: Make the driver use out of band flushing
Date: Tue, 29 Sep 2015 14:25:26 +0900 [thread overview]
Message-ID: <1443504379-31841-4-git-send-email-tfiga@chromium.org> (raw)
In-Reply-To: <1443504379-31841-1-git-send-email-tfiga@chromium.org>
This patch modifies the tegra-smmu driver to perform PTC and TLB flushes
inside iommu_ops .flush() callback instead of map and unmap operations,
so that performance of large maps and unmaps is heavily optimized due to
elimination of page-by-page flushing.
Signed-off-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Vince Hsu <vinceh@nvidia.com>
---
drivers/iommu/tegra-smmu.c | 91 ++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 83 insertions(+), 8 deletions(-)
diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
index 9305964..92b46d2 100644
--- a/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@ -614,18 +614,54 @@ static void tegra_smmu_pte_put_use(struct tegra_smmu_as *as, unsigned long iova)
}
}
+static void tegra_smmu_pte_put_use_range(struct tegra_smmu_as *as,
+ unsigned long iova, unsigned int len)
+{
+ unsigned int i;
+
+ for (i = 0; i < len; i++)
+ tegra_smmu_pte_put_use(as, iova + i * PAGE_SIZE);
+}
+
static void tegra_smmu_set_pte(struct tegra_smmu_as *as, unsigned long iova,
u32 *pte, dma_addr_t pte_dma, u32 val)
{
- struct tegra_smmu *smmu = as->smmu;
- unsigned long offset = offset_in_page(pte);
-
*pte = val;
+}
+
+static void tegra_smmu_flush_pte_range(struct tegra_smmu_as *as,
+ unsigned long iova, unsigned int num_ptes, u32 *pte,
+ dma_addr_t pt_dma)
+{
+ struct tegra_smmu *smmu = as->smmu;
+ unsigned int tlb_lines_per_atom;
+ unsigned int ptes_per_tlb_line;
+ unsigned int ptes_per_atom;
+ unsigned long offset;
+ unsigned long iova_end;
+ int i;
+
+ ptes_per_atom = smmu->mc->soc->atom_size / sizeof(*pte);
+ ptes_per_tlb_line = smmu->soc->tlb_line_size / sizeof(*pte);
+ tlb_lines_per_atom = smmu->mc->soc->atom_size
+ / smmu->soc->tlb_line_size;
+
+ offset = round_down(offset_in_page(pte), smmu->mc->soc->atom_size);
+
+ iova_end = iova + num_ptes * PAGE_SIZE;
+ iova = round_down(iova, ptes_per_atom * PAGE_SIZE);
+ iova_end = round_up(iova_end, ptes_per_atom * PAGE_SIZE);
+ num_ptes = (iova_end - iova) / PAGE_SIZE;
+ while (num_ptes) {
+ smmu_flush_ptc(smmu, pt_dma, offset);
+ for (i = 0; i < tlb_lines_per_atom; i++) {
+ smmu_flush_tlb_group(smmu, as->id, iova);
+ iova += ptes_per_tlb_line * PAGE_SIZE;
+ }
+ offset += smmu->mc->soc->atom_size;
+ num_ptes -= ptes_per_atom;
+ }
- dma_sync_single_range_for_device(smmu->dev, pte_dma, offset,
- 4, DMA_TO_DEVICE);
- smmu_flush_ptc(smmu, pte_dma, offset);
- smmu_flush_tlb_group(smmu, as->id, iova);
smmu_flush(smmu);
}
@@ -662,11 +698,49 @@ static size_t tegra_smmu_unmap(struct iommu_domain *domain, unsigned long iova,
return 0;
tegra_smmu_set_pte(as, iova, pte, pte_dma, 0);
- tegra_smmu_pte_put_use(as, iova);
return size;
}
+static void tegra_smmu_flush(struct iommu_domain *domain, unsigned long iova,
+ size_t size)
+{
+ struct tegra_smmu_as *as = to_smmu_as(domain);
+ struct tegra_smmu *smmu = as->smmu;
+ u32 num = size >> PAGE_SHIFT;
+
+ might_sleep();
+
+ while (num) {
+ unsigned int pt_index = iova_pt_index(iova);
+ unsigned int len, end;
+ unsigned long offset;
+ dma_addr_t pte_dma;
+ u32 *pte;
+
+ end = pt_index + num;
+ if (end > SMMU_NUM_PTE)
+ end = SMMU_NUM_PTE;
+ len = end - pt_index;
+
+ pte = tegra_smmu_pte_lookup(as, iova, &pte_dma);
+ if (!pte)
+ goto next_pde;
+
+ offset = offset_in_page(pte);
+ dma_sync_single_range_for_device(smmu->dev, pte_dma, offset,
+ sizeof(*pte) * len, DMA_TO_DEVICE);
+
+ tegra_smmu_flush_pte_range(as, iova, len, pte, pte_dma);
+ if (*pte == 0)
+ tegra_smmu_pte_put_use_range(as, iova, len);
+
+next_pde:
+ num -= len;
+ iova += len << PAGE_SHIFT;
+ }
+}
+
static phys_addr_t tegra_smmu_iova_to_phys(struct iommu_domain *domain,
dma_addr_t iova)
{
@@ -743,6 +817,7 @@ static const struct iommu_ops tegra_smmu_ops = {
.map = tegra_smmu_map,
.unmap = tegra_smmu_unmap,
.map_sg = default_iommu_map_sg,
+ .flush = tegra_smmu_flush,
.iova_to_phys = tegra_smmu_iova_to_phys,
.pgsize_bitmap = SZ_4K,
--
2.6.0.rc2.230.g3dd15c0
next prev parent reply other threads:[~2015-09-29 5:28 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-29 5:25 [RFC PATCH 0/3] iommu: Add range flush operation Tomasz Figa
2015-09-29 5:25 ` [RFC PATCH 1/3] iommu: Add support for out of band flushing Tomasz Figa
2015-09-29 9:32 ` Thierry Reding
2015-09-29 11:56 ` Tomasz Figa
2015-09-29 5:25 ` [RFC PATCH 2/3] memory: tegra: add TLB cache line size Tomasz Figa
2015-09-29 9:43 ` Thierry Reding
2015-09-29 12:11 ` Tomasz Figa
2015-09-29 5:25 ` Tomasz Figa [this message]
2015-09-29 9:27 ` [RFC PATCH 0/3] iommu: Add range flush operation Thierry Reding
2015-09-29 11:54 ` Tomasz Figa
2015-09-29 12:22 ` Joerg Roedel
2015-09-29 12:20 ` Joerg Roedel
2015-09-29 14:20 ` Robin Murphy
2015-09-29 14:32 ` Russell King - ARM Linux
2015-09-29 16:27 ` Robin Murphy
2015-09-29 16:40 ` Russell King - ARM Linux
2015-09-29 17:13 ` Robin Murphy
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=1443504379-31841-4-git-send-email-tfiga@chromium.org \
--to=tfiga@chromium.org \
--cc=a.motakis@virtualopensystems.com \
--cc=alex.williamson@redhat.com \
--cc=arnd@arndb.de \
--cc=gnurou@gmail.com \
--cc=hdoyu@nvidia.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=mperttunen@nvidia.com \
--cc=nicolas.iooss_linux@m4x.org \
--cc=ohaugan@codeaurora.org \
--cc=paul@pwsan.com \
--cc=rmk+kernel@arm.linux.org.uk \
--cc=swarren@wwwdotorg.org \
--cc=thierry.reding@gmail.com \
--cc=tomeu.vizoso@collabora.com \
--cc=vince.h@nvidia.com \
--cc=vinceh@nvidia.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
all inboxes | Powered by JetHome®