From: Yong Wu <yong.wu@mediatek.com>
To: Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
Robin Murphy <robin.murphy@arm.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>,
Krzysztof Kozlowski <krzk@kernel.org>,
Tomasz Figa <tfiga@google.com>,
<linux-mediatek@lists.infradead.org>,
<srv_heupstream@mediatek.com>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<iommu@lists.linux-foundation.org>, <yong.wu@mediatek.com>,
<youlin.pei@mediatek.com>,
Nicolas Boichat <drinkcat@chromium.org>, <anan.sun@mediatek.com>,
<chao.hao@mediatek.com>, Greg Kroah-Hartman <gregkh@google.com>,
<kernel-team@android.com>
Subject: [PATCH v3 6/7] iommu/mediatek: Gather iova in iommu_unmap to achieve tlb sync once
Date: Wed, 16 Dec 2020 18:36:06 +0800 [thread overview]
Message-ID: <20201216103607.23050-7-yong.wu@mediatek.com> (raw)
In-Reply-To: <20201216103607.23050-1-yong.wu@mediatek.com>
In current iommu_unmap, this code is:
iommu_iotlb_gather_init(&iotlb_gather);
ret = __iommu_unmap(domain, iova, size, &iotlb_gather);
iommu_iotlb_sync(domain, &iotlb_gather);
We could gather the whole iova range in __iommu_unmap, and then do tlb
synchronization in the iommu_iotlb_sync.
This patch implement this, Gather the range in mtk_iommu_unmap.
then iommu_iotlb_sync call tlb synchronization for the gathered iova range.
we don't call iommu_iotlb_gather_add_page since our tlb synchronization
could be regardless of granule size.
In this way, gather->start is impossible ULONG_MAX, remove the checking.
This patch aims to do tlb synchronization *once* in the iommu_unmap.
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
drivers/iommu/mtk_iommu.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index db7d43adb06b..89cec51405cd 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -506,7 +506,12 @@ static size_t mtk_iommu_unmap(struct iommu_domain *domain,
struct iommu_iotlb_gather *gather)
{
struct mtk_iommu_domain *dom = to_mtk_domain(domain);
+ unsigned long long end = iova + size;
+ if (gather->start > iova)
+ gather->start = iova;
+ if (gather->end < end)
+ gather->end = end;
return dom->iop->unmap(dom->iop, iova, size, gather);
}
@@ -523,9 +528,6 @@ static void mtk_iommu_iotlb_sync(struct iommu_domain *domain,
struct mtk_iommu_domain *dom = to_mtk_domain(domain);
size_t length = gather->end - gather->start;
- if (gather->start == ULONG_MAX)
- return;
-
mtk_iommu_tlb_flush_range_sync(gather->start, length, gather->pgsize,
dom->data);
}
--
2.18.0
next prev parent reply other threads:[~2020-12-16 10:37 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-16 10:36 [PATCH v3 0/7] MediaTek IOMMU improve tlb flush performance in map/unmap Yong Wu
2020-12-16 10:36 ` [PATCH v3 1/7] iommu: Move iotlb_sync_map out from __iommu_map Yong Wu
2020-12-23 8:51 ` Christoph Hellwig
2020-12-24 11:27 ` Yong Wu
2020-12-16 10:36 ` [PATCH v3 2/7] iommu: Add iova and size as parameters in iotlb_sync_map Yong Wu
2020-12-16 10:36 ` [PATCH v3 3/7] iommu/mediatek: Add iotlb_sync_map to sync whole the iova range Yong Wu
2020-12-16 10:36 ` [PATCH v3 4/7] iommu: Switch gather->end to unsigned long long Yong Wu
2020-12-16 11:03 ` David Laight
2020-12-17 2:26 ` Yong Wu
2020-12-16 12:10 ` Robin Murphy
2020-12-17 2:26 ` Yong Wu
2020-12-16 10:36 ` [PATCH v3 5/7] iommu: Allow io_pgtable_tlb ops optional Yong Wu
2021-01-18 16:18 ` Robin Murphy
2020-12-16 10:36 ` Yong Wu [this message]
2020-12-23 8:56 ` [PATCH v3 6/7] iommu/mediatek: Gather iova in iommu_unmap to achieve tlb sync once Tomasz Figa
2020-12-23 11:00 ` Robin Murphy
2021-01-08 9:56 ` Tomasz Figa
2021-01-08 9:56 ` Tomasz Figa
2021-01-18 16:35 ` Robin Murphy
2021-01-18 16:58 ` Will Deacon
2021-01-18 17:14 ` Robin Murphy
2020-12-16 10:36 ` [PATCH v3 7/7] iommu/mediatek: Remove the tlb-ops for v7s Yong Wu
2021-01-18 16:39 ` 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=20201216103607.23050-7-yong.wu@mediatek.com \
--to=yong.wu@mediatek.com \
--cc=anan.sun@mediatek.com \
--cc=chao.hao@mediatek.com \
--cc=drinkcat@chromium.org \
--cc=gregkh@google.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=kernel-team@android.com \
--cc=krzk@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=robin.murphy@arm.com \
--cc=srv_heupstream@mediatek.com \
--cc=tfiga@google.com \
--cc=will@kernel.org \
--cc=youlin.pei@mediatek.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).