iommu/vt-d: Gracefully handle DMAR units with no supported address widths
PATCH 1/2 iommu/vt-d: Gracefully handle DMAR units with no supported address widths
From: David Woodhouse <[email protected]>
commit c40aaaac1018ff1382f2d35df5129a6bcea3df6b upstream.
Instead of bailing out completely, such a unit can still be used for interrupt remapping.
[ context change due to moving drivers/iommu/dmar.c to
drivers/iommu/intel/dmar.c ]
--- drivers/iommu/dmar.c | 44 ++++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 14 deletions(-)
drivers/iommu/dmar.c +30 -14
@@ -1020,8 +1020,8 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd) {struct intel_iommu *iommu;u32 ver, sts; -int agaw =0 ; -int msagaw =0 ; +int agaw =-1 ; +int msagaw =-1 ;int err;if (!drhd->reg_base_addr) {
@@ -1046,17 +1046,28 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd) } err = -EINVAL ; - agaw =iommu_calculate_agaw (iommu); -if (agaw <0 ) { -pr_err ("Cannot get a valid agaw for iommu (seq_id = %d)\n" , - iommu->seq_id); - goto err_unmap; +if (cap_sagaw (iommu->cap) ==0 ) { +pr_info ("%s: No supported address widths. Not attempting DMA translation.\n" , + iommu->name); + drhd->ignored =1 ; } - msagaw =iommu_calculate_max_sagaw (iommu); -if (msagaw <0 ) { -pr_err ("Cannot get a valid max agaw for iommu (seq_id = %d)\n" , - iommu->seq_id); - goto err_unmap; + +if (!drhd->ignored) { + agaw =iommu_calculate_agaw (iommu); +if (agaw <0 ) { +pr_err ("Cannot get a valid agaw for iommu (seq_id = %d)\n" , + iommu->seq_id); + drhd->ignored =1 ; + } + } +if (!drhd->ignored) { + msagaw =iommu_calculate_max_sagaw (iommu); +if (msagaw <0 ) { +pr_err ("Cannot get a valid max agaw for iommu (seq_id = %d)\n" , + iommu->seq_id); + drhd->ignored =1 ; + agaw =-1 ; + } } iommu->agaw = agaw; iommu->msagaw = msagaw;
@@ -1083,7 +1094,12 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd)raw_spin_lock_init (&iommu->register_lock); -if (intel_iommu_enabled) { +/* +* This is only for hotplug; at boot time intel_iommu_enabled won't +* be set yet. When intel_iommu_init() runs, it registers the units +* present at boot time, then sets intel_iommu_enabled. +*/ +if (intel_iommu_enabled && !drhd->ignored) { err =iommu_device_sysfs_add (&iommu->iommu,NULL , intel_iommu_groups,"%s" , iommu->name);
@@ -1112,7 +1128,7 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd)static void free_iommu (struct intel_iommu *iommu) { -if (intel_iommu_enabled) { +if (intel_iommu_enabled && iommu->iommu.ops) {iommu_device_unregister (&iommu->iommu);iommu_device_sysfs_remove (&iommu->iommu); }
Signature · 12 lines
2.17.1 Amazon Development Center Germany GmbH Krausenstr. 38 10117 Berlin Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B Sitz: Berlin Ust-ID: DE 289 237 879
PATCH 2/2 iommu/vt-d: Don't dereference iommu_device if IOMMU_API is not built
From: Bartosz Golaszewski <[email protected]>
commit 9def3b1a07c41e21c68a0eb353e3e569fdd1d2b1 upstream.
Since commit c40aaaac1018 ("iommu/vt-d: Gracefully handle DMAR units with no supported address widths") dmar.c needs struct iommu_device to be selected. We can drop this dependency by not dereferencing struct iommu_device if IOMMU_API is not selected and by reusing the information stored in iommu->drhd->ignored instead.
This fixes the following build error when IOMMU_API is not selected:
drivers/iommu/dmar.c: In function ‘free_iommu’:drivers/iommu/dmar.c:1139:41: error: ‘struct iommu_device’ has no member named ‘ops’
1139 | if (intel_iommu_enabled && iommu->iommu.ops) {
^[ - context change due to moving drivers/iommu/dmar.c to
drivers/iommu/intel/dmar.c
- set the drhr in the iommu like in upstream commit b1012ca8dc4f ("iommu/vt-d: Skip TE disabling on quirky gfx dedicated iommu") ]
--- drivers/iommu/dmar.c | 3 ++- include/linux/intel-iommu.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/iommu/dmar.c +2 -1
@@ -1114,6 +1114,7 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd) } drhd->iommu = iommu; + iommu->drhd = drhd;return 0 ;
@@ -1128,7 +1129,7 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd)static void free_iommu (struct intel_iommu *iommu) { -if (intel_iommu_enabled && iommu->iommu.ops) { +if (intel_iommu_enabled && !iommu->drhd->ignored) {iommu_device_unregister (&iommu->iommu);iommu_device_sysfs_remove (&iommu->iommu); }
include/linux/intel-iommu.h +2 -0
@@ -556,6 +556,8 @@ struct intel_iommu {struct iommu_device iommu;/* IOMMU core code handle */ int node;u32 flags;/* Software defined flags */ + +struct dmar_drhd_unit *drhd; };/* PCI domain-device relationship */
Signature · 12 lines
2.17.1 Amazon Development Center Germany GmbH Krausenstr. 38 10117 Berlin Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B Sitz: Berlin Ust-ID: DE 289 237 879
Greg KH
maintainerQuoted 11 lines · Filippo Sironi
From: David Woodhouse <[email protected]>
commit
c40aaaac1018ff1382f2d35df5129a6bcea3df6bupstream.Instead of bailing out completely, such a unit can still be used for interrupt remapping.
Signed-off-by David Woodhouse <[email protected]>Reviewed-by Lu Baolu <[email protected]>Signed-off-by Joerg Roedel <[email protected]>
Quoted 6 lines
[ context change due to moving
drivers/iommu/dmar.cto
drivers/iommu/intel/dmar.c]Signed-off-by Filippo Sironi <[email protected]>--- drivers/iommu/dmar.c | 44 ++++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 14 deletions(-)
All of these now queued up, thanks!
greg k-h