iommu/vt-d: Optimize the use of locks
Subsystems (2)
Lu Baolu
maintainerv3 cover iommu/vt-d: Optimize the use of locks
Hi folks,
This series tries to optimize the uses of two locks in the Intel IOMMU driver:
- The intel_iommu::lock is used to protect the IOMMU resources shared by devices. They include the IOMMU root and context tables, the pasid tables and the domain IDs.
- The global device_domain_lock is used to protect the global and the per-domain device tracking lists.
The optimization includes:
- Remove the unnecessary global device tracking list;
- Remove unnecessary locking;
- Reduce the scope of the lock as much as possible, that is, use the lock only where necessary;
- The global lock is transformed into a local lock to improve the efficiency.
This series is also available on github:
https://github.com/LuBaolu/intel-iommu/commits/intel-iommu-lock-optimization-v3
Your comments and suggestions are very appreciated.
Best regards,
baolu
Change log:
v3:
- Split reduction of lock ranges from changing irqsave.
https://lore.kernel.org/linux-iommu/BN9PR11MB52760A3D7C6BF1AF9C9D34658CAA9@BN9PR11MB5276.namprd11.prod.outlook.com/
- Fully initialize the dev_info before adding it to the list.
https://lore.kernel.org/linux-iommu/BN9PR11MB52764D7CD86448C5E4EB46668CAA9@BN9PR11MB5276.namprd11.prod.outlook.com/
- Various code and comments refinement.
v2:
- https://lore.kernel.org/linux-iommu/[email protected]/
- Split the lock-free page walk issue into a new patch:
https://lore.kernel.org/linux-iommu/[email protected]/
- Drop the conversion from spinlock to mutex and make this series
cleanup purpose only.
- Address several comments received during v1 review.
v1:
- https://lore.kernel.org/linux-iommu/[email protected]/
- Initial post.
Lu Baolu (11):
iommu/vt-d: debugfs: Remove device_domain_lock usage iommu/vt-d: Remove clearing translation data in disable_dmar_iommu() iommu/vt-d: Use pci_get_domain_bus_and_slot() in pgtable_walk() iommu/vt-d: Unnecessary spinlock for root table alloc and free iommu/vt-d: Replace spin_lock_irqsave() with spin_lock() iommu/vt-d: Acquiring lock in domain ID allocation helpers iommu/vt-d: Acquiring lock in pasid manipulation helpers iommu/vt-d: Check device list of domain in domain free path iommu/vt-d: Fold __dmar_remove_one_dev_info() into its caller iommu/vt-d: Use device_domain_lock accurately
iommu/vt-d: Convert global spinlock into per domain lock
drivers/iommu/intel/iommu.h | 3 +- drivers/iommu/intel/pasid.h | 1 + drivers/iommu/intel/debugfs.c | 49 ++++--- drivers/iommu/intel/iommu.c | 248 ++++++++++------------------------ drivers/iommu/intel/pasid.c | 103 +++++++------- drivers/iommu/intel/svm.c | 5 +- 6 files changed, 164 insertions(+), 245 deletions(-)
Signature · 1 line
2.25.1
Lu Baolu
maintainerPATCH v3 1/11 iommu/vt-d: debugfs: Remove device_domain_lock usage
The domain_translation_struct debugfs node is used to dump the DMAR page tables for the PCI devices. It potentially races with setting domains to devices. The existing code uses the global spinlock device_domain_lock to avoid the races.
This removes the use of device_domain_lock outside of iommu.c by replacing it with the group mutex lock. Using the group mutex lock is cleaner and more compatible to following cleanups.
--- drivers/iommu/intel/iommu.h | 1 - drivers/iommu/intel/debugfs.c | 43 +++++++++++++++++++++++++---------- drivers/iommu/intel/iommu.c | 2 +- 3 files changed, 32 insertions(+), 14 deletions(-)
drivers/iommu/intel/iommu.h +0 -1
@@ -480,7 +480,6 @@ enum {#define VTD_FLAG_SVM_CAPABLE (1 << 2)extern int intel_iommu_sm; -extern spinlock_t device_domain_lock;#define sm_supported (iommu) (intel_iommu_sm && ecap_smts((iommu)->ecap))#define pasid_supported (iommu) (sm_supported(iommu) && \
drivers/iommu/intel/debugfs.c +31 -12
64 lines not on this page · raw message
drivers/iommu/intel/iommu.c +1 -1
@@ -314,7 +314,7 @@ static int iommu_skip_te_disable;#define IDENTMAP_GFX 2#define IDENTMAP_AZALIA 4 -DEFINE_SPINLOCK (device_domain_lock); +static DEFINE_SPINLOCK (device_domain_lock);static LIST_HEAD (device_domain_list);const struct iommu_ops intel_iommu_ops;
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
RE: [PATCH v3 01/11] iommu/vt-d: debugfs: Remove device_domain_lock usage
Quoted 9 lines
From: Lu Baolu <[email protected]>
Sent: Wednesday, June 29, 2022 3:47 PMThe
domain_translation_structdebugfs node is used to dump the DMAR page
tables for the PCI devices. It potentially races with setting domains to devices. The existing code uses the global spinlockdevice_domain_lockto avoid the races.
Quoted 5 lines
This removes the use of
device_domain_lockoutside ofiommu.cby replacing it with the group mutex lock. Using the group mutex lock is cleaner and more compatible to following cleanups.Signed-off-by Lu Baolu <[email protected]>
Lu Baolu
maintainerPATCH v3 2/11 iommu/vt-d: Remove clearing translation data in disable_dmar_iommu()
In reply to Lu BaoluThe disable_dmar_iommu() is called when IOMMU initialization fails or the IOMMU is hot-removed from the system. In both cases, there is no need to clear the IOMMU translation data structures for devices.
On the initialization path, the device probing only happens after the IOMMU is initialized successfully, hence there're no translation data structures.
On the hot-remove path, there is no real use case where the IOMMU is hot-removed, but the devices that it manages are still alive in the system. The translation data structures were torn down during device release, hence there's no need to repeat it in IOMMU hot-remove path either. This removes the unnecessary code and only leaves a check.
--- drivers/iommu/intel/pasid.h | 1 + drivers/iommu/intel/iommu.c | 21 +++++++-------------- 2 files changed, 8 insertions(+), 14 deletions(-)
drivers/iommu/intel/pasid.h +1 -0
@@ -39,6 +39,7 @@* only and pass-through transfer modes. */ #define FLPT_DEFAULT_DID 1 +#define NUM_RESERVED_DID 2/* * The SUPERVISOR_MODE flag indicates a first level translation which
drivers/iommu/intel/iommu.c +7 -14
@@ -1716,23 +1716,16 @@ static int iommu_init_domains(struct intel_iommu *iommu)static void disable_dmar_iommu (struct intel_iommu *iommu) { -struct device_domain_info *info, *tmp; -unsigned long flags; -if (!iommu->domain_ids)return ; -spin_lock_irqsave (&device_domain_lock, flags); -list_for_each_entry_safe (info, tmp, &device_domain_list, global) { -if (info->iommu != iommu) -continue ; - -if (!info->dev || !info->domain) -continue ; - -__dmar_remove_one_dev_info (info); - } -spin_unlock_irqrestore (&device_domain_lock, flags); +/* +* All iommu domains must have been detached from the devices, +* hence there should be no domain IDs in use. +*/ +if (WARN_ON (bitmap_weight (iommu->domain_ids,cap_ndoms (iommu->cap)) + >NUM_RESERVED_DID )) +return ;if (iommu->gcmd &DMA_GCMD_TE )iommu_disable_translation (iommu);
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
RE: [PATCH v3 02/11] iommu/vt-d: Remove clearing translation data in disable_dmar_iommu()
Quoted 11 lines
From: Lu Baolu <[email protected]>
Sent: Wednesday, June 29, 2022 3:47 PMThe
disable_dmar_iommu()is called when IOMMU initialization fails or the IOMMU is hot-removed from the system. In both cases, there is no need to clear the IOMMU translation data structures for devices.On the initialization path, the device probing only happens after the IOMMU is initialized successfully, hence there're no translation data structures.
Quoted 7 lines
On the hot-remove path, there is no real use case where the IOMMU is hot-removed, but the devices that it manages are still alive in the system. The translation data structures were torn down during device release, hence there's no need to repeat it in IOMMU hot-remove path either. This removes the unnecessary code and only leaves a check.
Signed-off-by Lu Baolu <[email protected]>
You probably overlooked my last comment on kexec:
I think my question is still not answered.
Baolu Lu
maintainerRe: [PATCH v3 02/11] iommu/vt-d: Remove clearing translation data in disable_dmar_iommu()
Quoted 19 lines · Kevin
Quoted 19 lines
From: Lu Baolu <[email protected]> Sent: Wednesday, June 29, 2022 3:47 PM
The
disable_dmar_iommu()is called when IOMMU initialization fails or the IOMMU is hot-removed from the system. In both cases, there is no need to clear the IOMMU translation data structures for devices.On the initialization path, the device probing only happens after the IOMMU is initialized successfully, hence there're no translation data structures.
On the hot-remove path, there is no real use case where the IOMMU is hot-removed, but the devices that it manages are still alive in the system. The translation data structures were torn down during device release, hence there's no need to repeat it in IOMMU hot-remove path either. This removes the unnecessary code and only leaves a check.
Quoted 7 lines
Quoted 1 line
Signed-off-by Lu Baolu <[email protected]>You probably overlooked my last comment on kexec:
I think my question is still not answered.
Sorry! I did overlook that comment. I can see your points now, though it seems to be irrelevant to the problems that this series tries to solve.
The failure path of copying table still needs some improvement. At least the pages allocated for root/context tables should be freed in the failure path. Even worse, the software occupied a bit of page table entry which is feasible for the old ECS, but not work for the new scalable mode anymore.
All these problems deserve a separate series. We could address your concerns there. Does this work for you?
Best regards,
baolu
RE: [PATCH v3 02/11] iommu/vt-d: Remove clearing translation data in disable_dmar_iommu()
Quoted 36 lines
From: Baolu Lu <[email protected]>
Sent: Sunday, July 3, 2022 12:34 PMQuoted 19 lines · Kevin
Quoted 19 lines
From: Lu Baolu <[email protected]> Sent: Wednesday, June 29, 2022 3:47 PM
The
disable_dmar_iommu()is called when IOMMU initialization fails or the IOMMU is hot-removed from the system. In both cases, there is no need to clear the IOMMU translation data structures for devices.On the initialization path, the device probing only happens after the IOMMU is initialized successfully, hence there're no translation data structures.
On the hot-remove path, there is no real use case where the IOMMU is hot-removed, but the devices that it manages are still alive in the system. The translation data structures were torn down during device release, hence there's no need to repeat it in IOMMU hot-remove path either. This removes the unnecessary code and only leaves a check.
Quoted 5 lines
Quoted 1 line
Signed-off-by Lu Baolu <[email protected]>You probably overlooked my last comment on kexec:
https://lore.kernel.org/lkml/BL1PR11MB52711A71AD9F11B7AE42694C8CAC9
@BL1PR11MB5271.namprd11.prod.outlook.com/Quoted 2 lines
I think my question is still not answered.
Sorry! I did overlook that comment. I can see your points now, though it seems to be irrelevant to the problems that this series tries to solve.
Quoted 8 lines
The failure path of copying table still needs some improvement. At least the pages allocated for root/context tables should be freed in the failure path. Even worse, the software occupied a bit of page table entry which is feasible for the old ECS, but not work for the new scalable mode anymore.
All these problems deserve a separate series. We could address your concerns there. Does this work for you?
Yes, this makes sense to me.
Lu Baolu
maintainerPATCH v3 3/11 iommu/vt-d: Use pci_get_domain_bus_and_slot() in pgtable_walk()
In reply to Lu BaoluUse pci_get_domain_bus_and_slot() instead of searching the global list to retrieve the pci device pointer. This also removes the global device_domain_list as there isn't any consumer anymore.
--- drivers/iommu/intel/iommu.h | 1 - drivers/iommu/intel/iommu.c | 34 ++++++---------------------------- 2 files changed, 6 insertions(+), 29 deletions(-)
drivers/iommu/intel/iommu.h +0 -1
@@ -609,7 +609,6 @@ struct intel_iommu {/* PCI domain-device relationship */ struct device_domain_info {struct list_head link;/* link to domain siblings */ -struct list_head global;/* link to global list */ u32 segment;/* PCI segment number */ u8 bus;/* PCI bus number */ u8 devfn;/* PCI devfn number */
drivers/iommu/intel/iommu.c +6 -28
@@ -131,8 +131,6 @@ static struct intel_iommu **g_iommus;static void __init check_tylersburg_isoch (void );static int rwbf_quirk; -static inline struct device_domain_info * -dmar_search_domain_by_dev_info (int segment,int bus,int devfn);/* * set to 1 to panic kernel if can't successfully enable VT-d
@@ -315,8 +313,6 @@ static int iommu_skip_te_disable;#define IDENTMAP_AZALIA 4static DEFINE_SPINLOCK (device_domain_lock); -static LIST_HEAD (device_domain_list); -const struct iommu_ops intel_iommu_ops;static bool translation_pre_enabled (struct intel_iommu *iommu)
@@ -846,9 +842,14 @@ static void pgtable_walk(struct intel_iommu *iommu, unsigned long pfn, u8 bus, ustruct device_domain_info *info;struct dma_pte *parent, *pte;struct dmar_domain *domain; +struct pci_dev *pdev;int offset, level; - info =dmar_search_domain_by_dev_info (iommu->segment, bus, devfn); + pdev =pci_get_domain_bus_and_slot (iommu->segment, bus, devfn); +if (!pdev) +return ; + + info =dev_iommu_priv_get (&pdev->dev);if (!info || !info->domain) {pr_info ("device [%02x:%02x.%d] not probed\n" , bus,PCI_SLOT (devfn),PCI_FUNC (devfn));
@@ -2357,19 +2358,6 @@ static void domain_remove_dev_info(struct dmar_domain *domain)spin_unlock_irqrestore (&device_domain_lock, flags); } -static inline struct device_domain_info * -dmar_search_domain_by_dev_info (int segment,int bus,int devfn) -{ -struct device_domain_info *info; - -list_for_each_entry (info, &device_domain_list, global) -if (info->segment == segment && info->bus == bus && - info->devfn == devfn) -return info; - -return NULL ; -} - static int domain_setup_first_level(struct intel_iommu *iommu, struct dmar_domain *domain, struct device *dev,
@@ -4573,7 +4561,6 @@ static struct iommu_device *intel_iommu_probe_device(struct device *dev)struct pci_dev *pdev =dev_is_pci (dev) ?to_pci_dev (dev) :NULL ;struct device_domain_info *info;struct intel_iommu *iommu; -unsigned long flags;u8 bus, devfn; iommu =device_to_iommu (dev, &bus, &devfn);
@@ -4616,10 +4603,7 @@ static struct iommu_device *intel_iommu_probe_device(struct device *dev) } } -spin_lock_irqsave (&device_domain_lock, flags); -list_add (&info->global, &device_domain_list);dev_iommu_priv_set (dev, info); -spin_unlock_irqrestore (&device_domain_lock, flags);return &iommu->iommu; }
@@ -4627,15 +4611,9 @@ static struct iommu_device *intel_iommu_probe_device(struct device *dev)static void intel_iommu_release_device (struct device *dev) {struct device_domain_info *info =dev_iommu_priv_get (dev); -unsigned long flags;dmar_remove_one_dev_info (dev); - -spin_lock_irqsave (&device_domain_lock, flags);dev_iommu_priv_set (dev,NULL ); -list_del (&info->global); -spin_unlock_irqrestore (&device_domain_lock, flags); -kfree (info);set_dma_ops (dev,NULL ); }
Signature · 1 line
2.25.1
Lu Baolu
maintainerPATCH v3 4/11 iommu/vt-d: Unnecessary spinlock for root table alloc and free
In reply to Lu BaoluThe IOMMU root table is allocated and freed in the IOMMU initialization code in static boot or hot-remove paths. There's no need for a spinlock.
--- drivers/iommu/intel/iommu.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)
drivers/iommu/intel/iommu.c +5 -13
@@ -809,14 +809,12 @@ static int device_context_mapped(struct intel_iommu *iommu, u8 bus, u8 devfn)static void free_context_table (struct intel_iommu *iommu) { -int i; -unsigned long flags;struct context_entry *context; +int i; + +if (!iommu->root_entry) +return ; -spin_lock_irqsave (&iommu->lock, flags); -if (!iommu->root_entry) { - goto out; - }for (i =0 ; i <ROOT_ENTRY_NR ; i++) { context =iommu_context_addr (iommu, i,0 ,0 );if (context)
@@ -828,12 +826,10 @@ static void free_context_table(struct intel_iommu *iommu) context =iommu_context_addr (iommu, i,0x80 ,0 );if (context)free_pgtable_page (context); - } +free_pgtable_page (iommu->root_entry); iommu->root_entry =NULL ; -out: -spin_unlock_irqrestore (&iommu->lock, flags); }#ifdef CONFIG_DMAR_DEBUG
@@ -1232,7 +1228,6 @@ static void domain_unmap(struct dmar_domain *domain, unsigned long start_pfn,static int iommu_alloc_root_entry (struct intel_iommu *iommu) {struct root_entry *root; -unsigned long flags; root = (struct root_entry *)alloc_pgtable_page (iommu->node);if (!root) {
@@ -1242,10 +1237,7 @@ static int iommu_alloc_root_entry(struct intel_iommu *iommu) }__iommu_flush_cache (iommu, root,ROOT_SIZE ); - -spin_lock_irqsave (&iommu->lock, flags); iommu->root_entry = root; -spin_unlock_irqrestore (&iommu->lock, flags);return 0 ; }
Signature · 1 line
2.25.1
Lu Baolu
maintainerPATCH v3 5/11 iommu/vt-d: Replace spin_lock_irqsave() with spin_lock()
In reply to Lu BaoluThe iommu->lock is used to protect changes in root/context/pasid tables and domain ID allocation. There's no use case to change these resources in any interrupt context. Therefore, it's unnecessary to disable the interrupts when the spinlock is held.
--- drivers/iommu/intel/debugfs.c | 6 ++---- drivers/iommu/intel/iommu.c | 26 +++++++++++--------------- drivers/iommu/intel/svm.c | 6 +++--- 3 files changed, 16 insertions(+), 22 deletions(-)
drivers/iommu/intel/debugfs.c +2 -4
@@ -263,10 +263,9 @@ static void ctx_tbl_walk(struct seq_file *m, struct intel_iommu *iommu, u16 bus)static void root_tbl_walk (struct seq_file *m,struct intel_iommu *iommu) { -unsigned long flags;u16 bus; -spin_lock_irqsave (&iommu->lock, flags); +spin_lock (&iommu->lock);seq_printf (m,"IOMMU %s: Root Table Address: 0x%llx\n" , iommu->name, (u64 )virt_to_phys (iommu->root_entry));seq_puts (m,"B.D.F\tRoot_entry\t\t\t\tContext_entry\t\t\t\tPASID\tPASID_table_entry\n" );
@@ -278,8 +277,7 @@ static void root_tbl_walk(struct seq_file *m, struct intel_iommu *iommu)*/ for (bus =0 ; bus <256 ; bus++)ctx_tbl_walk (m, iommu, bus); - -spin_unlock_irqrestore (&iommu->lock, flags); +spin_unlock (&iommu->lock); }static int dmar_translation_struct_show (struct seq_file *m,void *unused)
drivers/iommu/intel/iommu.c +11 -15
@@ -797,13 +797,12 @@ static int device_context_mapped(struct intel_iommu *iommu, u8 bus, u8 devfn) {struct context_entry *context;int ret =0 ; -unsigned long flags; -spin_lock_irqsave (&iommu->lock, flags); +spin_lock (&iommu->lock); context =iommu_context_addr (iommu, bus, devfn,0 );if (context) ret =context_present (context); -spin_unlock_irqrestore (&iommu->lock, flags); +spin_unlock (&iommu->lock);return ret; }
@@ -2296,16 +2295,15 @@ static void domain_context_clear_one(struct device_domain_info *info, u8 bus, u8 {struct intel_iommu *iommu = info->iommu;struct context_entry *context; -unsigned long flags;u16 did_old;if (!iommu)return ; -spin_lock_irqsave (&iommu->lock, flags); +spin_lock (&iommu->lock); context =iommu_context_addr (iommu, bus, devfn,0 );if (!context) { -spin_unlock_irqrestore (&iommu->lock, flags); +spin_unlock (&iommu->lock);return ; }
@@ -2320,7 +2318,7 @@ static void domain_context_clear_one(struct device_domain_info *info, u8 bus, u8context_clear_entry (context);__iommu_flush_cache (iommu, context,sizeof (*context)); -spin_unlock_irqrestore (&iommu->lock, flags); +spin_unlock (&iommu->lock); iommu->flush.flush_context(iommu, did_old, (((u16)bus) << 8) | devfn,
@@ -2499,7 +2497,7 @@ static int domain_add_dev_info(struct dmar_domain *domain, struct device *dev) }/* Setup the PASID entry for requests without PASID: */ -spin_lock_irqsave (&iommu->lock, flags); +spin_lock (&iommu->lock);if (hw_pass_through &&domain_type_is_si (domain)) ret =intel_pasid_setup_pass_through (iommu, domain, dev,PASID_RID2PASID );
@@ -2509,7 +2507,7 @@ static int domain_add_dev_info(struct dmar_domain *domain, struct device *dev)else ret =intel_pasid_setup_second_level (iommu, domain, dev,PASID_RID2PASID ); -spin_unlock_irqrestore (&iommu->lock, flags); +spin_unlock (&iommu->lock);if (ret) {dev_err (dev,"Setup RID2PASID failed\n" );dmar_remove_one_dev_info (dev);
@@ -2777,7 +2775,6 @@ static int copy_translation_tables(struct intel_iommu *iommu)struct root_entry *old_rt;phys_addr_t old_rt_phys;int ctxt_table_entries; -unsigned long flags;u64 rtaddr_reg;int bus, ret;bool new_ext, ext;
@@ -2820,7 +2817,7 @@ static int copy_translation_tables(struct intel_iommu *iommu) } } -spin_lock_irqsave (&iommu->lock, flags); +spin_lock (&iommu->lock);/* Context tables are copied, now write them to the root_entry table */ for (bus =0 ; bus <256 ; bus++) {
@@ -2839,7 +2836,7 @@ static int copy_translation_tables(struct intel_iommu *iommu) iommu->root_entry[bus].hi = val; } -spin_unlock_irqrestore (&iommu->lock, flags); +spin_unlock (&iommu->lock);kfree (ctxt_tbls);
@@ -4166,7 +4163,6 @@ static void __dmar_remove_one_dev_info(struct device_domain_info *info) {struct dmar_domain *domain;struct intel_iommu *iommu; -unsigned long flags;assert_spin_locked (&device_domain_lock);
@@ -4188,9 +4184,9 @@ static void __dmar_remove_one_dev_info(struct device_domain_info *info)list_del (&info->link); -spin_lock_irqsave (&iommu->lock, flags); +spin_lock (&iommu->lock);domain_detach_iommu (domain, iommu); -spin_unlock_irqrestore (&iommu->lock, flags); +spin_unlock (&iommu->lock); }static void dmar_remove_one_dev_info (struct device *dev)
drivers/iommu/intel/svm.c +3 -3
@@ -328,9 +328,9 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu, unsigned int flags) {struct device_domain_info *info =dev_iommu_priv_get (dev); -unsigned long iflags, sflags;struct intel_svm_dev *sdev;struct intel_svm *svm; +unsigned long sflags;int ret =0 ; svm =pasid_private_find (mm->pasid);
@@ -394,10 +394,10 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu, sflags = (flags &SVM_FLAG_SUPERVISOR_MODE ) ?PASID_FLAG_SUPERVISOR_MODE :0 ; sflags |=cpu_feature_enabled (X86_FEATURE_LA57 ) ?PASID_FLAG_FL5LP :0 ; -spin_lock_irqsave (&iommu->lock, iflags); +spin_lock (&iommu->lock); ret =intel_pasid_setup_first_level (iommu, dev, mm->pgd, mm->pasid,FLPT_DEFAULT_DID , sflags); -spin_unlock_irqrestore (&iommu->lock, iflags); +spin_unlock (&iommu->lock);if (ret) goto free_sdev;
Signature · 1 line
2.25.1
Lu Baolu
maintainerPATCH v3 6/11 iommu/vt-d: Acquiring lock in domain ID allocation helpers
In reply to Lu BaoluThe iommu->lock is used to protect the per-IOMMU domain ID resource. Moving the lock into the ID alloc/free helpers makes the code more compact. At the same time, the device_domain_lock is irrelevant to the domain ID resource, remove its assertion as well.
--- drivers/iommu/intel/iommu.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-)
drivers/iommu/intel/iommu.c +9 -15
@@ -1781,16 +1781,13 @@ static struct dmar_domain *alloc_domain(unsigned int type)return domain; } -/* Must be called with iommu->lock */ static int domain_attach_iommu (struct dmar_domain *domain,struct intel_iommu *iommu) {unsigned long ndomains; -int num; - -assert_spin_locked (&device_domain_lock); -assert_spin_locked (&iommu->lock); +int num, ret =0 ; +spin_lock (&iommu->lock); domain->iommu_refcnt[iommu->seq_id] +=1 ;if (domain->iommu_refcnt[iommu->seq_id] ==1 ) { ndomains =cap_ndoms (iommu->cap);
@@ -1799,7 +1796,8 @@ static int domain_attach_iommu(struct dmar_domain *domain,if (num >= ndomains) {pr_err ("%s: No free domain ids\n" , iommu->name); domain->iommu_refcnt[iommu->seq_id] -=1 ; -return -ENOSPC ; + ret = -ENOSPC ; + goto out_unlock; }set_bit (num, iommu->domain_ids);
@@ -1808,7 +1806,9 @@ static int domain_attach_iommu(struct dmar_domain *domain,domain_update_iommu_cap (domain); } -return 0 ; +out_unlock: +spin_unlock (&iommu->lock); +return ret; } static void domain_detach_iommu(struct dmar_domain *domain,
@@ -1816,9 +1816,7 @@ static void domain_detach_iommu(struct dmar_domain *domain, {int num; -assert_spin_locked (&device_domain_lock); -assert_spin_locked (&iommu->lock); - +spin_lock (&iommu->lock); domain->iommu_refcnt[iommu->seq_id] -=1 ;if (domain->iommu_refcnt[iommu->seq_id] ==0 ) { num = domain->iommu_did[iommu->seq_id];
@@ -1826,6 +1824,7 @@ static void domain_detach_iommu(struct dmar_domain *domain,domain_update_iommu_cap (domain); domain->iommu_did[iommu->seq_id] =0 ; } +spin_unlock (&iommu->lock); }static inline int guestwidth_to_adjustwidth (int gaw)
@@ -2477,9 +2476,7 @@ static int domain_add_dev_info(struct dmar_domain *domain, struct device *dev)spin_lock_irqsave (&device_domain_lock, flags); info->domain = domain; -spin_lock (&iommu->lock); ret =domain_attach_iommu (domain, iommu); -spin_unlock (&iommu->lock);if (ret) {spin_unlock_irqrestore (&device_domain_lock, flags);return ret;
@@ -4183,10 +4180,7 @@ static void __dmar_remove_one_dev_info(struct device_domain_info *info) }list_del (&info->link); - -spin_lock (&iommu->lock);domain_detach_iommu (domain, iommu); -spin_unlock (&iommu->lock); }static void dmar_remove_one_dev_info (struct device *dev)
Signature · 1 line
2.25.1
RE: [PATCH v3 06/11] iommu/vt-d: Acquiring lock in domain ID allocation helpers
Quoted 9 lines
From: Lu Baolu <[email protected]>
Sent: Wednesday, June 29, 2022 3:47 PMThe
iommu->lockis used to protect the per-IOMMU domain ID resource. Moving the lock into the ID alloc/free helpers makes the code more compact. At the same time, thedevice_domain_lockis irrelevant to the domain ID resource, remove its assertion as well.Signed-off-by Lu Baolu <[email protected]>
Lu Baolu
maintainerPATCH v3 7/11 iommu/vt-d: Acquiring lock in pasid manipulation helpers
In reply to Lu BaoluThe iommu->lock is used to protect the per-IOMMU pasid directory table and pasid table. Move the spinlock acquisition/release into the helpers to make the code self-contained.
--- drivers/iommu/intel/iommu.c | 2 - drivers/iommu/intel/pasid.c | 103 +++++++++++++++++++----------------- drivers/iommu/intel/svm.c | 3 -- 3 files changed, 55 insertions(+), 53 deletions(-)
drivers/iommu/intel/iommu.c +0 -2
@@ -2494,7 +2494,6 @@ static int domain_add_dev_info(struct dmar_domain *domain, struct device *dev) }/* Setup the PASID entry for requests without PASID: */ -spin_lock (&iommu->lock);if (hw_pass_through &&domain_type_is_si (domain)) ret =intel_pasid_setup_pass_through (iommu, domain, dev,PASID_RID2PASID );
@@ -2504,7 +2503,6 @@ static int domain_add_dev_info(struct dmar_domain *domain, struct device *dev)else ret =intel_pasid_setup_second_level (iommu, domain, dev,PASID_RID2PASID ); -spin_unlock (&iommu->lock);if (ret) {dev_err (dev,"Setup RID2PASID failed\n" );dmar_remove_one_dev_info (dev);
drivers/iommu/intel/pasid.c +55 -48
181 lines not on this page · raw message
drivers/iommu/intel/svm.c +0 -3
@@ -394,11 +394,8 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu, sflags = (flags &SVM_FLAG_SUPERVISOR_MODE ) ?PASID_FLAG_SUPERVISOR_MODE :0 ; sflags |=cpu_feature_enabled (X86_FEATURE_LA57 ) ?PASID_FLAG_FL5LP :0 ; -spin_lock (&iommu->lock); ret =intel_pasid_setup_first_level (iommu, dev, mm->pgd, mm->pasid,FLPT_DEFAULT_DID , sflags); -spin_unlock (&iommu->lock); -if (ret) goto free_sdev;
Signature · 1 line
2.25.1
Lu Baolu
maintainerPATCH v3 8/11 iommu/vt-d: Check device list of domain in domain free path
In reply to Lu BaoluWhen the IOMMU domain is about to be freed, it should not be set on any device. Instead of silently dealing with some bug cases, it's better to trigger a warning to report and fix any potential bugs at the first time.
--- drivers/iommu/intel/iommu.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-)
drivers/iommu/intel/iommu.c +3 -16
@@ -294,7 +294,6 @@ static LIST_HEAD(dmar_satc_units);/* bitmap for indexing intel_iommus */ static int g_num_of_iommus; -static void domain_remove_dev_info (struct dmar_domain *domain);static void dmar_remove_one_dev_info (struct device *dev);static void __dmar_remove_one_dev_info (struct device_domain_info *info);
@@ -1843,10 +1842,6 @@ static inline int guestwidth_to_adjustwidth(int gaw)static void domain_exit (struct dmar_domain *domain) { - -/* Remove associated devices and clear attached or cached domains */ -domain_remove_dev_info (domain); -if (domain->pgd) {LIST_HEAD (freelist);
@@ -1854,6 +1849,9 @@ static void domain_exit(struct dmar_domain *domain)put_pages_list (&freelist); } +if (WARN_ON (!list_empty (&domain->devices))) +return ; +kfree (domain); }
@@ -2336,17 +2334,6 @@ static void domain_context_clear_one(struct device_domain_info *info, u8 bus, u8__iommu_flush_dev_iotlb (info,0 ,MAX_AGAW_PFN_WIDTH ); } -static void domain_remove_dev_info (struct dmar_domain *domain) -{ -struct device_domain_info *info, *tmp; -unsigned long flags; - -spin_lock_irqsave (&device_domain_lock, flags); -list_for_each_entry_safe (info, tmp, &domain->devices, link) -__dmar_remove_one_dev_info (info); -spin_unlock_irqrestore (&device_domain_lock, flags); -} - static int domain_setup_first_level(struct intel_iommu *iommu, struct dmar_domain *domain, struct device *dev,
Signature · 1 line
2.25.1
Lu Baolu
maintainerPATCH v3 9/11 iommu/vt-d: Fold __dmar_remove_one_dev_info() into its caller
In reply to Lu BaoluFold __dmar_remove_one_dev_info() into dmar_remove_one_dev_info() which is its only caller. Make the spin lock critical range only cover the device list change code and remove some unnecessary checks.
--- drivers/iommu/intel/iommu.c | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-)
drivers/iommu/intel/iommu.c +8 -25
@@ -295,7 +295,6 @@ static LIST_HEAD(dmar_satc_units);static int g_num_of_iommus;static void dmar_remove_one_dev_info (struct device *dev); -static void __dmar_remove_one_dev_info (struct device_domain_info *info);int dmar_disabled = !IS_ENABLED (CONFIG_INTEL_IOMMU_DEFAULT_ON );int intel_iommu_sm =IS_ENABLED (CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON );
@@ -4141,20 +4140,13 @@ static void domain_context_clear(struct device_domain_info *info) &domain_context_clear_one_cb, info); } -static void __dmar_remove_one_dev_info (struct device_domain_info *info) +static void dmar_remove_one_dev_info (struct device *dev) { -struct dmar_domain *domain; -struct intel_iommu *iommu; - -assert_spin_locked (&device_domain_lock); - -if (WARN_ON (!info)) -return ; - - iommu = info->iommu; - domain = info->domain; +struct device_domain_info *info =dev_iommu_priv_get (dev); +struct intel_iommu *iommu = info->iommu; +unsigned long flags; -if (info->dev && !dev_is_real_dma_subdevice (info->dev)) { +if (!dev_is_real_dma_subdevice (info->dev)) {if (dev_is_pci (info->dev) &&sm_supported (iommu))intel_pasid_tear_down_entry (iommu, info->dev,PASID_RID2PASID , false);
@@ -4164,20 +4156,11 @@ static void __dmar_remove_one_dev_info(struct device_domain_info *info)intel_pasid_free_table (info->dev); } -list_del (&info->link); -domain_detach_iommu (domain, iommu); -} - -static void dmar_remove_one_dev_info (struct device *dev) -{ -struct device_domain_info *info; -unsigned long flags; -spin_lock_irqsave (&device_domain_lock, flags); - info =dev_iommu_priv_get (dev); -if (info) -__dmar_remove_one_dev_info (info); +list_del (&info->link);spin_unlock_irqrestore (&device_domain_lock, flags); + +domain_detach_iommu (info->domain, iommu); }static int md_domain_init (struct dmar_domain *domain,int guest_width)
Signature · 1 line
2.25.1
RE: [PATCH v3 09/11] iommu/vt-d: Fold __dmar_remove_one_dev_info() into its caller
Quoted 9 lines
From: Lu Baolu <[email protected]>
Sent: Wednesday, June 29, 2022 3:47 PMFold
__dmar_remove_one_dev_info()intodmar_remove_one_dev_info()which
is its only caller. Make the spin lock critical range only cover the device list change code and remove some unnecessary checks.Signed-off-by Lu Baolu <[email protected]>
Lu Baolu
maintainerPATCH v3 10/11 iommu/vt-d: Use device_domain_lock accurately
In reply to Lu BaoluThe device_domain_lock is used to protect the device tracking list of a domain. Remove unnecessary spin_lock/unlock()'s and move the necessary ones around the list access.
--- drivers/iommu/intel/iommu.c | 61 ++++++++++++++----------------------- 1 file changed, 23 insertions(+), 38 deletions(-)
drivers/iommu/intel/iommu.c +23 -38
@@ -534,16 +534,10 @@ static int domain_update_device_node(struct dmar_domain *domain) {struct device_domain_info *info;int nid =NUMA_NO_NODE ; +unsigned long flags; -assert_spin_locked (&device_domain_lock); - -if (list_empty (&domain->devices)) -return NUMA_NO_NODE ; - +spin_lock_irqsave (&device_domain_lock, flags);list_for_each_entry (info, &domain->devices, link) { -if (!info->dev) -continue ; -/* * There could possibly be multiple device numa nodes as devices * within the same domain may sit behind different IOMMUs. There
@@ -554,6 +548,7 @@ static int domain_update_device_node(struct dmar_domain *domain)if (nid !=NUMA_NO_NODE )break ; } +spin_unlock_irqrestore (&device_domain_lock, flags);return nid; }
@@ -1376,23 +1371,24 @@ static void __iommu_flush_iotlb(struct intel_iommu *iommu, u16 did, }static struct device_domain_info * -iommu_support_dev_iotlb (struct dmar_domain *domain,struct intel_iommu *iommu, -u8 bus,u8 devfn) +iommu_support_dev_iotlb (struct dmar_domain *domain,struct intel_iommu *iommu, +u8 bus,u8 devfn) {struct device_domain_info *info; - -assert_spin_locked (&device_domain_lock); +unsigned long flags;if (!iommu->qi)return NULL ; -list_for_each_entry (info, &domain->devices, link) +spin_lock_irqsave (&device_domain_lock, flags); +list_for_each_entry (info, &domain->devices, link) {if (info->iommu == iommu && info->bus == bus && info->devfn == devfn) { -if (info->ats_supported && info->dev) -return info; -break ; +spin_unlock_irqrestore (&device_domain_lock, flags); +return info->ats_supported ? info :NULL ; } + } +spin_unlock_irqrestore (&device_domain_lock, flags);return NULL ; }
@@ -1401,24 +1397,23 @@ static void domain_update_iotlb(struct dmar_domain *domain) {struct device_domain_info *info;bool has_iotlb_device = false; +unsigned long flags; -assert_spin_locked (&device_domain_lock); - -list_for_each_entry (info, &domain->devices, link) +spin_lock_irqsave (&device_domain_lock, flags); +list_for_each_entry (info, &domain->devices, link) {if (info->ats_enabled) { has_iotlb_device = true;break ; } - + } domain->has_iotlb_device = has_iotlb_device; +spin_unlock_irqrestore (&device_domain_lock, flags); }static void iommu_enable_dev_iotlb (struct device_domain_info *info) {struct pci_dev *pdev; -assert_spin_locked (&device_domain_lock); -if (!info || !dev_is_pci (info->dev))return ;
@@ -1464,8 +1459,6 @@ static void iommu_disable_dev_iotlb(struct device_domain_info *info) {struct pci_dev *pdev; -assert_spin_locked (&device_domain_lock); -if (!dev_is_pci (info->dev))return ;
@@ -1908,11 +1901,11 @@ static int domain_context_mapping_one(struct dmar_domain *domain,struct pasid_table *table, u8 bus, u8 devfn) { + struct device_domain_info *info = +iommu_support_dev_iotlb (domain, iommu, bus, devfn);u16 did = domain->iommu_did[iommu->seq_id];int translation =CONTEXT_TT_MULTI_LEVEL ; -struct device_domain_info *info =NULL ;struct context_entry *context; -unsigned long flags;int ret;WARN_ON (did ==0 );
@@ -1925,7 +1918,6 @@ static int domain_context_mapping_one(struct dmar_domain *domain,BUG_ON (!domain->pgd); -spin_lock_irqsave (&device_domain_lock, flags);spin_lock (&iommu->lock); ret = -ENOMEM ;
@@ -1978,7 +1970,6 @@ static int domain_context_mapping_one(struct dmar_domain *domain,* Setup the Device-TLB enable bit and Page request * Enable bit: */ - info =iommu_support_dev_iotlb (domain, iommu, bus, devfn);if (info && info->ats_supported)context_set_sm_dte (context);if (info && info->pri_supported)
@@ -2001,7 +1992,6 @@ static int domain_context_mapping_one(struct dmar_domain *domain, goto out_unlock; } - info =iommu_support_dev_iotlb (domain, iommu, bus, devfn);if (info && info->ats_supported) translation =CONTEXT_TT_DEV_IOTLB ;else
@@ -2047,7 +2037,6 @@ static int domain_context_mapping_one(struct dmar_domain *domain, out_unlock:spin_unlock (&iommu->lock); -spin_unlock_irqrestore (&device_domain_lock, flags);return ret; }
@@ -2460,13 +2449,12 @@ static int domain_add_dev_info(struct dmar_domain *domain, struct device *dev)if (!iommu)return -ENODEV ; -spin_lock_irqsave (&device_domain_lock, flags); - info->domain = domain; ret =domain_attach_iommu (domain, iommu); -if (ret) { -spin_unlock_irqrestore (&device_domain_lock, flags); +if (ret)return ret; - } + + info->domain = domain; +spin_lock_irqsave (&device_domain_lock, flags);list_add (&info->link, &domain->devices);spin_unlock_irqrestore (&device_domain_lock, flags);
@@ -4636,7 +4624,6 @@ int intel_iommu_enable_pasid(struct intel_iommu *iommu, struct device *dev)struct device_domain_info *info =dev_iommu_priv_get (dev);struct context_entry *context;struct dmar_domain *domain; -unsigned long flags;u64 ctx_lo;int ret;
@@ -4644,7 +4631,6 @@ int intel_iommu_enable_pasid(struct intel_iommu *iommu, struct device *dev)if (!domain)return -EINVAL ; -spin_lock_irqsave (&device_domain_lock, flags);spin_lock (&iommu->lock); ret = -EINVAL ;
@@ -4676,7 +4662,6 @@ int intel_iommu_enable_pasid(struct intel_iommu *iommu, struct device *dev) out:spin_unlock (&iommu->lock); -spin_unlock_irqrestore (&device_domain_lock, flags);return ret; }
Signature · 1 line
2.25.1
RE: [PATCH v3 10/11] iommu/vt-d: Use device_domain_lock accurately
drivers/iommu/intel/iommu.c static int domain_update_device_node(struct dmar_domain *domain) · line 546
Quoted 8 lines
From: Lu Baolu <[email protected]>
Sent: Wednesday, June 29, 2022 3:47 PMdrivers/iommu/intel/iommu.c +1
-3+spin_lock_irqsave (&device_domain_lock, flags);list_for_each_entry (info, &domain->devices, link) { -if (!info->dev) -continue ; -
suppose you can replace all spin_lock_irqsave() with spin_lock() in patch5 instead of leaving some replacement to next patch.
Baolu Lu
maintainerRe: [PATCH v3 10/11] iommu/vt-d: Use device_domain_lock accurately
Quoted 12 lines · Kevin
drivers/iommu/intel/iommu.c static int domain_update_device_node(struct dmar_domain *domain) · line 546
Quoted 8 lines
From: Lu Baolu <[email protected]>
Sent: Wednesday, June 29, 2022 3:47 PMdrivers/iommu/intel/iommu.c +1
-3+spin_lock_irqsave (&device_domain_lock, flags);list_for_each_entry (info, &domain->devices, link) { -if (!info->dev) -continue ; -suppose you can replace all
spin_lock_irqsave()withspin_lock()in patch5 instead of leaving some replacement to next patch.
Make sense. I will update the series.
Best regards,
baolu
Baolu Lu
maintainerRe: [PATCH v3 10/11] iommu/vt-d: Use device_domain_lock accurately
In reply to Tian, KevinQuoted 12 lines · Kevin
drivers/iommu/intel/iommu.c static int domain_update_device_node(struct dmar_domain *domain) · line 546
Quoted 8 lines
From: Lu Baolu <[email protected]>
Sent: Wednesday, June 29, 2022 3:47 PMdrivers/iommu/intel/iommu.c +1
-3+spin_lock_irqsave (&device_domain_lock, flags);list_for_each_entry (info, &domain->devices, link) { -if (!info->dev) -continue ; -suppose you can replace all
spin_lock_irqsave()withspin_lock()in patch5 instead of leaving some replacement to next patch.
Make sense to me. Will update this.
Best regards,
baolu
Lu Baolu
maintainerPATCH v3 11/11 iommu/vt-d: Convert global spinlock into per domain lock
In reply to Lu BaoluUsing a global device_domain_lock spinlock to protect per-domain device tracking lists is an inefficient way, especially considering this lock is also needed in the hot paths. This optimizes the locking mechanism by converting the global lock to per domain lock.
On the other hand, as the device tracking lists are never accessed in any interrupt context, there is no need to disable interrupts while spinning. Replace irqsave variant with spinlock calls.
--- drivers/iommu/intel/iommu.h | 1 + drivers/iommu/intel/iommu.c | 50 ++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 29 deletions(-)
drivers/iommu/intel/iommu.h +1 -0
@@ -541,6 +541,7 @@ struct dmar_domain { u8 force_snooping : 1; /* Create IOPTEs with snoop control */ u8 set_pte_snp:1; +spinlock_t lock;/* Protect device tracking lists */ struct list_head devices;/* all devices' list */ struct dma_pte *pgd;/* virtual address */
drivers/iommu/intel/iommu.c +21 -29
173 lines not on this page · raw message
Signature · 1 line
2.25.1
RE: [PATCH v3 11/11] iommu/vt-d: Convert global spinlock into per domain lock
Quoted 8 lines
From: Lu Baolu <[email protected]>
Sent: Wednesday, June 29, 2022 3:47 PMUsing a global
device_domain_lockspinlock to protect per-domain device tracking lists is an inefficient way, especially considering this lock is also needed in the hot paths. This optimizes the locking mechanism by converting the global lock to per domain lock.
Quoted 5 lines
On the other hand, as the device tracking lists are never accessed in any interrupt context, there is no need to disable interrupts while spinning. Replace irqsave variant with spinlock calls.
Signed-off-by Lu Baolu <[email protected]>
except the previous comment on where to convert spin_lock_irqsave() the rest looks good to me.
Quoted 14 lines
From: Lu Baolu <[email protected]>
Sent: Wednesday, June 29, 2022 3:47 PMv3:
- Split reduction of lock ranges from changing irqsave.
https://lore.kernel.org/linux-
iommu/BN9PR11MB52760A3D7C6BF1AF9C9D34658CAA9@BN9PR11MB5276. namprd11.prod.outlook.com/
- Fully initialize thedev_infobefore adding it to the list.
https://lore.kernel.org/linux-
iommu/BN9PR11MB52764D7CD86448C5E4EB46668CAA9@BN9PR11MB5276. namprd11.prod.outlook.com/
- Various code and comments refinement.
This doesn't say why original patch2 was removed:
"iommu/vt-d: Remove for_each_device_domain()"
It took me a while to realize that it's already covered by your another patch fixing RID2PASID. 😊
Baolu Lu
maintainerQuoted 15 lines · Kevin
Quoted 14 lines
From: Lu Baolu <[email protected]>
Sent: Wednesday, June 29, 2022 3:47 PMv3:
- Split reduction of lock ranges from changing irqsave.
https://lore.kernel.org/linux-
iommu/BN9PR11MB52760A3D7C6BF1AF9C9D34658CAA9@BN9PR11MB5276. namprd11.prod.outlook.com/
- Fully initialize thedev_infobefore adding it to the list.
https://lore.kernel.org/linux-
iommu/BN9PR11MB52764D7CD86448C5E4EB46668CAA9@BN9PR11MB5276. namprd11.prod.outlook.com/
- Various code and comments refinement.
Quoted 6 lines
This doesn't say why original patch2 was removed:
"iommu/vt-d: Remove
for_each_device_domain()"It took me a while to realize that it's already covered by your another patch fixing RID2PASID. 😊
My fault! I forgot to mention it in the change log. Sorry about it.
Best regards,
baolu