Intel IOMMU updates for Linux v5.18
Subsystems (2)
Lu Baolu
maintainerHi Joerg,
This includes patches queued for v5.18. It includes:
- [PATCH 1 ~ 11] Various cleanups, no intentional functional changes.
- [PATCH 12] Enable ATS in SoC-integrated devices listed in ACPI/SATC table.
Please consider them for v5.18.
Best regards,
Baolu
Andy Shevchenko (1):
iommu/vt-d: Move intel_iommu_ops to header file
Lu Baolu (8):
iommu/vt-d: Remove intel_iommu::domains
iommu/vt-d: Remove finding domain in dmar_insert_one_dev_info() iommu/vt-d: Remove iova_cache_get/put()
iommu/vt-d: Remove domain and devinfo mempool iommu/vt-d: Remove DEFER_DEVICE_DOMAIN_INFO iommu/vt-d: Remove unnecessary includes
iommu/vt-d: Remove unnecessary prototypes
iommu/vt-d: Fix indentation of goto labels
Marco Bonelli (1):
iommu/vt-d: Add missing "__init" for rmrr_sanity_check()
Yian Chen (1):
iommu/vt-d: Enable ATS for the devices in SATC table
YueHaibing (1):
iommu/vt-d: Remove unused function intel_svm_capable()
include/linux/intel-iommu.h | 6 +- drivers/iommu/intel/debugfs.c | 3 +- drivers/iommu/intel/dmar.c | 2 - drivers/iommu/intel/iommu.c | 461 +++++++++------------------------- drivers/iommu/intel/pasid.c | 12 +- drivers/iommu/intel/svm.c | 11 +- 6 files changed, 133 insertions(+), 362 deletions(-)
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 1/12 iommu/vt-d: Remove intel_iommu::domains
The "domains" field of the intel_iommu structure keeps the mapping of domain_id to dmar_domain. This information is not used anywhere. Remove and cleanup it to avoid unnecessary memory consumption.
--- include/linux/intel-iommu.h | 1 - drivers/iommu/intel/iommu.c | 68 ++----------------------------------- 2 files changed, 3 insertions(+), 66 deletions(-)
include/linux/intel-iommu.h +0 -1
@@ -578,7 +578,6 @@ struct intel_iommu {#ifdef CONFIG_INTEL_IOMMU unsigned long *domain_ids;/* bitmap of domains */ -struct dmar_domain ***domains;/* ptr to domains */ spinlock_t lock;/* protect context, domain ids */ struct root_entry *root_entry;/* virtual address */
drivers/iommu/intel/iommu.c +3 -65
119 lines not on this page · raw message
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 2/12 iommu/vt-d: Remove finding domain in dmar_insert_one_dev_info()
In reply to Lu BaoluThe Intel IOMMU driver has already converted to use default domain framework in iommu core. There's no need to find a domain for the device in the domain attaching path. Cleanup that code.
--- drivers/iommu/intel/iommu.c | 21 --------------------- 1 file changed, 21 deletions(-)
drivers/iommu/intel/iommu.c +0 -21
@@ -2554,7 +2554,6 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,struct device *dev, struct dmar_domain *domain) { - struct dmar_domain *found = NULL; struct device_domain_info *info;unsigned long flags;int ret;
@@ -2605,26 +2604,6 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu, }spin_lock_irqsave (&device_domain_lock, flags); -if (dev) - found =find_domain (dev); - -if (!found) { -struct device_domain_info *info2; - info2 =dmar_search_domain_by_dev_info (info->segment, info->bus, - info->devfn); -if (info2) { - found = info2->domain; - info2->dev = dev; - } - } - -if (found) { -spin_unlock_irqrestore (&device_domain_lock, flags); -free_devinfo_mem (info); -/* Caller must free the original domain */ -return found; - } -spin_lock (&iommu->lock); ret =domain_attach_iommu (domain, iommu);spin_unlock (&iommu->lock);
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 3/12 iommu/vt-d: Remove iova_cache_get/put()
In reply to Lu BaoluThese have been done in drivers/iommu/dma-iommu.c. Remove this duplicate code.
--- drivers/iommu/intel/iommu.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/iommu/intel/iommu.c +0 -5
@@ -3381,9 +3381,6 @@ static inline int iommu_devinfo_cache_init(void)static int __init iommu_init_mempool (void ) {int ret; - ret =iova_cache_get (); -if (ret) -return ret; ret =iommu_domain_cache_init ();if (ret)
@@ -3395,7 +3392,6 @@ static int __init iommu_init_mempool(void)kmem_cache_destroy (iommu_domain_cache); domain_error: -iova_cache_put ();return -ENOMEM ; }
@@ -3404,7 +3400,6 @@ static void __init iommu_exit_mempool(void) {kmem_cache_destroy (iommu_devinfo_cache);kmem_cache_destroy (iommu_domain_cache); -iova_cache_put (); }static void __init init_no_remapping_devices (void )
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 4/12 iommu/vt-d: Remove domain and devinfo mempool
In reply to Lu BaoluThe domain and devinfo memory blocks are only allocated during device probe and released during remove. There's no hot-path context, hence no need for memory pools.
--- drivers/iommu/intel/iommu.c | 104 ++---------------------------------- 1 file changed, 5 insertions(+), 99 deletions(-)
drivers/iommu/intel/iommu.c +5 -99
@@ -452,9 +452,6 @@ static int __init intel_iommu_setup(char *str) }__setup ("intel_iommu=" , intel_iommu_setup); -static struct kmem_cache *iommu_domain_cache; -static struct kmem_cache *iommu_devinfo_cache; -void *alloc_pgtable_page (int node) {struct page *page;
@@ -471,26 +468,6 @@ void free_pgtable_page(void *vaddr)free_page ((unsigned long )vaddr); } -static inline void *alloc_domain_mem (void ) -{ -return kmem_cache_alloc (iommu_domain_cache,GFP_ATOMIC ); -} - -static void free_domain_mem (void *vaddr) -{ -kmem_cache_free (iommu_domain_cache, vaddr); -} - -static inline void *alloc_devinfo_mem (void ) -{ -return kmem_cache_alloc (iommu_devinfo_cache,GFP_ATOMIC ); -} - -static inline void free_devinfo_mem (void *vaddr) -{ -kmem_cache_free (iommu_devinfo_cache, vaddr); -} -static inline int domain_type_is_si (struct dmar_domain *domain) {return domain->domain.type ==IOMMU_DOMAIN_IDENTITY ;
@@ -1885,11 +1862,10 @@ static struct dmar_domain *alloc_domain(unsigned int type) {struct dmar_domain *domain; - domain =alloc_domain_mem (); + domain =kzalloc (sizeof (*domain),GFP_KERNEL );if (!domain)return NULL ; -memset (domain,0 ,sizeof (*domain)); domain->nid =NUMA_NO_NODE ;if (first_level_by_default (type)) domain->flags |=DOMAIN_FLAG_USE_FIRST_LEVEL ;
@@ -1973,7 +1949,7 @@ static void domain_exit(struct dmar_domain *domain)put_pages_list (&freelist); } -free_domain_mem (domain); +kfree (domain); }/*
@@ -2558,7 +2534,7 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,unsigned long flags;int ret; - info =alloc_devinfo_mem (); + info =kzalloc (sizeof (*info),GFP_KERNEL );if (!info)return NULL ;
@@ -2574,13 +2550,9 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu, info->segment =pci_domain_nr (pdev->bus); } - info->ats_supported = info->pasid_supported = info->pri_supported =0 ; - info->ats_enabled = info->pasid_enabled = info->pri_enabled =0 ; - info->ats_qdep =0 ; info->dev = dev; info->domain = domain; info->iommu = iommu; - info->pasid_table =NULL ;if (dev &&dev_is_pci (dev)) {struct pci_dev *pdev =to_pci_dev (info->dev);
@@ -2610,7 +2582,7 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,if (ret) {spin_unlock_irqrestore (&device_domain_lock, flags); -free_devinfo_mem (info); +kfree (info);return NULL ; }
@@ -3343,65 +3315,6 @@ static int __init init_dmars(void)return ret; } -static inline int iommu_domain_cache_init (void ) -{ -int ret =0 ; - - iommu_domain_cache =kmem_cache_create ("iommu_domain" , -sizeof (struct dmar_domain ), -0 , -SLAB_HWCACHE_ALIGN , - -NULL ); -if (!iommu_domain_cache) { -pr_err ("Couldn't create iommu_domain cache\n" ); - ret = -ENOMEM ; - } - -return ret; -} - -static inline int iommu_devinfo_cache_init (void ) -{ -int ret =0 ; - - iommu_devinfo_cache =kmem_cache_create ("iommu_devinfo" , -sizeof (struct device_domain_info ), -0 , -SLAB_HWCACHE_ALIGN , -NULL ); -if (!iommu_devinfo_cache) { -pr_err ("Couldn't create devinfo cache\n" ); - ret = -ENOMEM ; - } - -return ret; -} - -static int __init iommu_init_mempool (void ) -{ -int ret; - - ret =iommu_domain_cache_init (); -if (ret) - goto domain_error; - - ret =iommu_devinfo_cache_init (); -if (!ret) -return ret; - -kmem_cache_destroy (iommu_domain_cache); -domain_error: - -return -ENOMEM ; -} - -static void __init iommu_exit_mempool (void ) -{ -kmem_cache_destroy (iommu_devinfo_cache); -kmem_cache_destroy (iommu_domain_cache); -} -static void __init init_no_remapping_devices (void ) {struct dmar_drhd_unit *drhd;
@@ -4253,12 +4166,6 @@ int __init intel_iommu_init(void) force_on = (!intel_iommu_tboot_noforce &&tboot_force_iommu ()) ||platform_optin_force_iommu (); -if (iommu_init_mempool ()) { -if (force_on) -panic ("tboot: Failed to initialize iommu memory\n" ); -return -ENOMEM ; - } -down_write (&dmar_global_lock);if (dmar_table_init ()) {if (force_on)
@@ -4379,7 +4286,6 @@ int __init intel_iommu_init(void) out_free_dmar:intel_iommu_free_dmars ();up_write (&dmar_global_lock); -iommu_exit_mempool ();return ret; }
@@ -4436,7 +4342,7 @@ static void __dmar_remove_one_dev_info(struct device_domain_info *info)domain_detach_iommu (domain, iommu);spin_unlock_irqrestore (&iommu->lock, flags); -free_devinfo_mem (info); +kfree (info); }static void dmar_remove_one_dev_info (struct device *dev)
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 5/12 iommu/vt-d: Remove DEFER_DEVICE_DOMAIN_INFO
In reply to Lu BaoluAllocate and set the per-device iommu private data during iommu device probe. This makes the per-device iommu private data always available during iommu_probe_device() and iommu_release_device(). With this changed, the dummy DEFER_DEVICE_DOMAIN_INFO pointer could be removed. The wrappers for getting the private data and domain are also cleaned.
--- include/linux/intel-iommu.h | 2 - drivers/iommu/intel/debugfs.c | 3 +- drivers/iommu/intel/iommu.c | 186 +++++++++++++--------------------- drivers/iommu/intel/pasid.c | 12 +-- drivers/iommu/intel/svm.c | 6 +- 5 files changed, 79 insertions(+), 130 deletions(-)
include/linux/intel-iommu.h +0 -2
@@ -733,8 +733,6 @@ int for_each_device_domain(int (*fn)(struct device_domain_info *info, void *data), void *data);void iommu_flush_write_buffer (struct intel_iommu *iommu);int intel_iommu_enable_pasid (struct intel_iommu *iommu,struct device *dev); -struct dmar_domain *find_domain (struct device *dev); -struct device_domain_info *get_domain_info (struct device *dev);struct intel_iommu *device_to_iommu (struct device *dev,u8 *bus,u8 *devfn);#ifdef CONFIG_INTEL_IOMMU_SVM
drivers/iommu/intel/debugfs.c +2 -1
@@ -344,7 +344,8 @@ static void pgtable_walk_level(struct seq_file *m, struct dma_pte *pde,static int show_device_domain_translation (struct device *dev,void *data) { -struct dmar_domain *domain =find_domain (dev); +struct device_domain_info *info =dev_iommu_priv_get (dev); +struct dmar_domain *domain = info->domain;struct seq_file *m = data;u64 path[6 ] = {0 };
drivers/iommu/intel/iommu.c +68 -118
313 lines not on this page · raw message
drivers/iommu/intel/pasid.c +6 -6
@@ -150,7 +150,7 @@ int intel_pasid_alloc_table(struct device *dev)int size;might_sleep (); - info =get_domain_info (dev); + info =dev_iommu_priv_get (dev);if (WARN_ON (!info || !dev_is_pci (dev) || info->pasid_table))return -EINVAL ;
@@ -197,7 +197,7 @@ void intel_pasid_free_table(struct device *dev)struct pasid_entry *table;int i, max_pde; - info =get_domain_info (dev); + info =dev_iommu_priv_get (dev);if (!info || !dev_is_pci (dev) || !info->pasid_table)return ;
@@ -223,7 +223,7 @@ struct pasid_table *intel_pasid_get_table(struct device *dev) {struct device_domain_info *info; - info =get_domain_info (dev); + info =dev_iommu_priv_get (dev);if (!info)return NULL ;
@@ -234,7 +234,7 @@ static int intel_pasid_get_dev_max_id(struct device *dev) {struct device_domain_info *info; - info =get_domain_info (dev); + info =dev_iommu_priv_get (dev);if (!info || !info->pasid_table)return 0 ;
@@ -254,7 +254,7 @@ static struct pasid_entry *intel_pasid_get_entry(struct device *dev, u32 pasid)return NULL ; dir = pasid_table->table; - info =get_domain_info (dev); + info =dev_iommu_priv_get (dev); dir_index = pasid >>PASID_PDE_SHIFT ; index = pasid &PASID_PTE_MASK ;
@@ -487,7 +487,7 @@ devtlb_invalidation_with_pasid(struct intel_iommu *iommu,struct device_domain_info *info;u16 sid, qdep, pfsid; - info =get_domain_info (dev); + info =dev_iommu_priv_get (dev);if (!info || !info->ats_enabled)return ;
drivers/iommu/intel/svm.c +3 -3
@@ -200,7 +200,7 @@ static void __flush_svm_range_dev(struct intel_svm *svm,unsigned long address, unsigned long pages, int ih) { - struct device_domain_info *info = get_domain_info(sdev->dev); + struct device_domain_info *info = dev_iommu_priv_get(sdev->dev);if (WARN_ON (!pages))return ;
@@ -337,7 +337,7 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu, struct mm_struct *mm, unsigned int flags) { -struct device_domain_info *info =get_domain_info (dev); +struct device_domain_info *info =dev_iommu_priv_get (dev);unsigned long iflags, sflags;struct intel_svm_dev *sdev;struct intel_svm *svm;
@@ -545,7 +545,7 @@ static void intel_svm_drain_prq(struct device *dev, u32 pasid)u16 sid, did;int qdep; - info =get_domain_info (dev); + info =dev_iommu_priv_get (dev);if (WARN_ON (!info || !dev_is_pci (dev)))return ;
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 6/12 iommu/vt-d: Remove unnecessary includes
In reply to Lu BaoluRemove unnecessary include files and sort the remaining alphabetically.
--- drivers/iommu/intel/iommu.c | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-)
drivers/iommu/intel/iommu.c +7 -27
@@ -13,38 +13,18 @@#define pr_fmt (fmt) "DMAR: " fmt#define dev_fmt (fmt) pr_fmt(fmt) -#include <linux/init.h> -#include <linux/bitmap.h> -#include <linux/debugfs.h> -#include <linux/export.h> -#include <linux/slab.h> -#include <linux/irq.h> -#include <linux/interrupt.h> -#include <linux/spinlock.h> -#include <linux/pci.h> -#include <linux/dmar.h> -#include <linux/dma-map-ops.h> -#include <linux/mempool.h> -#include <linux/memory.h> -#include <linux/cpu.h> -#include <linux/timer.h> -#include <linux/io.h> -#include <linux/iova.h> -#include <linux/iommu.h> +#include <linux/crash_dump.h> +#include <linux/dma-direct.h> #include <linux/dma-iommu.h> +#include <linux/dmi.h> #include <linux/intel-iommu.h> #include <linux/intel-svm.h> +#include <linux/memory.h> +#include <linux/pci.h> +#include <linux/pci-ats.h> +#include <linux/spinlock.h> #include <linux/syscore_ops.h> #include <linux/tboot.h> -#include <linux/dmi.h> -#include <linux/pci-ats.h> -#include <linux/memblock.h> -#include <linux/dma-direct.h> -#include <linux/crash_dump.h> -#include <linux/numa.h> -#include <asm/irq_remapping.h> -#include <asm/cacheflush.h> -#include <asm/iommu.h> #include "../irq_remapping.h" #include "../iommu-sva-lib.h"
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 7/12 iommu/vt-d: Remove unnecessary prototypes
In reply to Lu BaoluSome prototypes in iommu.c are unnecessary. Delete them.
--- drivers/iommu/intel/iommu.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/iommu/intel/iommu.c +0 -5
@@ -296,14 +296,9 @@ static LIST_HEAD(dmar_satc_units);/* bitmap for indexing intel_iommus */ static int g_num_of_iommus; -static void domain_exit (struct dmar_domain *domain);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); -static int intel_iommu_attach_device (struct iommu_domain *domain, -struct device *dev); -static phys_addr_t intel_iommu_iova_to_phys (struct iommu_domain *domain, -dma_addr_t iova);int dmar_disabled = !IS_ENABLED (CONFIG_INTEL_IOMMU_DEFAULT_ON );int intel_iommu_sm =IS_ENABLED (CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON );
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 8/12 iommu/vt-d: Fix indentation of goto labels
In reply to Lu BaoluRemove blanks before goto labels.
--- drivers/iommu/intel/iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iommu/intel/iommu.c +2 -2
@@ -827,7 +827,7 @@ struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devfn) }if (pdev && drhd->include_all) { - got_pdev: +got_pdev:if (bus && devfn) { *bus = pdev->bus->number; *devfn = pdev->devfn;
@@ -836,7 +836,7 @@ struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devfn) } } iommu =NULL ; - out: +out:if (iommu_is_dummy (iommu, dev)) iommu =NULL ;
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 9/12 iommu/vt-d: Move intel_iommu_ops to header file
In reply to Lu BaoluFrom: Andy Shevchenko <[email protected]>
Compiler is not happy about hidden declaration of intel_iommu_ops.
.../iommu.c:414:24: warning: symbol 'intel_iommu_ops' was not declared. Should it be static?
Move declaration to header file to make compiler happy.
--- include/linux/intel-iommu.h | 2 ++ drivers/iommu/intel/dmar.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)
include/linux/intel-iommu.h +2 -0
@@ -783,6 +783,8 @@ bool context_present(struct context_entry *context);struct context_entry *iommu_context_addr (struct intel_iommu *iommu,u8 bus,u8 devfn,int alloc); +extern const struct iommu_ops intel_iommu_ops; +#ifdef CONFIG_INTEL_IOMMU extern int iommu_calculate_agaw (struct intel_iommu *iommu);extern int iommu_calculate_max_sagaw (struct intel_iommu *iommu);
drivers/iommu/intel/dmar.c +0 -2
@@ -66,8 +66,6 @@ static unsigned long dmar_seq_ids[BITS_TO_LONGS(DMAR_UNITS_SUPPORTED)];static int alloc_iommu (struct dmar_drhd_unit *drhd);static void free_iommu (struct intel_iommu *iommu); -extern const struct iommu_ops intel_iommu_ops; -static void dmar_register_drhd_unit (struct dmar_drhd_unit *drhd) {/*
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 10/12 iommu/vt-d: Add missing "__init" for rmrr_sanity_check()
In reply to Lu BaoluFrom: Marco Bonelli <[email protected]>
rmrr_sanity_check() calls arch_rmrr_sanity_check(), which is marked as "__init". Add the annotation for rmrr_sanity_check() too. This function is currently only called from dmar_parse_one_rmrr() which is also "__init".
--- drivers/iommu/intel/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/intel/iommu.c +1 -1
@@ -3364,7 +3364,7 @@ static void __init init_iommu_pm_ops(void)static inline void init_iommu_pm_ops (void ) {}#endif /* CONFIG_PM */ -static int rmrr_sanity_check (struct acpi_dmar_reserved_memory *rmrr) +static int __init rmrr_sanity_check (struct acpi_dmar_reserved_memory *rmrr) { if (!IS_ALIGNED(rmrr->base_address, PAGE_SIZE) || !IS_ALIGNED(rmrr->end_address + 1, PAGE_SIZE) ||
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 11/12 iommu/vt-d: Remove unused function intel_svm_capable()
In reply to Lu BaoluFrom: YueHaibing <[email protected]>
This is unused since commit 4048377414162 ("iommu/vt-d: Use iommu_sva_alloc(free)_pasid() helpers").
--- drivers/iommu/intel/svm.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/iommu/intel/svm.c +0 -5
@@ -168,11 +168,6 @@ int intel_svm_finish_prq(struct intel_iommu *iommu)return 0 ; } -static inline bool intel_svm_capable (struct intel_iommu *iommu) -{ -return iommu->flags &VTD_FLAG_SVM_CAPABLE ; -} -void intel_svm_check (struct intel_iommu *iommu) {if (!pasid_supported (iommu))
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerPATCH 12/12 iommu/vt-d: Enable ATS for the devices in SATC table
In reply to Lu BaoluFrom: Yian Chen <[email protected]>
Starting from Intel VT-d v3.2, Intel platform BIOS can provide additional SATC table structure. SATC table includes a list of SoC integrated devices that support ATC (Address translation cache).
Enabling ATC (via ATS capability) can be a functional requirement for SATC device operation or optional to enhance device performance/functionality. This is determined by the bit of ATC_REQUIRED in SATC table. When IOMMU is working in scalable mode, software chooses to always enable ATS for every device in SATC table because Intel SoC devices in SATC table are trusted to use ATS.
On the other hand, if IOMMU is in legacy mode, ATS of SATC capable devices can work transparently to software and be automatically enabled by IOMMU hardware. As the result, there is no need for software to enable ATS on these devices.
This also removes dmar_find_matched_atsr_unit() helper as it becomes dead code now.
--- include/linux/intel-iommu.h | 1 - drivers/iommu/intel/iommu.c | 40 +++++++++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 3 deletions(-)
include/linux/intel-iommu.h +0 -1
@@ -693,7 +693,6 @@ static inline int nr_pte_to_next_page(struct dma_pte *pte) }extern struct dmar_drhd_unit *dmar_find_matched_drhd_unit (struct pci_dev *dev); -extern int dmar_find_matched_atsr_unit (struct pci_dev *dev);extern int dmar_enable_qi (struct intel_iommu *iommu);extern void dmar_disable_qi (struct intel_iommu *iommu);
drivers/iommu/intel/iommu.c +38 -2
@@ -3693,7 +3693,31 @@ static void intel_iommu_free_dmars(void) } } -int dmar_find_matched_atsr_unit (struct pci_dev *dev) +static struct dmar_satc_unit *dmar_find_matched_satc_unit (struct pci_dev *dev) +{ +struct dmar_satc_unit *satcu; +struct acpi_dmar_satc *satc; +struct device *tmp; +int i; + + dev =pci_physfn (dev); +rcu_read_lock (); + +list_for_each_entry_rcu (satcu, &dmar_satc_units, list) { + satc = container_of(satcu->hdr, struct acpi_dmar_satc, header); +if (satc->segment !=pci_domain_nr (dev->bus)) +continue ; +for_each_dev_scope (satcu->devices, satcu->devices_cnt, i, tmp) +if (to_pci_dev (tmp) == dev) + goto out; + } + satcu =NULL ; +out: +rcu_read_unlock (); +return satcu; +} + +static int dmar_ats_supported (struct pci_dev *dev,struct intel_iommu *iommu) {int i, ret =1 ;struct pci_bus *bus;
@@ -3701,8 +3725,20 @@ int dmar_find_matched_atsr_unit(struct pci_dev *dev)struct device *tmp;struct acpi_dmar_atsr *atsr;struct dmar_atsr_unit *atsru; +struct dmar_satc_unit *satcu; dev =pci_physfn (dev); + satcu =dmar_find_matched_satc_unit (dev); +if (satcu) +/* +* This device supports ATS as it is in SATC table. +* When IOMMU is in legacy mode, enabling ATS is done +* automatically by HW for the device that requires +* ATS, hence OS should not enable this device ATS +* to avoid duplicated TLB invalidation. +*/ +return !(satcu->atc_required && !sm_supported (iommu)); +for (bus = dev->bus; bus; bus = bus->parent) { bridge = bus->self;/* If it's an integrated device, allow ATS */
@@ -4550,7 +4586,7 @@ static struct iommu_device *intel_iommu_probe_device(struct device *dev)if (dev_is_pci (dev)) {if (ecap_dev_iotlb_support (iommu->ecap) &&pci_ats_supported (pdev) && -dmar_find_matched_atsr_unit (pdev)) +dmar_ats_supported (pdev, iommu)) info->ats_supported =1 ;if (sm_supported (iommu)) {
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Joerg Roedel
maintainerHi Baolu,
Quoted 7 lines · Lu Baolu
This includes patches queued for v5.18. It includes:
- [PATCH 1 ~ 11] Various cleanups, no intentional functional changes.
- [PATCH 12] Enable ATS in SoC-integrated devices listed in ACPI/SATC table.Please consider them for v5.18.
I would, but this shows non-trivial conflicts when I am applying it to the x86/vt-d branch. Can you please re-base the changes and send again?
Thanks,
Joerg
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerHi Joerg,
Quoted 5 lines · Joerg Roedel
Hi Baolu,
Quoted 2 lines · Lu Baolu
This includes patches queued for v5.18. It includes:
Quoted 8 lines
Quoted 5 lines
- [PATCH 1 ~ 11] Various cleanups, no intentional functional changes.
- [PATCH 12] Enable ATS in SoC-integrated devices listed in ACPI/SATC table.Please consider them for v5.18.
I would, but this shows non-trivial conflicts when I am applying it to the x86/vt-d branch. Can you please re-base the changes and send again?
It's based on this series:
https://lore.kernel.org/linux-iommu/Yhy%[email protected]/
which contains some cleanup in vt-d driver as well.
If I re-base the series onto the vt-d branch, there will also be conflicts when you merge the core and vt-d branch.
I can re-base anyway if you think that's not a problem.
Best regards,
baolu
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Joerg Roedel
maintainerQuoted 10 lines · Lu Baolu
It's based on this series:
https://lore.kernel.org/linux-iommu/Yhy%[email protected]/
which contains some cleanup in vt-d driver as well.
If I re-base the series onto the vt-d branch, there will also be conflicts when you merge the core and vt-d branch.
I can re-base anyway if you think that's not a problem.
Alright, I merged the core branch into the vt-d branch and applied your changes on-top, thanks.
Regards,
Joerg
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu