Skip to content

Commit fc57475

Browse files
LuBaolugregkh
authored andcommitted
iommu/vt-d: Optimize iotlb_sync_map for non-caching/non-RWBF modes
commit 12724ce upstream. The iotlb_sync_map iommu ops allows drivers to perform necessary cache flushes when new mappings are established. For the Intel iommu driver, this callback specifically serves two purposes: - To flush caches when a second-stage page table is attached to a device whose iommu is operating in caching mode (CAP_REG.CM==1). - To explicitly flush internal write buffers to ensure updates to memory- resident remapping structures are visible to hardware (CAP_REG.RWBF==1). However, in scenarios where neither caching mode nor the RWBF flag is active, the cache_tag_flush_range_np() helper, which is called in the iotlb_sync_map path, effectively becomes a no-op. Despite being a no-op, cache_tag_flush_range_np() involves iterating through all cache tags of the iommu's attached to the domain, protected by a spinlock. This unnecessary execution path introduces overhead, leading to a measurable I/O performance regression. On systems with NVMes under the same bridge, performance was observed to drop from approximately ~6150 MiB/s down to ~4985 MiB/s. Introduce a flag in the dmar_domain structure. This flag will only be set when iotlb_sync_map is required (i.e., when CM or RWBF is set). The cache_tag_flush_range_np() is called only for domains where this flag is set. This flag, once set, is immutable, given that there won't be mixed configurations in real-world scenarios where some IOMMUs in a system operate in caching mode while others do not. Theoretically, the immutability of this flag does not impact functionality. Reported-by: Ioanna Alifieraki <ioanna-maria.alifieraki@canonical.com> Closes: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2115738 Link: https://lore.kernel.org/r/20250701171154.52435-1-ioanna-maria.alifieraki@canonical.com Fixes: 129dab6 ("iommu/vt-d: Use cache_tag_flush_range_np() in iotlb_sync_map") Cc: stable@vger.kernel.org Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> Reviewed-by: Kevin Tian <kevin.tian@intel.com> Link: https://lore.kernel.org/r/20250703031545.3378602-1-baolu.lu@linux.intel.com Link: https://lore.kernel.org/r/20250714045028.958850-3-baolu.lu@linux.intel.com Signed-off-by: Will Deacon <will@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 83e6c09 commit fc57475

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

drivers/iommu/intel/iommu.c

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1957,6 +1957,18 @@ static bool dev_is_real_dma_subdevice(struct device *dev)
19571957
pci_real_dma_dev(to_pci_dev(dev)) != to_pci_dev(dev);
19581958
}
19591959

1960+
static bool domain_need_iotlb_sync_map(struct dmar_domain *domain,
1961+
struct intel_iommu *iommu)
1962+
{
1963+
if (cap_caching_mode(iommu->cap) && !domain->use_first_level)
1964+
return true;
1965+
1966+
if (rwbf_quirk || cap_rwbf(iommu->cap))
1967+
return true;
1968+
1969+
return false;
1970+
}
1971+
19601972
static int dmar_domain_attach_device(struct dmar_domain *domain,
19611973
struct device *dev)
19621974
{
@@ -1994,6 +2006,8 @@ static int dmar_domain_attach_device(struct dmar_domain *domain,
19942006
if (ret)
19952007
goto out_block_translation;
19962008

2009+
domain->iotlb_sync_map |= domain_need_iotlb_sync_map(domain, iommu);
2010+
19972011
return 0;
19982012

19992013
out_block_translation:
@@ -4278,7 +4292,10 @@ static bool risky_device(struct pci_dev *pdev)
42784292
static int intel_iommu_iotlb_sync_map(struct iommu_domain *domain,
42794293
unsigned long iova, size_t size)
42804294
{
4281-
cache_tag_flush_range_np(to_dmar_domain(domain), iova, iova + size - 1);
4295+
struct dmar_domain *dmar_domain = to_dmar_domain(domain);
4296+
4297+
if (dmar_domain->iotlb_sync_map)
4298+
cache_tag_flush_range_np(dmar_domain, iova, iova + size - 1);
42824299

42834300
return 0;
42844301
}

drivers/iommu/intel/iommu.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -614,6 +614,9 @@ struct dmar_domain {
614614
u8 has_mappings:1; /* Has mappings configured through
615615
* iommu_map() interface.
616616
*/
617+
u8 iotlb_sync_map:1; /* Need to flush IOTLB cache or write
618+
* buffer when creating mappings.
619+
*/
617620

618621
spinlock_t lock; /* Protect device tracking lists */
619622
struct list_head devices; /* all devices' list */

0 commit comments

Comments
 (0)