Skip to contentSkip to conversation

iommu/vt-d: Serialize IOMMU GCMD register modifications

PATCH In review Lu Baolu 3 participants 3 messages Aug 28, 2020 – Sep 4, 2020

Subsystems (2)
lore
Share & tools
lore

Lu Baolu

author maintainer
#0 lore raw

PATCH v3 1/1 iommu/vt-d: Serialize IOMMU GCMD register modifications

The VT-d spec requires (10.4.4 Global Command Register, GCMD_REG General Description) that:

If multiple control fields in this register need to be modified, software must serialize the modifications through multiple writes to this register.

However, in irq_remapping.c, modifications of IRE and CFI are done in one write. We need to do two separate writes with STS checking after each. It also checks the status register before writing command register to avoid unnecessary register write.

Fixes af8d102f999a4 ("x86/intel/irq_remapping: Clean up x2apic opt-out security warning mess")
Cc Andy Lutomirski <[email protected]>
Cc Jacob Pan <[email protected]>
Cc Kevin Tian <[email protected]>
Cc Ashok Raj <[email protected]>
---
 drivers/iommu/intel/irq_remapping.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Change log:
v1->v2:
- v1 posted here

    https://lore.kernel.org/linux-iommu/[email protected]/
  - Add status check before disabling CFI (Kevin)
v2->v3:
  - v2 posted here
    https://lore.kernel.org/linux-iommu/[email protected]/

- Remove unnecessary register read (Kevin)

drivers/iommu/intel/irq_remapping.c +8 -2
index 9564d23d094f..a91dd997d268 100644
@@ -507,12 +507,18 @@ static void iommu_enable_irq_remapping(struct intel_iommu *iommu)
 
 	/* Enable interrupt-remapping */
 	iommu->gcmd |= DMA_GCMD_IRE;
-	iommu->gcmd &= ~DMA_GCMD_CFI;  /* Block compatibility-format MSIs */
 	writel(iommu->gcmd, iommu->reg + DMAR_GCMD_REG);
-
 	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG,
 		      readl, (sts & DMA_GSTS_IRES), sts);
 
+	/* Block compatibility-format MSIs */
+	if (sts & DMA_GSTS_CFIS) {
+		iommu->gcmd &= ~DMA_GCMD_CFI;
+		writel(iommu->gcmd, iommu->reg + DMAR_GCMD_REG);
+		IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG,
+			      readl, !(sts & DMA_GSTS_CFIS), sts);
+	}
+
 	/*
 	 * With CFI clear in the Global Command register, we should be
 	 * protected from dangerous (i.e. compatibility) interrupts
Signature · 1 line
2.17.1
Reviewed-by on v3 1/1
#1 lore raw
Quoted 67 lines

From: Lu Baolu <[email protected]>
Sent: Friday, August 28, 2020 8:06 AM

The VT-d spec requires (10.4.4 Global Command Register, GCMD_REG General
Description) that:

If multiple control fields in this register need to be modified, software must serialize the modifications through multiple writes to this register.

However, in irq_remapping.c, modifications of IRE and CFI are done in one write. We need to do two separate writes with STS checking after each. It also checks the status register before writing command register to avoid unnecessary register write.

Fixes af8d102f999a4 ("x86/intel/irq_remapping: Clean up x2apic opt-out

security warning mess")

Cc Andy Lutomirski <[email protected]>
Cc Jacob Pan <[email protected]>
Cc Kevin Tian <[email protected]>
Cc Ashok Raj <[email protected]>
---
 drivers/iommu/intel/irq_remapping.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Change log:
v1->v2:
- v1 posted here

    https://lore.kernel.org/linux-iommu/20200826025825.2322-1-

[email protected]/
- Add status check before disabling CFI (Kevin)
v2->v3:
- v2 posted here

    https://lore.kernel.org/linux-iommu/20200827042513.30292-1-

[email protected]/
- Remove unnecessary register read (Kevin)

drivers/iommu/intel/irq_remapping.c +0 -1
index 9564d23d094f..a91dd997d268 100644
@@ -507,12 +507,18 @@ static void iommu_enable_irq_remapping(struct
 intel_iommu *iommu)
 
 	/* Enable interrupt-remapping */
 	iommu->gcmd |= DMA_GCMD_IRE;
-	iommu->gcmd &= ~DMA_GCMD_CFI;  /* Block compatibility-format

MSIs */

drivers/iommu/intel/irq_remapping.c +8 -2
 	writel(iommu->gcmd, iommu->reg + DMAR_GCMD_REG);
-
 	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG,
 		      readl, (sts & DMA_GSTS_IRES), sts);
 
+	/* Block compatibility-format MSIs */
+	if (sts & DMA_GSTS_CFIS) {
+		iommu->gcmd &= ~DMA_GCMD_CFI;
+		writel(iommu->gcmd, iommu->reg + DMAR_GCMD_REG);
+		IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG,
+			      readl, !(sts & DMA_GSTS_CFIS), sts);
+	}
+
 	/*
 	 * With CFI clear in the Global Command register, we should be
 	 * protected from dangerous (i.e. compatibility) interrupts
--
Quoted 1 line

2.17.1

maintainer
#2 lore raw
In reply to Lu Baolu
Quoted 17 lines · Lu Baolu

The VT-d spec requires (10.4.4 Global Command Register, GCMD_REG General Description) that:

If multiple control fields in this register need to be modified, software must serialize the modifications through multiple writes to this register.

However, in irq_remapping.c, modifications of IRE and CFI are done in one write. We need to do two separate writes with STS checking after each. It also checks the status register before writing command register to avoid unnecessary register write.

Fixes af8d102f999a4 ("x86/intel/irq_remapping: Clean up x2apic opt-out security warning mess")
Cc Andy Lutomirski <[email protected]>
Cc Jacob Pan <[email protected]>
Cc Kevin Tian <[email protected]>
Cc Ashok Raj <[email protected]>
Quoted 3 lines
---
 drivers/iommu/intel/irq_remapping.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Applied for v5.9, thanks.