Skip to contentSkip to conversation

IR: Fix kernel hang if interrupt remapping disable in BIOS

PATCH In review Youquan Song 5 participants 7 messages Sep 9, 2009 – Sep 19, 2009 PCI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 IR: Fix kernel hang if interrupt remapping disable in BIOS

BIOS clear DMAR table INTR_REMAP flag to disable interrupt remapping. Current kernel only check interrupt remapping(IR) flag in DRHD's extended capability register to decide interrupt remapping support or not. But IR flag will not change when BIOS disable/enable interrupt remapping.

When user disable interrupt remapping in BIOS or BIOS often defaultly disable interrupt remapping feature when BIOS is not mature.Though BIOS disable interrupt remapping but intr_remapping_supported function will always report to OS support interrupt remapping if VT-d2 chipset populated. On this cases, kernel will continue enable interrupt remapping and result kernel panic. This bug exist on almost all platforms with interrupt remapping support.

This patch add DMAR table INTR_REMAP flag check before enable interrup remapping

---

drivers/pci/dmar.c +10 -0
index a8a4383..d943e95 100644
@@ -1302,3 +1302,13 @@ int dmar_reenable_qi(struct intel_iommu *iommu)
 
 	return 0;
 }
+
+/*
+ * Check interrupt remapping support in DMAR table description.
+ */
+int dmar_ir_support(void)
+{
+	struct acpi_table_dmar *dmar;
+	dmar = (struct acpi_table_dmar *)dmar_tbl;
+	return dmar->flags & 0x1;
+}
drivers/pci/intr_remapping.c +3 -0
index ebfa47b..ac06514 100644
@@ -611,6 +611,9 @@ int __init intr_remapping_supported(void)
 	if (disable_intremap)
 		return 0;
 
+	if (!dmar_ir_support())
+		return 0;
+
 	for_each_drhd_unit(drhd) {
 		struct intel_iommu *iommu = drhd->iommu;
 
include/linux/intel-iommu.h +2 -0
index 482dc91..4f0a72a 100644
@@ -360,4 +360,6 @@ extern void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 qdep,
 
 extern int qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu);
 
+extern int dmar_ir_support(void);
+
 #endif
#1 lore raw
Quoted 16 lines · Youquan Song

BIOS clear DMAR table INTR_REMAP flag to disable interrupt remapping. Current
kernel only check interrupt remapping(IR) flag in DRHD's extended capability register to decide interrupt remapping support or not. But IR flag will not change when BIOS disable/enable interrupt remapping.

When user disable interrupt remapping in BIOS or BIOS often defaultly disable
interrupt remapping feature when BIOS is not mature.Though BIOS disable interrupt remapping but intr_remapping_supported function will always report to OS support interrupt remapping if VT-d2 chipset populated. On this cases, kernel will continue enable interrupt remapping and result kernel panic.
This bug exist on almost all platforms with interrupt remapping support.

Quoted 6 lines

This patch add DMAR table INTR_REMAP flag check before enable interrup remapping

---

thanks, Youquan!

Quoted 45 lines
drivers/pci/dmar.c +10 -0
index a8a4383..d943e95 100644
@@ -1302,3 +1302,13 @@ int dmar_reenable_qi(struct intel_iommu *iommu)
 
 	return 0;
 }
+
+/*
+ * Check interrupt remapping support in DMAR table description.
+ */
+int dmar_ir_support(void)
+{
+	struct acpi_table_dmar *dmar;
+	dmar = (struct acpi_table_dmar *)dmar_tbl;
+	return dmar->flags & 0x1;
+}
drivers/pci/intr_remapping.c +3 -0
index ebfa47b..ac06514 100644
@@ -611,6 +611,9 @@ int __init intr_remapping_supported(void)
 	if (disable_intremap)
 		return 0;
 
+	if (!dmar_ir_support())
+		return 0;
+
 	for_each_drhd_unit(drhd) {
 		struct intel_iommu *iommu = drhd->iommu;
 
include/linux/intel-iommu.h +2 -0
index 482dc91..4f0a72a 100644
@@ -360,4 +360,6 @@ extern void qi_flush_dev_iotlb(struct intel_iommu
 *iommu, u16 sid, u16 qdep,
 
 extern int qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu);
 
+extern int dmar_ir_support(void);
+

#endif

Acked-by on v1 1/1
#2 lore raw
In reply to Youquan Song
Quoted 11 lines · Youquan

BIOS clear DMAR table INTR_REMAP flag to disable interrupt remapping. Current kernel only check interrupt remapping(IR) flag in DRHD's extended capability register to decide interrupt remapping support or not. But IR flag will not change when BIOS disable/enable interrupt remapping.

When user disable interrupt remapping in BIOS or BIOS often defaultly disable interrupt remapping feature when BIOS is not mature.Though BIOS disable interrupt remapping but intr_remapping_supported function will always report to OS support interrupt remapping if VT-d2 chipset populated. On this cases, kernel will continue enable interrupt remapping and result kernel panic. This bug exist on almost all platforms with interrupt remapping support.

I haven't encountered this before probably because bios was turning off the interrupt-remapping support in extended capability aswell. but I do agree that this fix is needed.

Quoted 5 lines

This patch add DMAR table INTR_REMAP flag check before enable interrup remapping

David, Can you please pick this up?

thanks.

Quoted 45 lines

---

drivers/pci/dmar.c +10 -0
index a8a4383..d943e95 100644
@@ -1302,3 +1302,13 @@ int dmar_reenable_qi(struct intel_iommu *iommu)
 
 	return 0;
 }
