Consolidate domain cache invalidation
Subsystems (2)
Lu Baolu
maintainerv3 cover Consolidate domain cache invalidation
The IOMMU hardware cache needs to be invalidated whenever the mappings in the domain are changed. Currently, domain cache invalidation is scattered across different places, causing several issues:
- IOMMU IOTLB Invalidation: This is done by iterating through the domain IDs of each domain using the following code:
xa_for_each(&dmar_domain->iommu_array, i, info)
iommu_flush_iotlb_psi(info->iommu, dmar_domain,
start_pfn, nrpages,
list_empty(&gather->freelist), 0);This code could theoretically cause a use-after-free problem because there's no lock to protect the "info" pointer within the loop.
- Inconsistent Invalidation Methods: Different domain types implement their own cache invalidation methods, making the code difficult to maintain. For example, the DMA domain, SVA domain, and nested domain have similar cache invalidation code scattered across different files.
- SVA Domain Inconsistency: The SVA domain implementation uses a completely different data structure to track attached devices compared to other domains. This creates unnecessary differences and, even worse, leads to duplicate IOTLB invalidation when an SVA domain is attached to devices belonging to a same IOMMU.
- Nested Domain Dependency: The special overlap between a nested domain and its parent domain requires a dedicated parent_domain_flush() helper function to be called everywhere the parent domain's mapping changes.
- Limited Debugging Support: There are currently no debugging aids available for domain cache invalidation.
By consolidating domain cache invalidation into a common location, we can address the issues mentioned above and improve the code's maintainability and debuggability.
The series and related patches are available on GitHub:
https://github.com/LuBaolu/intel-iommu/commits/iommu-vtd-cache-tag-v3
Change log:
v3:
- Fix the difference of range end between mm_types and iommu gather API.
- Align invalidation address to page mask.
- Use mmu_notifier_put() in intel_svm_domain_free() and defer the domain free in mm free_notifier callback.
- Various mics refinements and adjustments.
v2: https://lore.kernel.org/linux-iommu/[email protected]/
- Allow cache tags of parent_type to be reusable.
- Save the the iommu device pointer to @dev of IOTLB tag type to make
it present the location of the TLB explicitly.
- Rename cache_tag_flush_cm_range() to cache_tag_flush_range_pt() to
make it clear that cache_tag_flush_range_pt() is called for PTEs
changes from non-present to present.
- Split out a patch series to clean up all inconsistent devtlb invalidation policies for caching mode.
https://lore.kernel.org/linux-iommu/[email protected]/
- Fix a bug in intel_nested_cache_invalidate_user() where the @nrpages
is misused as @end.
- Various mics refinements and adjustments.
v1: https://lore.kernel.org/linux-iommu/[email protected]/
Jason Gunthorpe (1):
iommu: Add ops->domain_alloc_sva()
Lu Baolu (11):
iommu/vt-d: Add cache tag assignment interface iommu/vt-d: Add cache tag invalidation helpers iommu/vt-d: Add trace events for cache tag interface iommu/vt-d: Use cache_tag_flush_all() in flush_iotlb_all iommu/vt-d: Use cache_tag_flush_range() in tlb_sync iommu/vt-d: Use cache_tag_flush_range_np() in iotlb_sync_map iommu/vt-d: Cleanup use of iommu_flush_iotlb_psi() iommu/vt-d: Use cache_tag_flush_range() in cache_invalidate_user iommu/vt-d: Use cache helpers in arch_invalidate_secondary_tlbs iommu/vt-d: Remove intel_svm_dev
iommu/vt-d: Remove struct intel_svm
include/linux/iommu.h | 3 + drivers/iommu/intel/iommu.h | 85 +++++-- drivers/iommu/intel/trace.h | 97 ++++++++ drivers/iommu/intel/cache.c | 419 +++++++++++++++++++++++++++++++++++ drivers/iommu/intel/iommu.c | 286 +++--------------------- drivers/iommu/intel/nested.c | 69 ++---- drivers/iommu/intel/svm.c | 288 ++++++------------------ drivers/iommu/iommu-sva.c | 16 +- drivers/iommu/intel/Makefile | 2 +- 9 files changed, 707 insertions(+), 558 deletions(-) create mode 100644 drivers/iommu/intel/cache.c
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v3 1/12 iommu/vt-d: Add cache tag assignment interface
Caching tag is a combination of tags used by the hardware to cache various translations. Whenever a mapping in a domain is changed, the IOMMU driver should invalidate the caches with the caching tags. The VT-d specification describes caching tags in section 6.2.1, Tagging of Cached Translations.
Add interface to assign caching tags to an IOMMU domain when attached to a RID or PASID, and unassign caching tags when a domain is detached from a RID or PASID. All caching tags are listed in the per-domain tag list and are protected by a dedicated lock.
In addition to the basic IOTLB and devTLB caching tag types, PARENT_IOTLB and PARENT_DEVTLB tag types are also introduced. These tags are used for caches that store translations for DMA accesses through a nested user domain. They are affected by changes to mappings in the parent domain.
--- drivers/iommu/intel/iommu.h | 31 +++++ drivers/iommu/intel/cache.c | 214 +++++++++++++++++++++++++++++++++++ drivers/iommu/intel/iommu.c | 28 ++++- drivers/iommu/intel/nested.c | 19 +++- drivers/iommu/intel/svm.c | 10 +- drivers/iommu/intel/Makefile | 2 +- 6 files changed, 295 insertions(+), 9 deletions(-) create mode 100644 drivers/iommu/intel/cache.c
drivers/iommu/intel/iommu.h +31 -0
@@ -607,6 +607,9 @@ struct dmar_domain {struct list_head devices;/* all devices' list */ struct list_head dev_pasids;/* all attached pasids */ +spinlock_t cache_lock;/* Protect the cache tag list */ +struct list_head cache_tags;/* Cache tag list */ +int iommu_superpage;/* Level of superpages supported: 0 == 4KiB (no superpages), 1 == 2MiB, 2 == 1GiB, 3 == 512GiB, 4 == 1TiB */
@@ -1092,6 +1095,34 @@ struct iommu_domain *intel_nested_domain_alloc(struct iommu_domain *parent, const struct iommu_user_data *user_data);struct device *device_rbtree_find (struct intel_iommu *iommu,u16 rid); +enum cache_tag_type { +CACHE_TAG_IOTLB , +CACHE_TAG_DEVTLB , +CACHE_TAG_NESTING_IOTLB , +CACHE_TAG_NESTING_DEVTLB , +}; + +struct cache_tag { +struct list_head node; +enum cache_tag_type type; +struct intel_iommu *iommu; +/* +* The @dev field represents the location of the cache. For IOTLB, it +* resides on the IOMMU hardware. @dev stores the device pointer to +* the IOMMU hardware. For DevTLB, it locates in the PCIe endpoint. +* @dev stores the device pointer to that endpoint. +*/ +struct device *dev; +u16 domain_id; +ioasid_t pasid; +unsigned int users; +}; + +int cache_tag_assign_domain (struct dmar_domain *domain, +struct device *dev,ioasid_t pasid); +void cache_tag_unassign_domain (struct dmar_domain *domain, +struct device *dev,ioasid_t pasid); +#ifdef CONFIG_INTEL_IOMMU_SVM void intel_svm_check (struct intel_iommu *iommu);int intel_svm_enable_prq (struct intel_iommu *iommu);
drivers/iommu/intel/cache.c new file +214 -0
214 lines not on this page · raw message
drivers/iommu/intel/iommu.c +26 -2
@@ -1745,7 +1745,9 @@ static struct dmar_domain *alloc_domain(unsigned int type) domain->has_iotlb_device = false;INIT_LIST_HEAD (&domain->devices);INIT_LIST_HEAD (&domain->dev_pasids); +INIT_LIST_HEAD (&domain->cache_tags);spin_lock_init (&domain->lock); +spin_lock_init (&domain->cache_lock);xa_init (&domain->iommu_array);return domain;
@@ -1757,6 +1759,9 @@ int domain_attach_iommu(struct dmar_domain *domain, struct intel_iommu *iommu)unsigned long ndomains;int num, ret = -ENOSPC ; +if (domain->domain.type ==IOMMU_DOMAIN_SVA ) +return 0 ; + info =kzalloc (sizeof (*info),GFP_KERNEL );if (!info)return -ENOMEM ;
@@ -1804,6 +1809,9 @@ void domain_detach_iommu(struct dmar_domain *domain, struct intel_iommu *iommu) {struct iommu_domain_info *info; +if (domain->domain.type ==IOMMU_DOMAIN_SVA ) +return ; +spin_lock (&iommu->lock); info =xa_load (&domain->iommu_array, iommu->seq_id);if (--info->refcnt ==0 ) {
@@ -2322,6 +2330,13 @@ static int dmar_domain_attach_device(struct dmar_domain *domain, ret =domain_attach_iommu (domain, iommu);if (ret)return ret; + + ret =cache_tag_assign_domain (domain, dev,IOMMU_NO_PASID ); +if (ret) { +domain_detach_iommu (domain, iommu); +return ret; + } + info->domain = domain;spin_lock_irqsave (&domain->lock, flags);list_add (&info->link, &domain->devices);
@@ -3810,6 +3825,7 @@ void device_block_translation(struct device *dev)list_del (&info->link);spin_unlock_irqrestore (&info->domain->lock, flags); +cache_tag_unassign_domain (info->domain, dev,IOMMU_NO_PASID );domain_detach_iommu (info->domain, iommu); info->domain =NULL ; }
@@ -4597,6 +4613,7 @@ static void intel_iommu_remove_dev_pasid(struct device *dev, ioasid_t pasid) domain =iommu_get_domain_for_dev_pasid (dev, pasid,0 );if (WARN_ON_ONCE (!domain)) goto out_tear_down; + dmar_domain =to_dmar_domain (domain);/* * The SVA implementation needs to handle its own stuffs like the mm
@@ -4605,10 +4622,10 @@ static void intel_iommu_remove_dev_pasid(struct device *dev, ioasid_t pasid)*/ if (domain->type ==IOMMU_DOMAIN_SVA ) {intel_svm_remove_dev_pasid (dev, pasid); +cache_tag_unassign_domain (dmar_domain, dev, pasid); goto out_tear_down; } - dmar_domain =to_dmar_domain (domain);spin_lock_irqsave (&dmar_domain->lock, flags);list_for_each_entry (curr, &dmar_domain->dev_pasids, link_domain) {if (curr->dev == dev && curr->pasid == pasid) {
@@ -4620,6 +4637,7 @@ static void intel_iommu_remove_dev_pasid(struct device *dev, ioasid_t pasid)WARN_ON_ONCE (!dev_pasid);spin_unlock_irqrestore (&dmar_domain->lock, flags); +cache_tag_unassign_domain (dmar_domain, dev, pasid);domain_detach_iommu (dmar_domain, iommu);intel_iommu_debugfs_remove_dev_pasid (dev_pasid);kfree (dev_pasid);
@@ -4659,6 +4677,10 @@ static int intel_iommu_set_dev_pasid(struct iommu_domain *domain,if (ret) goto out_free; + ret =cache_tag_assign_domain (dmar_domain, dev, pasid); +if (ret) + goto out_detach_iommu; +if (domain_type_is_si (dmar_domain)) ret =intel_pasid_setup_pass_through (iommu, dev, pasid);else if (dmar_domain->use_first_level)
@@ -4668,7 +4690,7 @@ static int intel_iommu_set_dev_pasid(struct iommu_domain *domain, ret =intel_pasid_setup_second_level (iommu, dmar_domain, dev, pasid);if (ret) - goto out_detach_iommu; + goto out_unassign_tag; dev_pasid->dev = dev; dev_pasid->pasid = pasid;
@@ -4680,6 +4702,8 @@ static int intel_iommu_set_dev_pasid(struct iommu_domain *domain,intel_iommu_debugfs_create_dev_pasid (dev_pasid);return 0 ; +out_unassign_tag: +cache_tag_unassign_domain (dmar_domain, dev, pasid); out_detach_iommu:domain_detach_iommu (dmar_domain, iommu); out_free:
drivers/iommu/intel/nested.c +14 -5
@@ -52,13 +52,14 @@ static int intel_nested_attach_dev(struct iommu_domain *domain,return ret; } + ret =cache_tag_assign_domain (dmar_domain, dev,IOMMU_NO_PASID ); +if (ret) + goto detach_iommu; + ret =intel_pasid_setup_nested (iommu, dev,IOMMU_NO_PASID , dmar_domain); -if (ret) { -domain_detach_iommu (dmar_domain, iommu); -dev_err_ratelimited (dev,"Failed to setup pasid entry\n" ); -return ret; - } +if (ret) + goto unassign_tag; info->domain = dmar_domain;spin_lock_irqsave (&dmar_domain->lock, flags);
@@ -68,6 +69,12 @@ static int intel_nested_attach_dev(struct iommu_domain *domain,domain_update_iotlb (dmar_domain);return 0 ; +unassign_tag: +cache_tag_unassign_domain (dmar_domain, dev,IOMMU_NO_PASID ); +detach_iommu: +domain_detach_iommu (dmar_domain, iommu); + +return ret; }static void intel_nested_domain_free (struct iommu_domain *domain)
@@ -206,7 +213,9 @@ struct iommu_domain *intel_nested_domain_alloc(struct iommu_domain *parent, domain->domain.type =IOMMU_DOMAIN_NESTED ;INIT_LIST_HEAD (&domain->devices);INIT_LIST_HEAD (&domain->dev_pasids); +INIT_LIST_HEAD (&domain->cache_tags);spin_lock_init (&domain->lock); +spin_lock_init (&domain->cache_lock);xa_init (&domain->iommu_array);spin_lock (&s2_domain->s1_lock);
drivers/iommu/intel/svm.c +9 -1
@@ -366,17 +366,23 @@ static int intel_svm_set_dev_pasid(struct iommu_domain *domain, sdev->qdep =0 ; } + ret =cache_tag_assign_domain (to_dmar_domain (domain), dev, pasid); +if (ret) + goto free_sdev; +/* Setup the pasid table: */ sflags =cpu_feature_enabled (X86_FEATURE_LA57 ) ?PASID_FLAG_FL5LP :0 ; ret =intel_pasid_setup_first_level (iommu, dev, mm->pgd, pasid,FLPT_DEFAULT_DID , sflags);if (ret) - goto free_sdev; + goto unassign_tag;list_add_rcu (&sdev->list, &svm->devs);return 0 ; +unassign_tag: +cache_tag_unassign_domain (to_dmar_domain (domain), dev, pasid); free_sdev:kfree (sdev); free_svm:
@@ -795,6 +801,8 @@ struct iommu_domain *intel_svm_domain_alloc(void)if (!domain)return NULL ; domain->domain.ops = &intel_svm_domain_ops; +INIT_LIST_HEAD (&domain->cache_tags); +spin_lock_init (&domain->cache_lock);return &domain->domain; }
drivers/iommu/intel/Makefile +1 -1
@@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_DMAR_TABLE) += dmar.o -obj-$(CONFIG_INTEL_IOMMU) += iommu.o pasid.o nested.o +obj-$(CONFIG_INTEL_IOMMU) += iommu.o pasid.o nested.o cache.o obj-$(CONFIG_DMAR_TABLE) += trace.o cap_audit.o obj-$(CONFIG_DMAR_PERF) += perf.o obj-$(CONFIG_INTEL_IOMMU_DEBUGFS) += debugfs.o
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v3 2/12 iommu/vt-d: Add cache tag invalidation helpers
In reply to Lu BaoluAdd several helpers to invalidate the caches after mappings in the affected domain are changed.
- cache_tag_flush_range() invalidates a range of caches after mappings within this range are changed. It uses the page-selective cache invalidation methods.
- cache_tag_flush_all() invalidates all caches tagged by a domain ID. It uses the domain-selective cache invalidation methods.
- cache_tag_flush_range_np() invalidates a range of caches when new mappings are created in the domain and the corresponding page table entries change from non-present to present.
--- drivers/iommu/intel/iommu.h | 14 +++ drivers/iommu/intel/cache.c | 195 ++++++++++++++++++++++++++++++++++++ drivers/iommu/intel/iommu.c | 12 --- 3 files changed, 209 insertions(+), 12 deletions(-)
drivers/iommu/intel/iommu.h +14 -0
@@ -35,6 +35,8 @@#define VTD_PAGE_MASK (((u64)-1) << VTD_PAGE_SHIFT)#define VTD_PAGE_ALIGN (addr) (((addr) + VTD_PAGE_SIZE - 1) & VTD_PAGE_MASK) +#define IOVA_PFN (addr) ((addr) >> PAGE_SHIFT) +#define VTD_STRIDE_SHIFT (9)#define VTD_STRIDE_MASK (((u64)-1) << VTD_STRIDE_SHIFT)
@@ -1041,6 +1043,13 @@ static inline void context_set_sm_pre(struct context_entry *context) context->lo |=BIT_ULL (4 ); } +/* Returns a number of VTD pages, but aligned to MM page size */ +static inline unsigned long aligned_nrpages (unsigned long host_addr,size_t size) +{ + host_addr &= ~PAGE_MASK ; +return PAGE_ALIGN (host_addr + size) >>VTD_PAGE_SHIFT ; +} +/* Convert value to context PASID directory size field coding. */ #define context_pdts (pds) (((pds) & 0x7) << 9)
@@ -1122,6 +1131,11 @@ int cache_tag_assign_domain(struct dmar_domain *domain, struct device *dev, ioasid_t pasid);void cache_tag_unassign_domain (struct dmar_domain *domain,struct device *dev,ioasid_t pasid); +void cache_tag_flush_range (struct dmar_domain *domain,unsigned long start, +unsigned long end,int ih); +void cache_tag_flush_all (struct dmar_domain *domain); +void cache_tag_flush_range_np (struct dmar_domain *domain,unsigned long start, +unsigned long end);#ifdef CONFIG_INTEL_IOMMU_SVM void intel_svm_check (struct intel_iommu *iommu);
drivers/iommu/intel/cache.c +195 -0
204 lines not on this page · raw message
drivers/iommu/intel/iommu.c +0 -12
@@ -54,11 +54,6 @@ __DOMAIN_MAX_PFN(gaw), (unsigned long)-1))#define DOMAIN_MAX_ADDR (gaw) (((uint64_t)__DOMAIN_MAX_PFN(gaw)) << VTD_PAGE_SHIFT) -/* IO virtual address start page frame number */ -#define IOVA_START_PFN (1) - -#define IOVA_PFN (addr) ((addr) >> PAGE_SHIFT) -static void __init check_tylersburg_isoch (void );static int rwbf_quirk;
@@ -1991,13 +1986,6 @@ domain_context_mapping(struct dmar_domain *domain, struct device *dev) domain_context_mapping_cb, domain); } -/* Returns a number of VTD pages, but aligned to MM page size */ -static unsigned long aligned_nrpages (unsigned long host_addr,size_t size) -{ - host_addr &= ~PAGE_MASK ; -return PAGE_ALIGN (host_addr + size) >>VTD_PAGE_SHIFT ; -} -/* Return largest possible superpage level for a given mapping */ static int hardware_largepage_caps (struct dmar_domain *domain,unsigned long iov_pfn,unsigned long phy_pfn,unsigned long pages)
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v3 3/12 iommu/vt-d: Add trace events for cache tag interface
In reply to Lu BaoluAdd trace events for cache tag assign/unassign/flush operations and trace the events in the interfaces. These trace events will improve debugging capabilities by providing detailed information about cache tag activity. A sample of the traced messages looks like below [messages have been stripped and wrapped to make the line short].
cache_tag_assign: dmar9/0000:00:01.0 type iotlb did 1 pasid 9 ref 1
cache_tag_assign: dmar9/0000:00:01.0 type devtlb did 1 pasid 9 ref 1
cache_tag_flush_all: dmar6/0000:8a:00.0 type iotlb did 7 pasid 0 ref 1
cache_tag_flush_range: dmar1 0000:00:1b.0[0] type iotlb did 9
[0xeab00000-0xeab1afff] addr 0xeab00000 pages 0x20 mask 0x5
cache_tag_flush_range: dmar1 0000:00:1b.0[0] type iotlb did 9
[0xeab20000-0xeab31fff] addr 0xeab20000 pages 0x20 mask 0x5
cache_tag_flush_range: dmar1 0000:00:1b.0[0] type iotlb did 9
[0xeaa40000-0xeaa51fff] addr 0xeaa40000 pages 0x20 mask 0x5
cache_tag_flush_range: dmar1 0000:00:1b.0[0] type iotlb did 9
[0x98de0000-0x98de4fff] addr 0x98de0000 pages 0x8 mask 0x3
cache_tag_flush_range: dmar1 0000:00:1b.0[0] type iotlb did 9
[0xe9828000-0xe9828fff] addr 0xe9828000 pages 0x1 mask 0x0 cache_tag_unassign: dmar9/0000:00:01.0 type iotlb did 1 pasid 9 ref 1
cache_tag_unassign: dmar9/0000:00:01.0 type devtlb did 1 pasid 9 ref 1
--- drivers/iommu/intel/trace.h | 97 +++++++++++++++++++++++++++++++++++++ drivers/iommu/intel/cache.c | 10 ++++ 2 files changed, 107 insertions(+)
drivers/iommu/intel/trace.h +97 -0
@@ -89,6 +89,103 @@ TRACE_EVENT(prq_report, __entry->dw1, __entry->dw2, __entry->dw3) ) ); + +DECLARE_EVENT_CLASS (cache_tag_log, + TP_PROTO(struct cache_tag *tag), +TP_ARGS (tag), +TP_STRUCT__entry ( + __string(iommu, tag->iommu->name) + __string(dev, dev_name(tag->dev)) + __field(u16, type) + __field(u16, domain_id) + __field(u32, pasid) +__field (u32, users) + ), +TP_fast_assign ( + __assign_str(iommu, tag->iommu->name); + __assign_str(dev, dev_name(tag->dev)); + __entry->type = tag->type; + __entry->domain_id = tag->domain_id; + __entry->pasid = tag->pasid; + __entry->users = tag->users; + ), +TP_printk ("%s/%s type %s did %d pasid %d ref %d" , +__get_str (iommu),__get_str (dev), +__print_symbolic (__entry->type, + { CACHE_TAG_IOTLB, "iotlb" }, + { CACHE_TAG_DEVTLB, "devtlb" }, + { CACHE_TAG_NESTING_IOTLB, "nesting_iotlb" }, + { CACHE_TAG_NESTING_DEVTLB, "nesting_devtlb" }), + __entry->domain_id, __entry->pasid, __entry->users + ) +); + +DEFINE_EVENT (cache_tag_log, cache_tag_assign, + TP_PROTO(struct cache_tag *tag), +TP_ARGS (tag) +); + +DEFINE_EVENT (cache_tag_log, cache_tag_unassign, + TP_PROTO(struct cache_tag *tag), +TP_ARGS (tag) +); + +DEFINE_EVENT (cache_tag_log, cache_tag_flush_all, + TP_PROTO(struct cache_tag *tag), +TP_ARGS (tag) +); + +DECLARE_EVENT_CLASS (cache_tag_flush, + TP_PROTO(struct cache_tag *tag, unsigned long start, unsigned long end, + unsigned long addr, unsigned long pages, unsigned long mask), +TP_ARGS (tag, start, end, addr, pages, mask), +TP_STRUCT__entry ( + __string(iommu, tag->iommu->name) + __string(dev, dev_name(tag->dev)) + __field(u16, type) + __field(u16, domain_id) + __field(u32, pasid) + __field(unsigned long, start) + __field(unsigned long, end) + __field(unsigned long, addr) + __field(unsigned long, pages) + __field(unsigned long, mask) + ), +TP_fast_assign ( + __assign_str(iommu, tag->iommu->name); + __assign_str(dev, dev_name(tag->dev)); + __entry->type = tag->type; + __entry->domain_id = tag->domain_id; + __entry->pasid = tag->pasid; + __entry->start = start; + __entry->end = end; + __entry->addr = addr; + __entry->pages = pages; + __entry->mask = mask; + ), +TP_printk ("%s %s[%d] type %s did %d [0x%lx-0x%lx] addr 0x%lx pages 0x%lx mask 0x%lx" , +__get_str (iommu),__get_str (dev), __entry->pasid, +__print_symbolic (__entry->type, + { CACHE_TAG_IOTLB, "iotlb" }, + { CACHE_TAG_DEVTLB, "devtlb" }, + { CACHE_TAG_NESTING_IOTLB, "nesting_iotlb" }, + { CACHE_TAG_NESTING_DEVTLB, "nesting_devtlb" }), + __entry->domain_id, __entry->start, __entry->end, + __entry->addr, __entry->pages, __entry->mask + ) +); + +DEFINE_EVENT (cache_tag_flush, cache_tag_flush_range, + TP_PROTO(struct cache_tag *tag, unsigned long start, unsigned long end, + unsigned long addr, unsigned long pages, unsigned long mask), +TP_ARGS (tag, start, end, addr, pages, mask) +); + +DEFINE_EVENT (cache_tag_flush, cache_tag_flush_range_np, + TP_PROTO(struct cache_tag *tag, unsigned long start, unsigned long end, + unsigned long addr, unsigned long pages, unsigned long mask), +TP_ARGS (tag, start, end, addr, pages, mask) +);#endif /* _TRACE_INTEL_IOMMU_H */ /* This part must be outside protection */
drivers/iommu/intel/cache.c +10 -0
@@ -17,6 +17,7 @@#include "iommu.h" #include "pasid.h" +#include "trace.h" /* Check if an existing cache tag can be reused for a new association. */ static bool cache_tage_match(struct cache_tag *tag, u16 domain_id,
@@ -69,11 +70,13 @@ static int cache_tag_assign(struct dmar_domain *domain, u16 did, temp->users++;spin_unlock_irqrestore (&domain->cache_lock, flags);kfree (tag); +trace_cache_tag_assign (temp);return 0 ; } }list_add_tail (&tag->node, &domain->cache_tags);spin_unlock_irqrestore (&domain->cache_lock, flags); +trace_cache_tag_assign (tag);return 0 ; }
@@ -91,6 +94,7 @@ static void cache_tag_unassign(struct dmar_domain *domain, u16 did,spin_lock_irqsave (&domain->cache_lock, flags);list_for_each_entry (tag, &domain->cache_tags, node) {if (cache_tage_match (tag, did, iommu, dev, pasid, type)) { +trace_cache_tag_unassign (tag);if (--tag->users ==0 ) {list_del (&tag->node);kfree (tag);
@@ -316,6 +320,8 @@ void cache_tag_flush_range(struct dmar_domain *domain, unsigned long start,quirk_extra_dev_tlb_flush (info, addr, mask, tag->pasid, info->ats_qdep);break ; } + +trace_cache_tag_flush_range (tag, start, end, addr, pages, mask); }spin_unlock_irqrestore (&domain->cache_lock, flags); }
@@ -356,6 +362,8 @@ void cache_tag_flush_all(struct dmar_domain *domain) IOMMU_NO_PASID, info->ats_qdep);break ; } + +trace_cache_tag_flush_all (tag); }spin_unlock_irqrestore (&domain->cache_lock, flags); }
@@ -404,6 +412,8 @@ void cache_tag_flush_range_np(struct dmar_domain *domain, unsigned long start, addr, mask, DMA_TLB_PSI_FLUSH); } + +trace_cache_tag_flush_range_np (tag, start, end, addr, pages, mask); }spin_unlock_irqrestore (&domain->cache_lock, flags); }
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v3 4/12 iommu/vt-d: Use cache_tag_flush_all() in flush_iotlb_all
In reply to Lu BaoluThe flush_iotlb_all callback is called by the iommu core to flush all caches for the affected domain. Use cache_tag_flush_all() in this callback.
--- drivers/iommu/intel/iommu.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-)
drivers/iommu/intel/iommu.c +1 -19
@@ -1556,25 +1556,7 @@ static void parent_domain_flush(struct dmar_domain *domain,static void intel_flush_iotlb_all (struct iommu_domain *domain) { -struct dmar_domain *dmar_domain =to_dmar_domain (domain); -struct iommu_domain_info *info; -unsigned long idx; - -xa_for_each (&dmar_domain->iommu_array, idx, info) { -struct intel_iommu *iommu = info->iommu; -u16 did =domain_id_iommu (dmar_domain, iommu); - -if (dmar_domain->use_first_level) -domain_flush_pasid_iotlb (iommu, dmar_domain,0 ,-1 ,0 ); -else - iommu->flush.flush_iotlb (iommu, did,0 ,0 , -DMA_TLB_DSI_FLUSH ); - -iommu_flush_dev_iotlb (dmar_domain,0 ,MAX_AGAW_PFN_WIDTH ); - } - -if (dmar_domain->nested_parent) -parent_domain_flush (dmar_domain,0 ,-1 ,0 ); +cache_tag_flush_all (to_dmar_domain (domain)); }static void iommu_disable_protect_mem_regions (struct intel_iommu *iommu)
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v3 5/12 iommu/vt-d: Use cache_tag_flush_range() in tlb_sync
In reply to Lu BaoluThe tlb_sync callback is called by the iommu core to flush a range of caches for the affected domain. Use cache_tag_flush_range() in this callback.
--- drivers/iommu/intel/iommu.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-)
drivers/iommu/intel/iommu.c +2 -19
@@ -4103,25 +4103,8 @@ static size_t intel_iommu_unmap_pages(struct iommu_domain *domain,static void intel_iommu_tlb_sync (struct iommu_domain *domain,struct iommu_iotlb_gather *gather) { -struct dmar_domain *dmar_domain =to_dmar_domain (domain); -unsigned long iova_pfn =IOVA_PFN (gather->start); -size_t size = gather->end - gather->start; -struct iommu_domain_info *info; -unsigned long start_pfn; -unsigned long nrpages; -unsigned long i; - - nrpages =aligned_nrpages (gather->start, size); - start_pfn =mm_to_dma_pfn_start (iova_pfn); - -xa_for_each (&dmar_domain->iommu_array, i, info) -iommu_flush_iotlb_psi (info->iommu, dmar_domain, - start_pfn, nrpages, -list_empty (&gather->freelist),0 ); - -if (dmar_domain->nested_parent) -parent_domain_flush (dmar_domain, start_pfn, nrpages, -list_empty (&gather->freelist)); +cache_tag_flush_range (to_dmar_domain (domain), gather->start, + gather->end,list_empty (&gather->freelist));put_pages_list (&gather->freelist); }
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v3 6/12 iommu/vt-d: Use cache_tag_flush_range_np() in iotlb_sync_map
In reply to Lu BaoluThe iotlb_sync_map callback is called by the iommu core after non-present to present mappings are created. The iommu driver uses this callback to invalidate caches if IOMMU is working in caching mode and second-only translation is used for the domain. Use cache_tag_flush_range_np() in this callback.
--- drivers/iommu/intel/iommu.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-)
drivers/iommu/intel/iommu.c +1 -21
@@ -1500,20 +1500,6 @@ static void iommu_flush_iotlb_psi(struct intel_iommu *iommu,iommu_flush_dev_iotlb (domain, addr, mask); } -/* Notification for newly created mappings */ -static void __mapping_notify_one (struct intel_iommu *iommu,struct dmar_domain *domain, -unsigned long pfn,unsigned int pages) -{ -/* -* It's a non-present to present mapping. Only flush if caching mode -* and second level. -*/ -if (cap_caching_mode (iommu->cap) && !domain->use_first_level) -iommu_flush_iotlb_psi (iommu, domain, pfn, pages,0 ,1 ); -else -iommu_flush_write_buffer (iommu); -} -/* * Flush the relevant caches in nested translation if the domain * also serves as a parent
@@ -4543,14 +4529,8 @@ static bool risky_device(struct pci_dev *pdev)static int intel_iommu_iotlb_sync_map (struct iommu_domain *domain,unsigned long iova,size_t size) { -struct dmar_domain *dmar_domain =to_dmar_domain (domain); -unsigned long pages =aligned_nrpages (iova, size); -unsigned long pfn = iova >>VTD_PAGE_SHIFT ; -struct iommu_domain_info *info; -unsigned long i; +cache_tag_flush_range_np (to_dmar_domain (domain), iova, iova + size -1 ); -xa_for_each (&dmar_domain->iommu_array, i, info) -__mapping_notify_one (info->iommu, dmar_domain, pfn, pages);return 0 ; }
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v3 7/12 iommu/vt-d: Cleanup use of iommu_flush_iotlb_psi()
In reply to Lu BaoluUse cache_tag_flush_range() in switch_to_super_page() to invalidate the necessary caches when switching mappings from normal to super pages. The iommu_flush_iotlb_psi() call in intel_iommu_memory_notifier() is unnecessary since there should be no cache invalidation for the identity domain.
Clean up iommu_flush_iotlb_psi() after the last call site is removed.
--- drivers/iommu/intel/iommu.c | 171 +----------------------------------- 1 file changed, 2 insertions(+), 169 deletions(-)
drivers/iommu/intel/iommu.c +2 -169
@@ -1389,157 +1389,6 @@ static void __iommu_flush_dev_iotlb(struct device_domain_info *info,quirk_extra_dev_tlb_flush (info, addr, mask,IOMMU_NO_PASID , qdep); } -static void iommu_flush_dev_iotlb (struct dmar_domain *domain, -u64 addr,unsigned mask) -{ -struct dev_pasid_info *dev_pasid; -struct device_domain_info *info; -unsigned long flags; - -if (!domain->has_iotlb_device) -return ; - -spin_lock_irqsave (&domain->lock, flags); -list_for_each_entry (info, &domain->devices, link) -__iommu_flush_dev_iotlb (info, addr, mask); - -list_for_each_entry (dev_pasid, &domain->dev_pasids, link_domain) { - info =dev_iommu_priv_get (dev_pasid->dev); - -if (!info->ats_enabled) -continue ; - -qi_flush_dev_iotlb_pasid (info->iommu, -PCI_DEVID (info->bus, info->devfn), - info->pfsid, dev_pasid->pasid, - info->ats_qdep, addr, - mask); - } -spin_unlock_irqrestore (&domain->lock, flags); -} - -static void domain_flush_pasid_iotlb (struct intel_iommu *iommu, -struct dmar_domain *domain,u64 addr, -unsigned long npages,bool ih) -{ -u16 did =domain_id_iommu (domain, iommu); -struct dev_pasid_info *dev_pasid; -unsigned long flags; - -spin_lock_irqsave (&domain->lock, flags); -list_for_each_entry (dev_pasid, &domain->dev_pasids, link_domain) -qi_flush_piotlb (iommu, did, dev_pasid->pasid, addr, npages, ih); - -if (!list_empty (&domain->devices)) -qi_flush_piotlb (iommu, did,IOMMU_NO_PASID , addr, npages, ih); -spin_unlock_irqrestore (&domain->lock, flags); -} - -static void __iommu_flush_iotlb_psi (struct intel_iommu *iommu,u16 did, -unsigned long pfn,unsigned int pages, -int ih) -{ -unsigned int aligned_pages =__roundup_pow_of_two (pages); -unsigned long bitmask = aligned_pages -1 ; -unsigned int mask =ilog2 (aligned_pages); -u64 addr = (u64 )pfn <<VTD_PAGE_SHIFT ; - -/* -* PSI masks the low order bits of the base address. If the -* address isn't aligned to the mask, then compute a mask value -* needed to ensure the target range is flushed. -*/ -if (unlikely (bitmask & pfn)) { -unsigned long end_pfn = pfn + pages -1 , shared_bits; - -/* -* Since end_pfn <= pfn + bitmask, the only way bits -* higher than bitmask can differ in pfn and end_pfn is -* by carrying. This means after masking out bitmask, -* high bits starting with the first set bit in -* shared_bits are all equal in both pfn and end_pfn. -*/ - shared_bits = ~(pfn ^ end_pfn) & ~bitmask; - mask = shared_bits ?__ffs (shared_bits) :BITS_PER_LONG ; - } - -/* -* Fallback to domain selective flush if no PSI support or -* the size is too big. -*/ -if (!cap_pgsel_inv (iommu->cap) || mask >cap_max_amask_val (iommu->cap)) - iommu->flush.flush_iotlb (iommu, did,0 ,0 , -DMA_TLB_DSI_FLUSH ); -else - iommu->flush.flush_iotlb (iommu, did, addr | ih, mask, -DMA_TLB_PSI_FLUSH ); -} - -static void iommu_flush_iotlb_psi (struct intel_iommu *iommu, -struct dmar_domain *domain, -unsigned long pfn,unsigned int pages, -int ih,int map) -{ -unsigned int aligned_pages =__roundup_pow_of_two (pages); -unsigned int mask =ilog2 (aligned_pages); -uint64_t addr = (uint64_t )pfn <<VTD_PAGE_SHIFT ; -u16 did =domain_id_iommu (domain, iommu); - -if (WARN_ON (!pages)) -return ; - -if (ih) - ih =1 <<6 ; - -if (domain->use_first_level) -domain_flush_pasid_iotlb (iommu, domain, addr, pages, ih); -else -__iommu_flush_iotlb_psi (iommu, did, pfn, pages, ih); - -if (!map) -iommu_flush_dev_iotlb (domain, addr, mask); -} - -/* -* Flush the relevant caches in nested translation if the domain -* also serves as a parent -*/ -static void parent_domain_flush (struct dmar_domain *domain, -unsigned long pfn, -unsigned long pages,int ih) -{ -struct dmar_domain *s1_domain; - -spin_lock (&domain->s1_lock); -list_for_each_entry (s1_domain, &domain->s1_domains, s2_link) { -struct device_domain_info *device_info; -struct iommu_domain_info *info; -unsigned long flags; -unsigned long i; - -xa_for_each (&s1_domain->iommu_array, i, info) -__iommu_flush_iotlb_psi (info->iommu, info->did, - pfn, pages, ih); - -if (!s1_domain->has_iotlb_device) -continue ; - -spin_lock_irqsave (&s1_domain->lock, flags); -list_for_each_entry (device_info, &s1_domain->devices, link) -/* -* Address translation cache in device side caches the -* result of nested translation. There is no easy way -* to identify the exact set of nested translations -* affected by a change in S2. So just flush the entire -* device cache. -*/ -__iommu_flush_dev_iotlb (device_info,0 , -MAX_AGAW_PFN_WIDTH ); -spin_unlock_irqrestore (&s1_domain->lock, flags); - } -spin_unlock (&domain->s1_lock); -} -static void intel_flush_iotlb_all (struct iommu_domain *domain) {cache_tag_flush_all (to_dmar_domain (domain));
@@ -1990,9 +1839,7 @@ static void switch_to_super_page(struct dmar_domain *domain, unsigned long end_pfn, int level) {unsigned long lvl_pages =lvl_to_nr_pages (level); -struct iommu_domain_info *info;struct dma_pte *pte =NULL ; -unsigned long i;while (start_pfn <= end_pfn) {if (!pte)
@@ -2004,13 +1851,8 @@ static void switch_to_super_page(struct dmar_domain *domain, start_pfn + lvl_pages -1 , level + 1); -xa_for_each (&domain->iommu_array, i, info) -iommu_flush_iotlb_psi (info->iommu, domain, - start_pfn, lvl_pages, -0 ,0 ); -if (domain->nested_parent) -parent_domain_flush (domain, start_pfn, - lvl_pages,0 ); +cache_tag_flush_range (domain, start_pfn <<VTD_PAGE_SHIFT , + end_pfn <<VTD_PAGE_SHIFT ,0 ); } pte++;
@@ -3380,18 +3222,9 @@ static int intel_iommu_memory_notifier(struct notifier_block *nb,case MEM_OFFLINE :case MEM_CANCEL_ONLINE : { -struct dmar_drhd_unit *drhd; -struct intel_iommu *iommu;LIST_HEAD (freelist);domain_unmap (si_domain, start_vpfn, last_vpfn, &freelist); - -rcu_read_lock (); -for_each_active_iommu (iommu, drhd) -iommu_flush_iotlb_psi (iommu, si_domain, - start_vpfn, mhp->nr_pages, -list_empty (&freelist),0 ); -rcu_read_unlock ();put_pages_list (&freelist); }break ;
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v3 8/12 iommu/vt-d: Use cache_tag_flush_range() in cache_invalidate_user
In reply to Lu BaoluThe cache_invalidate_user callback is called to invalidate a range of caches for the affected user domain. Use cache_tag_flush_range() in this callback.
--- drivers/iommu/intel/iommu.h | 6 +++++ drivers/iommu/intel/nested.c | 50 +++--------------------------------- 2 files changed, 9 insertions(+), 47 deletions(-)
drivers/iommu/intel/iommu.h +6 -0
@@ -1050,6 +1050,12 @@ static inline unsigned long aligned_nrpages(unsigned long host_addr, size_t sizereturn PAGE_ALIGN (host_addr + size) >>VTD_PAGE_SHIFT ; } +/* Return a size from number of VTD pages. */ +static inline unsigned long nrpages_to_size (unsigned long npages) +{ +return npages <<VTD_PAGE_SHIFT ; +} +/* Convert value to context PASID directory size field coding. */ #define context_pdts (pds) (((pds) & 0x7) << 9)
drivers/iommu/intel/nested.c +3 -47
62 lines not on this page · raw message
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v3 9/12 iommu/vt-d: Use cache helpers in arch_invalidate_secondary_tlbs
In reply to Lu BaoluThe arch_invalidate_secondary_tlbs callback is called in the SVA mm notification path. It invalidates all or a range of caches after the CPU page table is modified. Use the cache tag helps in this path.
The mm_types defines vm_end as the first byte after the end address which is different from the iommu gather API, hence convert the end parameter from mm_types to iommu gather scheme before calling the cache_tag helper.
--- drivers/iommu/intel/iommu.h | 1 + drivers/iommu/intel/svm.c | 81 +++++-------------------------------- 2 files changed, 11 insertions(+), 71 deletions(-)
drivers/iommu/intel/iommu.h +1 -0
@@ -1167,6 +1167,7 @@ struct intel_svm {struct mm_struct *mm;u32 pasid;struct list_head devs; + struct dmar_domain *domain; };#else static inline void intel_svm_check (struct intel_iommu *iommu) {}
drivers/iommu/intel/svm.c +10 -71
110 lines not on this page · raw message
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v3 10/12 iommu/vt-d: Remove intel_svm_dev
In reply to Lu BaoluThe intel_svm_dev data structure used in the sva implementation for the Intel IOMMU driver stores information about a device attached to an SVA domain. It is a duplicate of dev_pasid_info that serves the same purpose.
Replace intel_svm_dev with dev_pasid_info and clean up the use of intel_svm_dev.
--- drivers/iommu/intel/iommu.h | 15 +---- drivers/iommu/intel/iommu.c | 7 +- drivers/iommu/intel/svm.c | 130 ++++++++++-------------------------- 3 files changed, 42 insertions(+), 110 deletions(-)
drivers/iommu/intel/iommu.h +3 -12
@@ -650,6 +650,7 @@ struct dmar_domain {struct list_head s2_link; }; }; +struct intel_svm *svm;struct iommu_domain domain;/* generic domain data structure for iommu core */
@@ -1150,23 +1151,13 @@ int intel_svm_finish_prq(struct intel_iommu *iommu);void intel_svm_page_response (struct device *dev,struct iopf_fault *evt,struct iommu_page_response *msg);struct iommu_domain *intel_svm_domain_alloc (void ); -void intel_svm_remove_dev_pasid (struct device *dev,ioasid_t pasid); +void intel_svm_remove_dev_pasid (struct iommu_domain *domain);void intel_drain_pasid_prq (struct device *dev,u32 pasid); -struct intel_svm_dev { -struct list_head list; -struct rcu_head rcu; -struct device *dev; -struct intel_iommu *iommu; -u16 did; -u16 sid, qdep; -}; -struct intel_svm {struct mmu_notifier notifier;struct mm_struct *mm;u32 pasid; -struct list_head devs;struct dmar_domain *domain; };#else
@@ -1177,7 +1168,7 @@ static inline struct iommu_domain *intel_svm_domain_alloc(void) return NULL; } -static inline void intel_svm_remove_dev_pasid (struct device *dev,ioasid_t pasid) +static inline void intel_svm_remove_dev_pasid (struct iommu_domain *domain) { }#endif
drivers/iommu/intel/iommu.c +2 -5
@@ -4386,11 +4386,8 @@ static void intel_iommu_remove_dev_pasid(struct device *dev, ioasid_t pasid)* notification. Before consolidating that code into iommu core, let * the intel sva code handle it. */ -if (domain->type ==IOMMU_DOMAIN_SVA ) { -intel_svm_remove_dev_pasid (dev, pasid); -cache_tag_unassign_domain (dmar_domain, dev, pasid); - goto out_tear_down; - } +if (domain->type ==IOMMU_DOMAIN_SVA ) +intel_svm_remove_dev_pasid (domain);spin_lock_irqsave (&dmar_domain->lock, flags);list_for_each_entry (curr, &dmar_domain->dev_pasids, link_domain) {
drivers/iommu/intel/svm.c +37 -93
207 lines not on this page · raw message
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v3 11/12 iommu: Add ops->domain_alloc_sva()
In reply to Lu BaoluFrom: Jason Gunthorpe <[email protected]>
Make a new op that receives the device and the mm_struct that the SVA domain should be created for. Unlike domain_alloc_paging() the dev argument is never NULL here.
This allows drivers to fully initialize the SVA domain and allocate the mmu_notifier during allocation. It allows the notifier lifetime to follow the lifetime of the iommu_domain.
Since we have only one call site, upgrade the new op to return ERR_PTR instead of NULL.
--- include/linux/iommu.h | 3 +++ drivers/iommu/iommu-sva.c | 16 +++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-)
include/linux/iommu.h +3 -0
@@ -518,6 +518,7 @@ static inline int __iommu_copy_struct_from_user_array(* Upon failure, ERR_PTR must be returned. * @domain_alloc_paging: Allocate an iommu_domain that can be used for * UNMANAGED, DMA, and DMA_FQ domain types. +* @domain_alloc_sva: Allocate an iommu_domain for Shared Virtual Addressing. * @probe_device: Add device to iommu driver handling * @release_device: Remove device from iommu driver handling * @probe_finalize: Do final setup work after the device is added to an IOMMU
@@ -558,6 +559,8 @@ struct iommu_ops { struct device *dev, u32 flags, struct iommu_domain *parent, const struct iommu_user_data *user_data);struct iommu_domain *(*domain_alloc_paging)(struct device *dev); +struct iommu_domain *(*domain_alloc_sva)(struct device *dev, +struct mm_struct *mm);struct iommu_device *(*probe_device)(struct device *dev);void (*release_device)(struct device *dev);
drivers/iommu/iommu-sva.c +11 -5
@@ -108,8 +108,8 @@ struct iommu_sva *iommu_sva_bind_device(struct device *dev, struct mm_struct *mm/* Allocate a new domain and set it on device pasid. */ domain =iommu_sva_domain_alloc (dev, mm); -if (!domain) { - ret = -ENOMEM ; +if (IS_ERR (domain)) { + ret =PTR_ERR (domain); goto out_free_handle; }
@@ -283,9 +283,15 @@ struct iommu_domain *iommu_sva_domain_alloc(struct device *dev,const struct iommu_ops *ops =dev_iommu_ops (dev);struct iommu_domain *domain; - domain = ops->domain_alloc (IOMMU_DOMAIN_SVA ); -if (!domain) -return NULL ; +if (ops->domain_alloc_sva) { + domain = ops->domain_alloc_sva (dev, mm); +if (IS_ERR (domain)) +return domain; + }else { + domain = ops->domain_alloc (IOMMU_DOMAIN_SVA ); +if (!domain) +return ERR_PTR (-ENOMEM ); + } domain->type =IOMMU_DOMAIN_SVA ;mmgrab (mm);
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH v3 12/12 iommu/vt-d: Remove struct intel_svm
In reply to Lu BaoluThe struct intel_svm was used for keeping attached devices info for sva domain. Since sva domain is a kind of iommu_domain, the struct dmar_domain should centralize all info of a sva domain, including the info of attached devices. Therefore, retire struct intel_svm and clean up the code.
Besides, register mmu notifier callback in domain_alloc_sva() callback which allows the memory management notifier lifetime to follow the lifetime of the iommu_domain. Call mmu_notifier_put() in the domain free and defer the real free to the mmu free_notifier callback.
--- drivers/iommu/intel/iommu.h | 26 ++++------ drivers/iommu/intel/iommu.c | 11 +---- drivers/iommu/intel/svm.c | 99 ++++++++++--------------------------- 3 files changed, 37 insertions(+), 99 deletions(-)
drivers/iommu/intel/iommu.h +10 -16
@@ -649,8 +649,12 @@ struct dmar_domain {/* link to parent domain siblings */ struct list_head s2_link; }; + +/* SVA domain */ +struct { +struct mmu_notifier notifier; + }; }; -struct intel_svm *svm;struct iommu_domain domain;/* generic domain data structure for iommu core */
@@ -1150,26 +1154,16 @@ int intel_svm_enable_prq(struct intel_iommu *iommu);int intel_svm_finish_prq (struct intel_iommu *iommu);void intel_svm_page_response (struct device *dev,struct iopf_fault *evt,struct iommu_page_response *msg); -struct iommu_domain *intel_svm_domain_alloc (void ); -void intel_svm_remove_dev_pasid (struct iommu_domain *domain); +struct iommu_domain *intel_svm_domain_alloc (struct device *dev, +struct mm_struct *mm);void intel_drain_pasid_prq (struct device *dev,u32 pasid); - -struct intel_svm { -struct mmu_notifier notifier; -struct mm_struct *mm; -u32 pasid; -struct dmar_domain *domain; -};#else static inline void intel_svm_check (struct intel_iommu *iommu) {}static inline void intel_drain_pasid_prq (struct device *dev,u32 pasid) {} -static inline struct iommu_domain *intel_svm_domain_alloc (void ) -{ -return NULL ; -} - -static inline void intel_svm_remove_dev_pasid (struct iommu_domain *domain) +static inline struct iommu_domain *intel_svm_domain_alloc (struct device *dev, +struct mm_struct *mm) { +return ERR_PTR (-ENODEV ); }#endif
drivers/iommu/intel/iommu.c +1 -10
@@ -3682,8 +3682,6 @@ static struct iommu_domain *intel_iommu_domain_alloc(unsigned type)return domain;case IOMMU_DOMAIN_IDENTITY :return &si_domain->domain; -case IOMMU_DOMAIN_SVA : -return intel_svm_domain_alloc ();default :return NULL ; }
@@ -4381,14 +4379,6 @@ static void intel_iommu_remove_dev_pasid(struct device *dev, ioasid_t pasid) goto out_tear_down; dmar_domain =to_dmar_domain (domain); -/* -* The SVA implementation needs to handle its own stuffs like the mm -* notification. Before consolidating that code into iommu core, let -* the intel sva code handle it. -*/ -if (domain->type ==IOMMU_DOMAIN_SVA ) -intel_svm_remove_dev_pasid (domain); -spin_lock_irqsave (&dmar_domain->lock, flags);list_for_each_entry (curr, &dmar_domain->dev_pasids, link_domain) {if (curr->dev == dev && curr->pasid == pasid) {
@@ -4623,6 +4613,7 @@ const struct iommu_ops intel_iommu_ops = { .hw_info = intel_iommu_hw_info, .domain_alloc = intel_iommu_domain_alloc, .domain_alloc_user = intel_iommu_domain_alloc_user, + .domain_alloc_sva = intel_svm_domain_alloc, .probe_device = intel_iommu_probe_device, .probe_finalize = intel_iommu_probe_finalize, .release_device = intel_iommu_release_device,
drivers/iommu/intel/svm.c +26 -73
171 lines not on this page · raw message
Signature · 1 line
2.34.1
Baolu Lu
maintainerRe: [PATCH v3 02/12] iommu/vt-d: Add cache tag invalidation helpers
In reply to Lu BaoluQuoted 20 lines · Lu Baolu
Add several helpers to invalidate the caches after mappings in the affected domain are changed.
-
cache_tag_flush_range()invalidates a range of caches after mappings within this range are changed. It uses the page-selective cache invalidation methods.-
cache_tag_flush_all()invalidates all caches tagged by a domain ID. It uses the domain-selective cache invalidation methods.-
cache_tag_flush_range_np()invalidates a range of caches when new mappings are created in the domain and the corresponding page table entries change from non-present to present.Signed-off-by Lu Baolu<[email protected]>--- drivers/iommu/intel/iommu.h | 14 +++ drivers/iommu/intel/cache.c | 195 ++++++++++++++++++++++++++++++++++++ drivers/iommu/intel/iommu.c | 12 --- 3 files changed, 209 insertions(+), 12 deletions(-)
[...]
Quoted 42 lines
(quoted diff) +42
-0+ +/* + * Invalidates a range of IOVA from @start (inclusive) to @end (inclusive) + * when the memory mappings in the target domain have been modified. + */ +void cache_tag_flush_range(struct dmar_domain *domain, unsigned long start, + unsigned long end, int ih) +{ + unsigned long pages, mask, addr; + struct cache_tag *tag; + unsigned long flags; + + addr = calculate_psi_aligned_address(start, end, &pages, &mask); + + spin_lock_irqsave(&domain->cache_lock, flags); + list_for_each_entry(tag, &domain->cache_tags, node) { + struct intel_iommu *iommu = tag->iommu; + struct device_domain_info *info; + u16 sid; + + switch (tag->type) { + case CACHE_TAG_IOTLB: + case CACHE_TAG_NESTING_IOTLB: + if (domain->use_first_level) { + qi_flush_piotlb(iommu, tag->domain_id, + tag->pasid, addr, pages, ih); + } else { + /* + * Fallback to domain selective flush if no + * PSI support or the size is too big. + */ + if (!cap_pgsel_inv(iommu->cap) || + mask > cap_max_amask_val(iommu->cap)) + iommu->flush.flush_iotlb(iommu, tag->domain_id, + 0, 0, DMA_TLB_DSI_FLUSH); + else + iommu->flush.flush_iotlb(iommu, tag->domain_id, + addr | ih, mask, + DMA_TLB_PSI_FLUSH); + } + break; + case CACHE_TAG_NESTING_DEVTLB:
Review
Quoted 10 lines
(quoted diff) +10
-0+ /* + * Address translation cache in device side caches the + * result of nested translation. There is no easy way + * to identify the exact set of nested translations + * affected by a change in S2. So just flush the entire + * device cache. + */ + addr = 0; + mask = MAX_AGAW_PFN_WIDTH; + fallthrough;
I realized that the logic above is not right. Setting both @addr and @mask to 0 doesn't means flush all caches on the device. I will change it like below:
drivers/iommu/intel/cache.c +0 -0
@@ -302,9 +302,14 @@ void cache_tag_flush_range(struct dmar_domain *domain, unsigned long start,* affected by a change in S2. So just flush
the entire
* device cache.
*/
- addr = 0; - mask = MAX_AGAW_PFN_WIDTH; - fallthrough; + info = dev_iommu_priv_get(tag->dev); + sid = PCI_DEVID(info->bus, info->devfn);
+
+ qi_flush_dev_iotlb(iommu, sid, info->pfsid, info->ats_qdep,
+ 0, MAX_AGAW_PFN_WIDTH);
+ quirk_extra_dev_tlb_flush(info, 0, MAX_AGAW_PFN_WIDTH,
+ IOMMU_NO_PASID, info->ats_qdep);
+ break;
case CACHE_TAG_DEVTLB:
info = dev_iommu_priv_get(tag->dev);
sid = PCI_DEVID(info->bus, info->devfn);Quoted 7 lines
(quoted diff) +7
-0+ case CACHE_TAG_DEVTLB: + info = dev_iommu_priv_get(tag->dev); + sid = PCI_DEVID(info->bus, info->devfn); + + if (tag->pasid == IOMMU_NO_PASID) + qi_flush_dev_iotlb(iommu, sid, info->pfsid, + info->ats_qdep, addr, mask);
Review
Quoted 10 lines
(quoted diff) +10
-0+ else + qi_flush_dev_iotlb_pasid(iommu, sid, info->pfsid, + tag->pasid, info->ats_qdep, + addr, mask); + + quirk_extra_dev_tlb_flush(info, addr, mask, tag->pasid, info->ats_qdep); + break; + } + } + spin_unlock_irqrestore(&domain->cache_lock, flags);
Best regards,
baolu
RE: [PATCH v3 01/12] iommu/vt-d: Add cache tag assignment interface
In reply to Lu BaoluQuoted 5 lines
From: Lu Baolu <[email protected]>
Sent: Tuesday, April 16, 2024 4:07 PMIn addition to the basic IOTLB and devTLB caching tag types,
PARENT_IOTLBandPARENT_DEVTLBtag types are also introduced. These tags are used for
it's NESTING_IOTLB/DEVTLB now.
RE: [PATCH v3 02/12] iommu/vt-d: Add cache tag invalidation helpers
In reply to Baolu LuQuoted 4 lines
From: Baolu Lu <[email protected]>
Sent: Monday, April 22, 2024 1:30 PMOn 4/16/24 4:06 PM, Lu Baolu wrote:
Quoted 15 lines
Review
Quoted 11 lines
(quoted diff) +11
-0+ case CACHE_TAG_NESTING_DEVTLB: + /* + * Address translation cache in device side caches the + * result of nested translation. There is no easy way + * to identify the exact set of nested translations + * affected by a change in S2. So just flush the entire + * device cache. + */ + addr = 0; + mask = MAX_AGAW_PFN_WIDTH; + fallthrough;I realized that the logic above is not right. Setting both @addr and @mask to 0 doesn't means flush all caches on the device. I will change it like below:
I didn't get. Above code doesn't set @mask to 0.
Quoted 21 lines
drivers/iommu/intel/cache.c +0
-0@@ -302,9 +302,14 @@ void cache_tag_flush_range(struct dmar_domain *domain, unsigned long start, * affected by a change in S2. So just flushthe entire
* device cache.
*/drivers/iommu/intel/cache.c +4
-3- addr =0 ; - mask =MAX_AGAW_PFN_WIDTH ; - fallthrough; + info =dev_iommu_priv_get (tag->dev); + sid =PCI_DEVID (info->bus, info->devfn); + + qi_flush_dev_iotlb(iommu, sid, info->pfsid,
info->ats_qdep,drivers/iommu/intel/cache.c +2
-0+ 0, MAX_AGAW_PFN_WIDTH); + quirk_extra_dev_tlb_flush(info, 0,
Quoted 4 lines
MAX_AGAW_PFN_WIDTH,
+IOMMU_NO_PASID,info->ats_qdep);
+ break;
and I didn't get this change. It goes backward by ignoring tag->pasid.
what's the exact problem of the fallthrough logic in original code?
Quoted 28 lines
case CACHE_TAG_DEVTLB: info = dev_iommu_priv_get(tag->dev); sid = PCI_DEVID(info->bus, info->devfn);Review
Quoted 7 lines
(quoted diff) +7
-0+ case CACHE_TAG_DEVTLB: + info = dev_iommu_priv_get(tag->dev); + sid = PCI_DEVID(info->bus, info->devfn); + + if (tag->pasid == IOMMU_NO_PASID) + qi_flush_dev_iotlb(iommu, sid, info->pfsid, + info->ats_qdep, addr,mask);
Review
Quoted 13 lines
(quoted diff) +2
-0+ else + qi_flush_dev_iotlb_pasid(iommu, sid, info-pfsid,
(quoted diff) +1
-0+ tag->pasid, info-
ats_qdep,(quoted diff) +3
-0+ addr, mask); + + quirk_extra_dev_tlb_flush(info, addr, mask, tag-pasid,
info->ats_qdep);(quoted diff) +4
-0+ break; + } + } + spin_unlock_irqrestore(&domain->cache_lock, flags);Best regards,
baolu
RE: [PATCH v3 01/12] iommu/vt-d: Add cache tag assignment interface
In reply to Lu BaoluQuoted 24 lines
From: Lu Baolu <[email protected]>
Sent: Tuesday, April 16, 2024 4:07 PMdrivers/iommu/intel/iommu.c +3
-0@@ -1757,6 +1759,9 @@ int domain_attach_iommu(struct dmar_domain *domain, struct intel_iommu *iommu)unsigned long ndomains;int num, ret = -ENOSPC ; +if (domain->domain.type ==IOMMU_DOMAIN_SVA ) +return 0 ; + info =kzalloc (sizeof (*info),GFP_KERNEL );if (!info)drivers/iommu/intel/iommu.c +3
-0return -ENOMEM ;@@ -1804,6 +1809,9 @@ void domain_detach_iommu(struct dmar_domain *domain, struct intel_iommu *iommu) {struct iommu_domain_info *info; +if (domain->domain.type ==IOMMU_DOMAIN_SVA ) +return ; +spin_lock (&iommu->lock); info =xa_load (&domain->iommu_array, iommu->seq_id);
Quoted 1 line
if (--info->refcnt == 0) {
above two are not called for SVA. Why do they start checking SVA type now?
Quoted 35 lines
From: Lu Baolu <[email protected]>
Sent: Tuesday, April 16, 2024 4:07 PMThe IOMMU hardware cache needs to be invalidated whenever the mappings
in the domain are changed. Currently, domain cache invalidation is scattered across different places, causing several issues:- IOMMU IOTLB Invalidation: This is done by iterating through the domain IDs of each domain using the following code:
xa_for_each(&dmar_domain->iommu_array, i, info) iommu_flush_iotlb_psi(info->iommu, dmar_domain, start_pfn, nrpages, list_empty(&gather->freelist), 0);This code could theoretically cause a use-after-free problem because there's no lock to protect the "info" pointer within the loop.
- Inconsistent Invalidation Methods: Different domain types implement their own cache invalidation methods, making the code difficult to maintain. For example, the DMA domain, SVA domain, and nested domain have similar cache invalidation code scattered across different files.
- SVA Domain Inconsistency: The SVA domain implementation uses a completely different data structure to track attached devices compared to other domains. This creates unnecessary differences and, even worse, leads to duplicate IOTLB invalidation when an SVA domain is attached to devices belonging to a same IOMMU.
- Nested Domain Dependency: The special overlap between a nested domain and its parent domain requires a dedicated
parent_domain_flush()helper function to be called everywhere the parent domain's mapping changes.
Quoted 7 lines
- Limited Debugging Support: There are currently no debugging aids available for domain cache invalidation.
By consolidating domain cache invalidation into a common location, we can address the issues mentioned above and improve the code's maintainability and debuggability.
There are several small nits but overall this series looks good to me:
Baolu Lu
maintainerRe: [PATCH v3 02/12] iommu/vt-d: Add cache tag invalidation helpers
In reply to Tian, KevinQuoted 18 lines · Kevin
Quoted 4 lines
From: Baolu Lu<[email protected]>
Sent: Monday, April 22, 2024 1:30 PMOn 4/16/24 4:06 PM, Lu Baolu wrote:
Quoted 14 lines
Review
Quoted 11 lines
(quoted diff) +11
-0+ case CACHE_TAG_NESTING_DEVTLB: + /* + * Address translation cache in device side caches the + * result of nested translation. There is no easy way + * to identify the exact set of nested translations + * affected by a change in S2. So just flush the entire + * device cache. + */ + addr = 0; + mask = MAX_AGAW_PFN_WIDTH; + fallthrough;I realized that the logic above is not right. Setting both @addr and @mask to 0 doesn't means flush all caches on the device. I will change it like below:
Quoted 1 line
I didn't get. Above code doesn't set @mask to 0.
Oh!? I have no idea why I read that as "mask = 0" now. Perhaps my brain was on vacation earlier. :-)
Quoted 27 lines
Quoted 21 lines
drivers/iommu/intel/cache.c +0
-0@@ -302,9 +302,14 @@ void cache_tag_flush_range(struct dmar_domain *domain, unsigned long start, * affected by a change in S2. So just flushthe entire
* device cache.
*/drivers/iommu/intel/cache.c +4
-3- addr =0 ; - mask =MAX_AGAW_PFN_WIDTH ; - fallthrough; + info =dev_iommu_priv_get (tag->dev); + sid =PCI_DEVID (info->bus, info->devfn); + + qi_flush_dev_iotlb(iommu, sid, info->pfsid,
info->ats_qdep,drivers/iommu/intel/cache.c +2
-0+ 0, MAX_AGAW_PFN_WIDTH); + quirk_extra_dev_tlb_flush(info, 0,Quoted 4 lines
MAX_AGAW_PFN_WIDTH,
+IOMMU_NO_PASID,info->ats_qdep);
+ break;and I didn't get this change. It goes backward by ignoring
tag->pasid.
Quoted 1 line
what's the exact problem of the fallthrough logic in original code?
Sorry! Please ignore this.
Best regards,
baolu
Baolu Lu
maintainerRe: [PATCH v3 01/12] iommu/vt-d: Add cache tag assignment interface
In reply to Tian, KevinQuoted 8 lines · Kevin
Quoted 5 lines
From: Lu Baolu <[email protected]>
Sent: Tuesday, April 16, 2024 4:07 PMIn addition to the basic IOTLB and devTLB caching tag types,
PARENT_IOTLBandPARENT_DEVTLBtag types are also introduced. These tags are used forit's NESTING_IOTLB/DEVTLB now.
Fixed.
Best regards,
baolu
Baolu Lu
maintainerRe: [PATCH v3 01/12] iommu/vt-d: Add cache tag assignment interface
In reply to Tian, KevinQuoted 19 lines · Kevin
Quoted 19 lines
From: Lu Baolu <[email protected]>
Sent: Tuesday, April 16, 2024 4:07 PMdrivers/iommu/intel/iommu.c +3
-0@@ -1757,6 +1759,9 @@ int domain_attach_iommu(struct dmar_domain *domain, struct intel_iommu *iommu)unsigned long ndomains;int num, ret = -ENOSPC ; +if (domain->domain.type ==IOMMU_DOMAIN_SVA ) +return 0 ; + info =kzalloc (sizeof (*info),GFP_KERNEL );if (!info)return
-ENOMEM;drivers/iommu/intel/iommu.c +0
-0@@ -1804,6 +1809,9 @@ void domain_detach_iommu(struct dmar_domain *domain, struct intel_iommu *iommu) {struct iommu_domain_info *info;
Quoted 9 lines
Quoted 6 lines
drivers/iommu/intel/iommu.c +3
-0+if (domain->domain.type ==IOMMU_DOMAIN_SVA ) +return ; +spin_lock (&iommu->lock); info =xa_load (&domain->iommu_array, iommu->seq_id);if (--info->refcnt == 0) {above two are not called for SVA. Why do they start checking SVA type now?
domain_detach_iommu() is called in remove_dev_pasid path which covers SVA domain as well.
I am moving the check to the domain_attach/detach_iommu() helpers so that the call sites could be generic. I will later move the domain ID management to the cache tag code, this kind of check will be dropped then.
Best regards,
baolu
Baolu Lu
maintainerQuoted 38 lines · Kevin
Quoted 38 lines
From: Lu Baolu<[email protected]>
Sent: Tuesday, April 16, 2024 4:07 PMThe IOMMU hardware cache needs to be invalidated whenever the mappings
in the domain are changed. Currently, domain cache invalidation is scattered across different places, causing several issues:- IOMMU IOTLB Invalidation: This is done by iterating through the domain IDs of each domain using the following code:
xa_for_each(&dmar_domain->iommu_array, i, info) iommu_flush_iotlb_psi(info->iommu, dmar_domain, start_pfn, nrpages, list_empty(&gather->freelist), 0);This code could theoretically cause a use-after-free problem because there's no lock to protect the "info" pointer within the loop.
- Inconsistent Invalidation Methods: Different domain types implement their own cache invalidation methods, making the code difficult to maintain. For example, the DMA domain, SVA domain, and nested domain have similar cache invalidation code scattered across different files.
- SVA Domain Inconsistency: The SVA domain implementation uses a completely different data structure to track attached devices compared to other domains. This creates unnecessary differences and, even worse, leads to duplicate IOTLB invalidation when an SVA domain is attached to devices belonging to a same IOMMU.
- Nested Domain Dependency: The special overlap between a nested domain and its parent domain requires a dedicated
parent_domain_flush()helper function to be called everywhere the parent domain's mapping changes.- Limited Debugging Support: There are currently no debugging aids available for domain cache invalidation.
Quoted 7 lines
Quoted 4 lines
By consolidating domain cache invalidation into a common location, we can address the issues mentioned above and improve the code's maintainability and debuggability.
There are several small nits but overall this series looks good to me:
Reviewed-by Kevin Tian<[email protected]>
Thanks! I will queue this series to Joerg for wider verification.
Best regards,
baolu