From: Nadav Amit <nadav.amit@gmail.com> To: Joerg Roedel <joro@8bytes.org> Cc: Robin Murphy <robin.murphy@arm.com>, Will Deacon <will@kernel.org>, Jiajun Cao <caojiajun@vmware.com>, Lu Baolu <baolu.lu@linux.intel.com>, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/6] iommu: Improve iommu_iotlb_gather helpers Date: Mon, 7 Jun 2021 11:25:38 -0700 [thread overview] Message-ID: <20210607182541.119756-4-namit@vmware.com> (raw) In-Reply-To: <20210607182541.119756-1-namit@vmware.com> From: Robin Murphy <robin.murphy@arm.com> The Mediatek driver is not the only one which might want a basic address-based gathering behaviour, so although it's arguably simple enough to open-code, let's factor it out for the sake of cleanliness. Let's also take this opportunity to document the intent of these helpers for clarity. Cc: Joerg Roedel <joro@8bytes.org> Cc: Will Deacon <will@kernel.org> Cc: Jiajun Cao <caojiajun@vmware.com> Cc: Robin Murphy <robin.murphy@arm.com> Cc: Lu Baolu <baolu.lu@linux.intel.com> Cc: iommu@lists.linux-foundation.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- Changes from Robin's version: * Added iommu_iotlb_gather_add_range() stub !CONFIG_IOMMU_API * Use iommu_iotlb_gather_add_range() in iommu_iotlb_gather_add_page() --- drivers/iommu/mtk_iommu.c | 5 +---- include/linux/iommu.h | 43 ++++++++++++++++++++++++++++++++++----- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index e06b8a0e2b56..0af4a91ac7da 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -523,10 +523,7 @@ static size_t mtk_iommu_unmap(struct iommu_domain *domain, struct mtk_iommu_domain *dom = to_mtk_domain(domain); unsigned long end = iova + size - 1; - if (gather->start > iova) - gather->start = iova; - if (gather->end < end) - gather->end = end; + iommu_iotlb_gather_add_range(gather, iova, size); return dom->iop->unmap(dom->iop, iova, size, gather); } diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 32d448050bf7..f254c62f3720 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -497,6 +497,38 @@ static inline void iommu_iotlb_sync(struct iommu_domain *domain, iommu_iotlb_gather_init(iotlb_gather); } +/** + * iommu_iotlb_gather_add_range - Gather for address-based TLB invalidation + * @gather: TLB gather data + * @iova: start of page to invalidate + * @size: size of page to invalidate + * + * Helper for IOMMU drivers to build arbitrarily-sized invalidation commands + * where only the address range matters, and simply minimising intermediate + * syncs is preferred. + */ +static inline void iommu_iotlb_gather_add_range(struct iommu_iotlb_gather *gather, + unsigned long iova, size_t size) +{ + unsigned long end = iova + size - 1; + + if (gather->start > iova) + gather->start = iova; + if (gather->end < end) + gather->end = end; +} + +/** + * iommu_iotlb_gather_add_page - Gather for page-based TLB invalidation + * @domain: IOMMU domain to be invalidated + * @gather: TLB gather data + * @iova: start of page to invalidate + * @size: size of page to invalidate + * + * Helper for IOMMU drivers to build invalidation commands based on individual + * pages, or with page size/table level hints which cannot be gathered if they + * differ. + */ static inline void iommu_iotlb_gather_add_page(struct iommu_domain *domain, struct iommu_iotlb_gather *gather, unsigned long iova, size_t size) @@ -515,11 +547,7 @@ static inline void iommu_iotlb_gather_add_page(struct iommu_domain *domain, gather->pgsize = size; } - if (gather->end < end) - gather->end = end; - - if (gather->start > start) - gather->start = start; + iommu_iotlb_gather_add_range(gather, iova, size); } /* PCI device grouping function */ @@ -702,6 +730,11 @@ static inline void iommu_iotlb_sync(struct iommu_domain *domain, { } +static inline void iommu_iotlb_gather_add_range(struct iommu_iotlb_gather *gather, + unsigned long iova, size_t size) +{ +} + static inline phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain, dma_addr_t iova) { return 0; -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Nadav Amit <nadav.amit@gmail.com> To: Joerg Roedel <joro@8bytes.org> Cc: Robin Murphy <robin.murphy@arm.com>, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, Jiajun Cao <caojiajun@vmware.com>, Will Deacon <will@kernel.org> Subject: [PATCH v3 3/6] iommu: Improve iommu_iotlb_gather helpers Date: Mon, 7 Jun 2021 11:25:38 -0700 [thread overview] Message-ID: <20210607182541.119756-4-namit@vmware.com> (raw) In-Reply-To: <20210607182541.119756-1-namit@vmware.com> From: Robin Murphy <robin.murphy@arm.com> The Mediatek driver is not the only one which might want a basic address-based gathering behaviour, so although it's arguably simple enough to open-code, let's factor it out for the sake of cleanliness. Let's also take this opportunity to document the intent of these helpers for clarity. Cc: Joerg Roedel <joro@8bytes.org> Cc: Will Deacon <will@kernel.org> Cc: Jiajun Cao <caojiajun@vmware.com> Cc: Robin Murphy <robin.murphy@arm.com> Cc: Lu Baolu <baolu.lu@linux.intel.com> Cc: iommu@lists.linux-foundation.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- Changes from Robin's version: * Added iommu_iotlb_gather_add_range() stub !CONFIG_IOMMU_API * Use iommu_iotlb_gather_add_range() in iommu_iotlb_gather_add_page() --- drivers/iommu/mtk_iommu.c | 5 +---- include/linux/iommu.h | 43 ++++++++++++++++++++++++++++++++++----- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index e06b8a0e2b56..0af4a91ac7da 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -523,10 +523,7 @@ static size_t mtk_iommu_unmap(struct iommu_domain *domain, struct mtk_iommu_domain *dom = to_mtk_domain(domain); unsigned long end = iova + size - 1; - if (gather->start > iova) - gather->start = iova; - if (gather->end < end) - gather->end = end; + iommu_iotlb_gather_add_range(gather, iova, size); return dom->iop->unmap(dom->iop, iova, size, gather); } diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 32d448050bf7..f254c62f3720 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -497,6 +497,38 @@ static inline void iommu_iotlb_sync(struct iommu_domain *domain, iommu_iotlb_gather_init(iotlb_gather); } +/** + * iommu_iotlb_gather_add_range - Gather for address-based TLB invalidation + * @gather: TLB gather data + * @iova: start of page to invalidate + * @size: size of page to invalidate + * + * Helper for IOMMU drivers to build arbitrarily-sized invalidation commands + * where only the address range matters, and simply minimising intermediate + * syncs is preferred. + */ +static inline void iommu_iotlb_gather_add_range(struct iommu_iotlb_gather *gather, + unsigned long iova, size_t size) +{ + unsigned long end = iova + size - 1; + + if (gather->start > iova) + gather->start = iova; + if (gather->end < end) + gather->end = end; +} + +/** + * iommu_iotlb_gather_add_page - Gather for page-based TLB invalidation + * @domain: IOMMU domain to be invalidated + * @gather: TLB gather data + * @iova: start of page to invalidate + * @size: size of page to invalidate + * + * Helper for IOMMU drivers to build invalidation commands based on individual + * pages, or with page size/table level hints which cannot be gathered if they + * differ. + */ static inline void iommu_iotlb_gather_add_page(struct iommu_domain *domain, struct iommu_iotlb_gather *gather, unsigned long iova, size_t size) @@ -515,11 +547,7 @@ static inline void iommu_iotlb_gather_add_page(struct iommu_domain *domain, gather->pgsize = size; } - if (gather->end < end) - gather->end = end; - - if (gather->start > start) - gather->start = start; + iommu_iotlb_gather_add_range(gather, iova, size); } /* PCI device grouping function */ @@ -702,6 +730,11 @@ static inline void iommu_iotlb_sync(struct iommu_domain *domain, { } +static inline void iommu_iotlb_gather_add_range(struct iommu_iotlb_gather *gather, + unsigned long iova, size_t size) +{ +} + static inline phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain, dma_addr_t iova) { return 0; -- 2.25.1 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2021-06-08 1:55 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-07 18:25 [PATCH v3 0/6] iommu/amd: Enable page-selective flushes Nadav Amit 2021-06-07 18:25 ` Nadav Amit 2021-06-07 18:25 ` [PATCH v3 1/6] iommu/amd: Selective flush on unmap Nadav Amit 2021-06-07 18:25 ` Nadav Amit 2021-06-07 18:25 ` [PATCH v3 2/6] iommu/amd: Do not use flush-queue when NpCache is on Nadav Amit 2021-06-07 18:25 ` Nadav Amit 2021-06-15 13:08 ` Robin Murphy 2021-06-15 13:08 ` Robin Murphy 2021-06-15 18:26 ` Nadav Amit 2021-06-15 18:26 ` Nadav Amit 2021-06-15 19:36 ` Robin Murphy 2021-06-15 19:36 ` Robin Murphy 2021-06-07 18:25 ` Nadav Amit [this message] 2021-06-07 18:25 ` [PATCH v3 3/6] iommu: Improve iommu_iotlb_gather helpers Nadav Amit 2021-06-11 13:50 ` Will Deacon 2021-06-11 13:50 ` Will Deacon 2021-06-15 10:42 ` Robin Murphy 2021-06-15 10:42 ` Robin Murphy 2021-06-15 19:05 ` Nadav Amit 2021-06-15 19:05 ` Nadav Amit 2021-06-15 19:07 ` Nadav Amit 2021-06-15 19:07 ` Nadav Amit 2021-06-15 12:29 ` Yong Wu 2021-06-15 12:29 ` Yong Wu 2021-06-15 12:41 ` Robin Murphy 2021-06-15 12:41 ` Robin Murphy 2021-06-07 18:25 ` [PATCH v3 4/6] iommu: Factor iommu_iotlb_gather_is_disjoint() out Nadav Amit 2021-06-07 18:25 ` Nadav Amit 2021-06-11 13:57 ` Will Deacon 2021-06-11 13:57 ` Will Deacon 2021-06-11 16:50 ` Nadav Amit 2021-06-11 16:50 ` Nadav Amit 2021-06-15 10:29 ` Will Deacon 2021-06-15 10:29 ` Will Deacon 2021-06-15 18:54 ` Nadav Amit 2021-06-15 18:54 ` Nadav Amit 2021-06-07 18:25 ` [PATCH v3 5/6] iommu/amd: Tailored gather logic for AMD Nadav Amit 2021-06-07 18:25 ` Nadav Amit 2021-06-15 12:55 ` Robin Murphy 2021-06-15 12:55 ` Robin Murphy 2021-06-15 18:14 ` Nadav Amit 2021-06-15 18:14 ` Nadav Amit 2021-06-15 19:20 ` Robin Murphy 2021-06-15 19:20 ` Robin Murphy 2021-06-15 19:46 ` Nadav Amit 2021-06-15 19:46 ` Nadav Amit 2021-06-07 18:25 ` [PATCH v3 6/6] iommu/amd: Sync once for scatter-gather operations Nadav Amit 2021-06-07 18:25 ` Nadav Amit 2021-06-15 11:25 ` Robin Murphy 2021-06-15 11:25 ` Robin Murphy 2021-06-15 18:51 ` Nadav Amit 2021-06-15 18:51 ` Nadav Amit
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=20210607182541.119756-4-namit@vmware.com \ --to=nadav.amit@gmail.com \ --cc=baolu.lu@linux.intel.com \ --cc=caojiajun@vmware.com \ --cc=iommu@lists.linux-foundation.org \ --cc=joro@8bytes.org \ --cc=linux-kernel@vger.kernel.org \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.