+
+/*
+ * Check interrupt remapping support in DMAR table description.
+ */
+int dmar_ir_support(void)
+{
+	struct acpi_table_dmar *dmar;
+	dmar = (struct acpi_table_dmar *)dmar_tbl;
+	return dmar->flags & 0x1;
+}
drivers/pci/intr_remapping.c +3 -0
index ebfa47b..ac06514 100644
@@ -611,6 +611,9 @@ int __init intr_remapping_supported(void)
 	if (disable_intremap)
 		return 0;
 
+	if (!dmar_ir_support())
+		return 0;
+
 	for_each_drhd_unit(drhd) {
 		struct intel_iommu *iommu = drhd->iommu;
 
include/linux/intel-iommu.h +2 -0
index 482dc91..4f0a72a 100644
@@ -360,4 +360,6 @@ extern void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 qdep,
 
 extern int qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu);
 
+extern int dmar_ir_support(void);
+
 #endif
#3 lore raw
Quoted 21 lines · Suresh Siddha
Quoted 11 lines · Youquan

BIOS clear DMAR table INTR_REMAP flag to disable interrupt remapping. Current kernel only check interrupt remapping(IR) flag in DRHD's extended capability register to decide interrupt remapping support or not. But IR flag will not change when BIOS disable/enable interrupt remapping.

When user disable interrupt remapping in BIOS or BIOS often defaultly disable interrupt remapping feature when BIOS is not mature.Though BIOS disable interrupt remapping but intr_remapping_supported function will always report to OS support interrupt remapping if VT-d2 chipset populated. On this cases, kernel will continue enable interrupt remapping and result kernel panic. This bug exist on almost all platforms with interrupt remapping support.

I haven't encountered this before probably because bios was turning off the interrupt-remapping support in extended capability aswell. but I do agree that this fix is needed.

Quoted 4 lines

This patch add DMAR table INTR_REMAP flag check before enable interrup remapping

Quoted 7 lines
Quoted 1 line

David, Can you please pick this up?

thanks.

David, Can you please pick this up? We want the bug fixed at 2.6.32. Thanks.

Quoted 53 lines
Quoted 40 lines

---

drivers/pci/dmar.c +10 -0
index a8a4383..d943e95 100644
@@ -1302,3 +1302,13 @@ int dmar_reenable_qi(struct intel_iommu *iommu)
 
 	return 0;
 }
+
+/*
+ * Check interrupt remapping support in DMAR table description.
+ */
+int dmar_ir_support(void)
+{
+	struct acpi_table_dmar *dmar;
+	dmar = (struct acpi_table_dmar *)dmar_tbl;
+	return dmar->flags & 0x1;
+}
drivers/pci/intr_remapping.c +3 -0
index ebfa47b..ac06514 100644
@@ -611,6 +611,9 @@ int __init intr_remapping_supported(void)
 	if (disable_intremap)
 		return 0;
 
+	if (!dmar_ir_support())
+		return 0;
+
 	for_each_drhd_unit(drhd) {
 		struct intel_iommu *iommu = drhd->iommu;
 
include/linux/intel-iommu.h +0 -0
index 482dc91..4f0a72a 100644

include/linux/intel-iommu.h extern void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 qdep, · line 365

Quoted 6 lines
include/linux/intel-iommu.h +2 -0
@@ -360,4 +360,6 @@ extern void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 qdep,
 
 extern int qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu);
 
+extern int dmar_ir_support(void);
+
 #endif

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

#4 lore raw
Quoted 3 lines · Youquan,Song

David, Can you please pick this up? We want the bug fixed at 2.6.32. Thanks.

It's in my tree and in linux-next; will go to Linus shortly. I'm just doing some final testing -- and having just merged the integer overflow fixes that Ben pointed out, I think I may leave it another day or so before I ask Linus to pull.

Signature · 2 lines
David Woodhouse                            Open Source Technology Centre
[email protected]                              Intel Corporation
#5 lore raw
Quoted 9 lines · David Woodhouse
Quoted 3 lines · Youquan,Song

David, Can you please pick this up? We want the bug fixed at 2.6.32. Thanks.

It's in my tree and in linux-next; will go to Linus shortly. I'm just doing some final testing -- and having just merged the integer overflow fixes that Ben pointed out, I think I may leave it another day or so before I ask Linus to pull.

Fine. thanks. sorry for the noise.

#6 lore raw
Quoted 6 lines · Youquan,Song
Quoted 5 lines · David Woodhouse
Quoted 3 lines · Youquan,Song

David, Can you please pick this up? We want the bug fixed at 2.6.32. Thanks.

Quoted 6 lines
Quoted 4 lines

It's in my tree and in linux-next; will go to Linus shortly. I'm just doing some final testing -- and having just merged the integer overflow fixes that Ben pointed out, I think I may leave it another day or so before I ask Linus to pull.

Fine. thanks. sorry for the noise.

No problem. It's helpful for you to remind me, sometimes -- it's much better for you to ask and for me to tell you that it's already merged, than for you _not_ to ask and then it misses the merge window.

Signature · 2 lines
David Woodhouse                            Open Source Technology Centre
[email protected]                              Intel Corporation