From: Robin Murphy <robin.murphy@arm.com>
To: Yong Wu <yong.wu@mediatek.com>, Joerg Roedel <joro@8bytes.org>,
Will Deacon <will@kernel.org>
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, youlin.pei@mediatek.com,
Nicolas Boichat <drinkcat@chromium.org>,
anan.sun@mediatek.com, chao.hao@mediatek.com,
jun.wen@mediatek.com
Subject: Re: [PATCH v2 1/6] iommu: Move iotlb_sync_map out from __iommu_map
Date: Wed, 25 Nov 2020 16:37:48 +0000 [thread overview]
Message-ID: <cf0f81dd-e240-965b-5c75-914d3d48eb27@arm.com> (raw)
In-Reply-To: <20201119061836.15238-2-yong.wu@mediatek.com>
On 2020-11-19 06:18, Yong Wu wrote:
> In the end of __iommu_map, It alway call iotlb_sync_map.
> This patch moves iotlb_sync_map out from __iommu_map since it is
> unnecessary to call this for each sg segment especially iotlb_sync_map
> is flush tlb all currently.
I don't see a way to avoid the boilerplate that wouldn't end up making
things even more ugly and complicated, so:
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
> Signed-off-by: Yong Wu <yong.wu@mediatek.com>
> ---
> drivers/iommu/iommu.c | 24 +++++++++++++++++++-----
> 1 file changed, 19 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
> index 8c470f451a32..decef851fa3a 100644
> --- a/drivers/iommu/iommu.c
> +++ b/drivers/iommu/iommu.c
> @@ -2407,9 +2407,6 @@ static 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);
> @@ -2422,15 +2419,29 @@ static int __iommu_map(struct iommu_domain *domain, unsigned long iova,
> 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;
> + int ret;
> +
> might_sleep();
> - return __iommu_map(domain, iova, paddr, size, prot, GFP_KERNEL);
> + ret = __iommu_map(domain, iova, paddr, size, prot, GFP_KERNEL);
> + if (ret == 0 && ops->iotlb_sync_map)
> + ops->iotlb_sync_map(domain);
> +
> + return ret;
> }
> EXPORT_SYMBOL_GPL(iommu_map);
>
> int iommu_map_atomic(struct iommu_domain *domain, unsigned long iova,
> phys_addr_t paddr, size_t size, int prot)
> {
> - return __iommu_map(domain, iova, paddr, size, prot, GFP_ATOMIC);
> + const struct iommu_ops *ops = domain->ops;
> + int ret;
> +
> + ret = __iommu_map(domain, iova, paddr, size, prot, GFP_ATOMIC);
> + if (ret == 0 && ops->iotlb_sync_map)
> + ops->iotlb_sync_map(domain);
> +
> + return ret;
> }
> EXPORT_SYMBOL_GPL(iommu_map_atomic);
>
> @@ -2514,6 +2525,7 @@ static size_t __iommu_map_sg(struct iommu_domain *domain, unsigned long iova,
> struct scatterlist *sg, unsigned int nents, int prot,
> gfp_t gfp)
> {
> + const struct iommu_ops *ops = domain->ops;
> size_t len = 0, mapped = 0;
> phys_addr_t start;
> unsigned int i = 0;
> @@ -2544,6 +2556,8 @@ static size_t __iommu_map_sg(struct iommu_domain *domain, unsigned long iova,
> sg = sg_next(sg);
> }
>
> + if (ops->iotlb_sync_map)
> + ops->iotlb_sync_map(domain);
> return mapped;
>
> out_err:
>
next prev parent reply other threads:[~2020-11-25 16:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-19 6:18 [PATCH v2 0/6] MediaTek IOMMU improve tlb flush performance in map/unmap Yong Wu
2020-11-19 6:18 ` [PATCH v2 1/6] iommu: Move iotlb_sync_map out from __iommu_map Yong Wu
2020-11-25 16:37 ` Robin Murphy [this message]
2020-11-19 6:18 ` [PATCH v2 2/6] iommu: Add iova and size as parameters in iommu_iotlb_map Yong Wu
2020-11-25 16:38 ` Robin Murphy
2020-11-19 6:18 ` [PATCH v2 3/6] iommu/mediatek: Add iotlb_sync_map to sync whole the iova range Yong Wu
2020-11-19 15:33 ` kernel test robot
2020-11-19 16:11 ` kernel test robot
2020-11-25 16:38 ` Robin Murphy
2020-11-19 6:18 ` [PATCH v2 4/6] iommu: Add granule_ignore when tlb gather Yong Wu
2020-11-25 16:38 ` Robin Murphy
2020-11-19 6:18 ` [PATCH v2 5/6] iommu/mediatek: Enable granule_ignore for unmap Yong Wu
2020-11-19 6:18 ` [PATCH v2 6/6] iommu/mediatek: Convert tlb_flush_walk to gather_add_page Yong Wu
2020-11-25 16:38 ` Robin Murphy
2020-11-25 12:27 ` [PATCH v2 0/6] MediaTek IOMMU improve tlb flush performance in map/unmap Will Deacon
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=cf0f81dd-e240-965b-5c75-914d3d48eb27@arm.com \
--to=robin.murphy@arm.com \
--cc=anan.sun@mediatek.com \
--cc=chao.hao@mediatek.com \
--cc=drinkcat@chromium.org \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=jun.wen@mediatek.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=srv_heupstream@mediatek.com \
--cc=tfiga@google.com \
--cc=will@kernel.org \
--cc=yong.wu@mediatek.com \
--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).