iommu/vt-d: patches for v5.10
Subsystems (2)
Lu Baolu
maintainerPATCH 1/1 iommu/vt-d: Use device numa domain if RHSA is missing
In reply to Lu BaoluIf there are multiple NUMA domains but the RHSA is missing in ACPI/DMAR table, we could default to the device NUMA domain as fall back.
--- drivers/iommu/intel/iommu.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-)
drivers/iommu/intel/iommu.c +35 -2
@@ -698,12 +698,47 @@ static int domain_update_iommu_superpage(struct dmar_domain *domain,return fls (mask); } +static int domain_update_device_node (struct dmar_domain *domain) +{ +struct device_domain_info *info; +int nid =NUMA_NO_NODE ; + +assert_spin_locked (&device_domain_lock); + +if (list_empty (&domain->devices)) +return NUMA_NO_NODE ; + +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 +* isn't perfect answer in such situation, so we select first +* come first served policy. +*/ + nid =dev_to_node (info->dev); +if (nid !=NUMA_NO_NODE ) +break ; + } + +return nid; +} +/* Some capabilities may be different across iommus */ static void domain_update_iommu_cap (struct dmar_domain *domain) {domain_update_iommu_coherency (domain); domain->iommu_snooping =domain_update_iommu_snooping (NULL ); domain->iommu_superpage =domain_update_iommu_superpage (domain,NULL ); + +/* +* If RHSA is missing, we should default to the device numa domain +* as fall back. +*/ +if (domain->nid ==NUMA_NO_NODE ) + domain->nid =domain_update_device_node (domain); } struct context_entry *iommu_context_addr(struct intel_iommu *iommu, u8 bus,
@@ -5095,8 +5130,6 @@ static struct iommu_domain *intel_iommu_domain_alloc(unsigned type)if (type ==IOMMU_DOMAIN_DMA )intel_init_iova_domain (dmar_domain); -domain_update_iommu_cap (dmar_domain); - domain = &dmar_domain->domain; domain->geometry.aperture_start =0 ; domain->geometry.aperture_end =
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerHi Joerg,
Below patch is ready for v5.10. It includes:
- Use device numa domain if RHSA is missing
Can you please consider them for v5.10?
Best regards,
Lu Baolu
Lu Baolu (1):
iommu/vt-d: Use device numa domain if RHSA is missing
drivers/iommu/intel/iommu.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-)
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Joerg Roedel
maintainerQuoted 6 lines · Lu Baolu
Below patch is ready for v5.10. It includes:
- Use device numa domain if RHSA is missing
Can you please consider them for v5.10?
Quoted 8 lines
Best regards,
Lu BaoluLu Baolu (1):
iommu/vt-d: Use device numa domain if RHSA is missingdrivers/iommu/intel/iommu.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-)
Applied, thanks.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu