FAILED: patch "[PATCH] iommu/vt-d: Fix RID2PASID setup/teardown failure" failed to apply to 5.4-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 4140d77a022101376bbfa3ec3e3da5063455c60e Mon Sep 17 00:00:00 2001
From: Lu Baolu <[email protected]>
Date: Sat, 25 Jun 2022 21:34:30 +0800
Subject: [PATCH] iommu/vt-d: Fix RID2PASID setup/teardown failure
The IOMMU driver shares the pasid table for PCI alias devices. When the RID2PASID entry of the shared pasid table has been filled by the first device, the subsequent device will encounter the "DMAR: Setup RID2PASID failed" failure as the pasid entry has already been marked as present. As the result, the IOMMU probing process will be aborted.
On the contrary, when any alias device is hot-removed from the system, for example, by writing to /sys/bus/pci/devices/.../remove, the shared RID2PASID will be cleared without any notifications to other devices. As the result, any DMAs from those rest devices are blocked.
Sharing pasid table among PCI alias devices could save two memory pages for devices underneath the PCIe-to-PCI bridges. Anyway, considering that those devices are rare on modern platforms that support VT-d in scalable mode and the saved memory is negligible, it's reasonable to remove this part of immature code to make the driver feasible and stable.
drivers/iommu/intel/iommu.c +0 -24
@@ -320,30 +320,6 @@ EXPORT_SYMBOL_GPL(intel_iommu_gfx_mapped);DEFINE_SPINLOCK (device_domain_lock);static LIST_HEAD (device_domain_list); -/* -* Iterate over elements in device_domain_list and call the specified -* callback @fn against each element. -*/ -int for_each_device_domain (int (*fn)(struct device_domain_info *info, -void *data),void *data) -{ -int ret =0 ; -unsigned long flags; -struct device_domain_info *info; - -spin_lock_irqsave (&device_domain_lock, flags); -list_for_each_entry (info, &device_domain_list, global) { - ret =fn (info, data); -if (ret) { -spin_unlock_irqrestore (&device_domain_lock, flags); -return ret; - } - } -spin_unlock_irqrestore (&device_domain_lock, flags); - -return 0 ; -} -const struct iommu_ops intel_iommu_ops;static bool translation_pre_enabled (struct intel_iommu *iommu)
drivers/iommu/intel/pasid.c +3 -66
104 lines not on this page · raw message
drivers/iommu/intel/pasid.h +0 -1
@@ -74,7 +74,6 @@ struct pasid_table {void *table;/* pasid table pointer */ int order;/* page order of pasid table */ u32 max_pasid;/* max pasid */ -struct list_head dev;/* device list */ };/* Get PRESENT bit of a PASID directory entry. */
include/linux/intel-iommu.h +0 -3
@@ -612,7 +612,6 @@ struct intel_iommu {struct device_domain_info {struct list_head link;/* link to domain siblings */ struct list_head global;/* link to global list */ -struct list_head table;/* link to pasid table */ u32 segment;/* PCI segment number */ u8 bus;/* PCI bus number */ u8 devfn;/* PCI devfn number */
@@ -729,8 +728,6 @@ extern int dmar_ir_support(void);void *alloc_pgtable_page (int node);void free_pgtable_page (void *vaddr);struct intel_iommu *domain_get_iommu (struct dmar_domain *domain); -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 intel_iommu *device_to_iommu (struct device *dev,u8 *bus,u8 *devfn);