From: Lu Baolu <baolu.lu@linux.intel.com>
To: Georgi Djakov <quic_c_gdjako@quicinc.com>,
will@kernel.org, robin.murphy@arm.com
Cc: baolu.lu@linux.intel.com, joro@8bytes.org, isaacm@codeaurora.org,
pratikp@codeaurora.org, iommu@lists.linux-foundation.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, djakov@kernel.org
Subject: Re: [PATCH v7 08/15] iommu: Add support for the map_pages() callback
Date: Thu, 17 Jun 2021 15:18:39 +0800 [thread overview]
Message-ID: <bc003ab7-5067-53de-a94e-815462991f8f@linux.intel.com> (raw)
In-Reply-To: <1623850736-389584-9-git-send-email-quic_c_gdjako@quicinc.com>
On 6/16/21 9:38 PM, Georgi Djakov wrote:
> From: "Isaac J. Manjarres" <isaacm@codeaurora.org>
>
> Since iommu_pgsize can calculate how many pages of the
> same size can be mapped/unmapped before the next largest
> page size boundary, add support for invoking an IOMMU
> driver's map_pages() callback, if it provides one.
>
> Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
> Suggested-by: Will Deacon <will@kernel.org>
> Signed-off-by: Georgi Djakov <quic_c_gdjako@quicinc.com>
> ---
> drivers/iommu/iommu.c | 43 +++++++++++++++++++++++++++++++++++--------
> 1 file changed, 35 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
> index 725622c7e603..70a729ce88b1 100644
> --- a/drivers/iommu/iommu.c
> +++ b/drivers/iommu/iommu.c
> @@ -2429,6 +2429,30 @@ static size_t iommu_pgsize(struct iommu_domain *domain, unsigned long iova,
> return pgsize;
> }
>
> +static int __iommu_map_pages(struct iommu_domain *domain, unsigned long iova,
> + phys_addr_t paddr, size_t size, int prot,
> + gfp_t gfp, size_t *mapped)
> +{
> + const struct iommu_ops *ops = domain->ops;
> + size_t pgsize, count;
> + int ret;
> +
> + pgsize = iommu_pgsize(domain, iova, paddr, size, &count);
> +
> + pr_debug("mapping: iova 0x%lx pa %pa pgsize 0x%zx count %zu\n",
> + iova, &paddr, pgsize, count);
> +
> + if (ops->map_pages) {
> + ret = ops->map_pages(domain, iova, paddr, pgsize, count, prot,
> + gfp, mapped);
> + } else {
> + ret = ops->map(domain, iova, paddr, pgsize, prot, gfp);
> + *mapped = ret ? 0 : pgsize;
> + }
> +
> + return ret;
> +}
> +
> static int __iommu_map(struct iommu_domain *domain, unsigned long iova,
> phys_addr_t paddr, size_t size, int prot, gfp_t gfp)
> {
> @@ -2439,7 +2463,7 @@ static int __iommu_map(struct iommu_domain *domain, unsigned long iova,
> phys_addr_t orig_paddr = paddr;
> int ret = 0;
>
> - if (unlikely(ops->map == NULL ||
> + if (unlikely(!(ops->map || ops->map_pages) ||
> domain->pgsize_bitmap == 0UL))
> return -ENODEV;
>
> @@ -2463,18 +2487,21 @@ static int __iommu_map(struct iommu_domain *domain, unsigned long iova,
> pr_debug("map: iova 0x%lx pa %pa size 0x%zx\n", iova, &paddr, size);
>
> while (size) {
> - size_t pgsize = iommu_pgsize(domain, iova, paddr, size, NULL);
> + size_t mapped = 0;
>
> - pr_debug("mapping: iova 0x%lx pa %pa pgsize 0x%zx\n",
> - iova, &paddr, pgsize);
> - ret = ops->map(domain, iova, paddr, pgsize, prot, gfp);
> + ret = __iommu_map_pages(domain, iova, paddr, size, prot, gfp,
> + &mapped);
> + /*
> + * Some pages may have been mapped, even if an error occurred,
> + * so we should account for those so they can be unmapped.
> + */
> + size -= mapped;
>
> if (ret)
> break;
>
> - iova += pgsize;
> - paddr += pgsize;
> - size -= pgsize;
> + iova += mapped;
> + paddr += mapped;
> }
>
> /* unroll mapping in case something went wrong */
>
Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
Best regards,
baolu
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-06-17 7:21 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-16 13:38 [PATCH v7 00/15] Optimizing iommu_[map/unmap] performance Georgi Djakov
2021-06-16 13:38 ` [PATCH v7 01/15] iommu/io-pgtable: Introduce unmap_pages() as a page table op Georgi Djakov
2021-06-16 13:38 ` [PATCH v7 02/15] iommu: Add an unmap_pages() op for IOMMU drivers Georgi Djakov
2021-06-16 13:38 ` [PATCH v7 03/15] iommu/io-pgtable: Introduce map_pages() as a page table op Georgi Djakov
2021-06-16 13:38 ` [PATCH v7 04/15] iommu: Add a map_pages() op for IOMMU drivers Georgi Djakov
2021-06-16 13:38 ` [PATCH v7 05/15] iommu: Use bitmap to calculate page size in iommu_pgsize() Georgi Djakov
2021-06-17 7:16 ` Lu Baolu
2021-06-16 13:38 ` [PATCH v7 06/15] iommu: Split 'addr_merge' argument to iommu_pgsize() into separate parts Georgi Djakov
2021-06-17 7:17 ` Lu Baolu
2021-06-16 13:38 ` [PATCH v7 07/15] iommu: Hook up '->unmap_pages' driver callback Georgi Djakov
2021-06-17 7:18 ` Lu Baolu
2021-06-16 13:38 ` [PATCH v7 08/15] iommu: Add support for the map_pages() callback Georgi Djakov
2021-06-17 7:18 ` Lu Baolu [this message]
2021-06-16 13:38 ` [PATCH v7 09/15] iommu/io-pgtable-arm: Prepare PTE methods for handling multiple entries Georgi Djakov
2021-06-16 13:38 ` [PATCH v7 10/15] iommu/io-pgtable-arm: Implement arm_lpae_unmap_pages() Georgi Djakov
2021-07-15 9:31 ` Kunkun Jiang
2021-06-16 13:38 ` [PATCH v7 11/15] iommu/io-pgtable-arm: Implement arm_lpae_map_pages() Georgi Djakov
2021-06-16 13:38 ` [PATCH v7 12/15] iommu/io-pgtable-arm-v7s: Implement arm_v7s_unmap_pages() Georgi Djakov
2021-06-16 13:38 ` [PATCH v7 13/15] iommu/io-pgtable-arm-v7s: Implement arm_v7s_map_pages() Georgi Djakov
2021-06-16 13:38 ` [PATCH v7 14/15] iommu/arm-smmu: Implement the unmap_pages() IOMMU driver callback Georgi Djakov
2021-06-16 13:38 ` [PATCH v7 15/15] iommu/arm-smmu: Implement the map_pages() " Georgi Djakov
2021-07-14 14:24 ` [PATCH v7 00/15] Optimizing iommu_[map/unmap] performance Georgi Djakov
2021-07-15 1:23 ` Lu Baolu
2021-07-15 1:51 ` chenxiang (M)
2021-07-26 10:37 ` 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=bc003ab7-5067-53de-a94e-815462991f8f@linux.intel.com \
--to=baolu.lu@linux.intel.com \
--cc=djakov@kernel.org \
--cc=iommu@lists.linux-foundation.org \
--cc=isaacm@codeaurora.org \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pratikp@codeaurora.org \
--cc=quic_c_gdjako@quicinc.com \
--cc=robin.murphy@arm.com \
--cc=will@kernel.org \
/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).