[lkml]   [2021]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subject[PATCH v7 00/15] Optimizing iommu_[map/unmap] performance
When unmapping a buffer from an IOMMU domain, the IOMMU framework unmaps
the buffer at a granule of the largest page size that is supported by
the IOMMU hardware and fits within the buffer. For every block that
is unmapped, the IOMMU framework will call into the IOMMU driver, and
then the io-pgtable framework to walk the page tables to find the entry
that corresponds to the IOVA, and then unmaps the entry.

This can be suboptimal in scenarios where a buffer or a piece of a
buffer can be split into several contiguous page blocks of the same size.
For example, consider an IOMMU that supports 4 KB page blocks, 2 MB page
blocks, and 1 GB page blocks, and a buffer that is 4 MB in size is being
unmapped at IOVA 0. The current call-flow will result in 4 indirect calls,
and 2 page table walks, to unmap 2 entries that are next to each other in
the page-tables, when both entries could have been unmapped in one shot
by clearing both page table entries in the same call.

The same optimization is applicable to mapping buffers as well, so
these patches implement a set of callbacks called unmap_pages and
map_pages to the io-pgtable code and IOMMU drivers which unmaps or maps
an IOVA range that consists of a number of pages of the same
page size that is supported by the IOMMU hardware, and allows for
manipulating multiple page table entries in the same set of indirect
calls. The reason for introducing these callbacks is to give other IOMMU
drivers/io-pgtable formats time to change to using the new callbacks, so
that the transition to using this approach can be done piecemeal.

Changes since V6:

* Fix compiler warning (patch 08/15)
* Free underlying page tables for large mappings (patch 10/15)
Consider the case where a 2N--where N > 1--MB buffer is composed
entirely of 4 KB pages. This means that at the second to last level,
the buffer will have N non-leaf entries that point to page tables
with 4 KB mappings.

When the buffer is unmapped, all N entries will be cleared at the
second to last level. However, the existing logic only checks if
it needs to free the underlying page tables for the first non-leaf
entry. Therefore, the page table memory for the other entries N-1
entries will be leaked.

Fix this memory leak by ensuring that we apply the same check to
all N entries that are being unmapped.

When unmapping multiple entries, __arm_lpae_unmap() should unmap
one entry at a time and perform TLB maintenance as required for that

Changes since V5:

* Rebased on next-20210515.
* Fixed minor checkpatch warnings - indentation, extra blank lines.
* Use the correct function argument in __arm_lpae_map(). (chenxiang)

Changes since V4:

* Fixed type for addr_merge from phys_addr_t to unsigned long so
that GENMASK() can be used.
* Hooked up arm_v7s_[unmap/map]_pages to the io-pgtable ops.
* Introduced a macro for calculating the number of page table entries
for the ARM LPAE io-pgtable format.

Changes since V3:

* Removed usage of ULL variants of bitops from Will's patches, as
they were not needed.
* Instead of unmapping/mapping pgcount pages, unmap_pages() and
map_pages() will at most unmap and map pgcount pages, allowing
for part of the pages in pgcount to be mapped and unmapped. This
was done to simplify the handling in the io-pgtable layer.
* Extended the existing PTE manipulation methods in io-pgtable-arm
to handle multiple entries, per Robin's suggestion, eliminating
the need to add functions to clear multiple PTEs.
* Implemented a naive form of [map/unmap]_pages() for ARM v7s io-pgtable
* arm_[v7s/lpae]_[map/unmap] will call
arm_[v7s/lpae]_[map_pages/unmap_pages] with an argument of 1 page.
* The arm_smmu_[map/unmap] functions have been removed, since they
have been replaced by arm_smmu_[map/unmap]_pages.

Changes since V2:

* Added a check in __iommu_map() to check for the existence
of either the map or map_pages callback as per Lu's suggestion.

Changes since V1:

* Implemented the map_pages() callbacks
* Integrated Will's patches into this series which
address several concerns about how iommu_pgsize() partitioned a
buffer (I made a minor change to the patch which changes
iommu_pgsize() to use bitmaps by using the ULL variants of
the bitops)

Isaac J. Manjarres (12):
iommu/io-pgtable: Introduce unmap_pages() as a page table op
iommu: Add an unmap_pages() op for IOMMU drivers
iommu/io-pgtable: Introduce map_pages() as a page table op
iommu: Add a map_pages() op for IOMMU drivers
iommu: Add support for the map_pages() callback
iommu/io-pgtable-arm: Prepare PTE methods for handling multiple
iommu/io-pgtable-arm: Implement arm_lpae_unmap_pages()
iommu/io-pgtable-arm: Implement arm_lpae_map_pages()
iommu/io-pgtable-arm-v7s: Implement arm_v7s_unmap_pages()
iommu/io-pgtable-arm-v7s: Implement arm_v7s_map_pages()
iommu/arm-smmu: Implement the unmap_pages() IOMMU driver callback
iommu/arm-smmu: Implement the map_pages() IOMMU driver callback

Will Deacon (3):
iommu: Use bitmap to calculate page size in iommu_pgsize()
iommu: Split 'addr_merge' argument to iommu_pgsize() into separate
iommu: Hook up '->unmap_pages' driver callback

drivers/iommu/arm/arm-smmu/arm-smmu.c | 18 +--
drivers/iommu/io-pgtable-arm-v7s.c | 50 ++++++--
drivers/iommu/io-pgtable-arm.c | 223 +++++++++++++++++++++-------------
drivers/iommu/iommu.c | 129 +++++++++++++++-----
include/linux/io-pgtable.h | 8 ++
include/linux/iommu.h | 9 ++
6 files changed, 307 insertions(+), 130 deletions(-)

 \ /
  Last update: 2021-06-16 15:40    [W:0.157 / U:0.788 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site