Skip to contentSkip to conversation

intel-iommu: Disable DMA Remapping when intel_iommu=off

PATCH In review Wei Hu 2 participants 5 messages Apr 20, 2013 – Apr 22, 2013 IOMMU

lore
Share & tools
lore

Wei Hu

author
#0 lore raw

PATCH 1/1 intel-iommu: Disable DMA Remapping when intel_iommu=off

On a VT-d capable machine Linux will enable IOMMU by default. If it then kexec's a second kernel with intel_iommu=off, this second kernel will leave the DMA remapping engine on with no code handling it. The symptom is at least USB and SATA drives stop working. This patch fixes the problem by always disabling DMA remapping when intel_iommu=off.

---
 drivers/iommu/intel-iommu.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
drivers/iommu/intel-iommu.c +5 -1
index 0099667..0b8f8bb 100644
@@ -3681,8 +3681,12 @@ int __init intel_iommu_init(void)
 		return 	-ENODEV;
 	}
 
-	if (no_iommu || dmar_disabled)
+	if (no_iommu || dmar_disabled) {
+		struct dmar_drhd_unit *drhd;
+		for_each_drhd_unit(drhd)
+			iommu_disable_translation(drhd->iommu);
 		return -ENODEV;
+	}
 
 	if (iommu_init_mempool()) {
 		if (force_on)
Signature · 1 line
1.7.4.4
#1 lore raw
Quoted 5 lines · Wei Hu

On a VT-d capable machine Linux will enable IOMMU by default. If it then kexec's a second kernel with intel_iommu=off, this second kernel will leave the DMA remapping engine on with no code handling it. The symptom is at least USB and SATA drives stop working. This patch fixes the problem by always disabling DMA remapping when intel_iommu=off.

Even when second kernel boots up with intel_iommu=on, dma-remapping need to be disabled as well before it is initialized and enabled again in init_dmars(). So, how about something like this?

        for_each_drhd_unit(drhd) {
                struct dmar_drhd_unit *drhd;
                if (drhd->ignored)
                        continue;

                iommu = drhd->iommu;
                if (iommu->gcmd & DMA_GCMD_TE)
                        iommu_disable_translation(iommu);
        }

Note, if you agree above code and fix your patch like this, you need additinal fix to set iommu->gcmd flag sinse gcmd is always zero here. See first hunk of this patch.
https://lkml.org/lkml/2013/3/20/707

Thanks,
Takao Indoh

Quoted 25 lines
---
  drivers/iommu/intel-iommu.c |    6 +++++-
  1 files changed, 5 insertions(+), 1 deletions(-)
drivers/iommu/intel-iommu.c +5 -1
index 0099667..0b8f8bb 100644
@@ -3681,8 +3681,12 @@ int __init intel_iommu_init(void)
  		return 	-ENODEV;
  	}
 
-	if (no_iommu || dmar_disabled)
+	if (no_iommu || dmar_disabled) {
+		struct dmar_drhd_unit *drhd;
+		for_each_drhd_unit(drhd)
+			iommu_disable_translation(drhd->iommu);
  		return -ENODEV;
+	}
 
  	if (iommu_init_mempool()) {
  		if (force_on)
author
#2 lore raw
Quoted 21 lines · Takao Indoh
Quoted 5 lines · Wei Hu

On a VT-d capable machine Linux will enable IOMMU by default. If it then kexec's a second kernel with intel_iommu=off, this second kernel will leave the DMA remapping engine on with no code handling it. The symptom is at least USB and SATA drives stop working. This patch fixes the problem by always disabling DMA remapping when intel_iommu=off.

Even when second kernel boots up with intel_iommu=on, dma-remapping need to be disabled as well before it is initialized and enabled again in init_dmars(). So, how about something like this?

        for_each_drhd_unit(drhd) {
                struct dmar_drhd_unit *drhd;
                if (drhd->ignored)
                        continue;

                iommu = drhd->iommu;
                if (iommu->gcmd & DMA_GCMD_TE)
                        iommu_disable_translation(iommu);
        }
Quoted 4 lines

Note, if you agree above code and fix your patch like this, you need additinal fix to set iommu->gcmd flag sinse gcmd is always zero here. See first hunk of this patch.
https://lkml.org/lkml/2013/3/20/707

Thanks for your reply. I reviewed your patch. Are you suggesting keeping your change to dmar.c, and moving your change to intel-iommu.c (i.e. the code you just showed) up after the call to dmar_table_init()?

#3 lore raw
Quoted 28 lines · Wei Hu
Quoted 21 lines · Takao Indoh
Quoted 5 lines · Wei Hu

On a VT-d capable machine Linux will enable IOMMU by default. If it then kexec's a second kernel with intel_iommu=off, this second kernel will leave the DMA remapping engine on with no code handling it. The symptom is at least USB and SATA drives stop working. This patch fixes the problem by always disabling DMA remapping when intel_iommu=off.

Even when second kernel boots up with intel_iommu=on, dma-remapping need to be disabled as well before it is initialized and enabled again in init_dmars(). So, how about something like this?

         for_each_drhd_unit(drhd) {
                 struct dmar_drhd_unit *drhd;
                 if (drhd->ignored)
                         continue;

                 iommu = drhd->iommu;
                 if (iommu->gcmd & DMA_GCMD_TE)
                         iommu_disable_translation(iommu);
         }
Quoted 4 lines

Note, if you agree above code and fix your patch like this, you need additinal fix to set iommu->gcmd flag sinse gcmd is always zero here. See first hunk of this patch.
https://lkml.org/lkml/2013/3/20/707

Quoted 5 lines

Thanks for your reply. I reviewed your patch. Are you suggesting keeping your change to dmar.c, and moving your change to intel-iommu.c (i.e. the code you just showed) up after the call to dmar_table_init()?

Yes, exactly.

Thanks,
Takao Indoh

author
#4 lore raw
Quoted 35 lines · Takao Indoh
Quoted 28 lines · Wei Hu
Quoted 21 lines · Takao Indoh
Quoted 5 lines · Wei Hu

On a VT-d capable machine Linux will enable IOMMU by default. If it then kexec's a second kernel with intel_iommu=off, this second kernel will leave the DMA remapping engine on with no code handling it. The symptom is at least USB and SATA drives stop working. This patch fixes the problem by always disabling DMA remapping when intel_iommu=off.

Even when second kernel boots up with intel_iommu=on, dma-remapping need to be disabled as well before it is initialized and enabled again in init_dmars(). So, how about something like this?

         for_each_drhd_unit(drhd) {
                 struct dmar_drhd_unit *drhd;
                 if (drhd->ignored)
                         continue;

                 iommu = drhd->iommu;
                 if (iommu->gcmd & DMA_GCMD_TE)
                         iommu_disable_translation(iommu);
         }
Quoted 4 lines

Note, if you agree above code and fix your patch like this, you need additinal fix to set iommu->gcmd flag sinse gcmd is always zero here. See first hunk of this patch.
https://lkml.org/lkml/2013/3/20/707

Quoted 5 lines

Thanks for your reply. I reviewed your patch. Are you suggesting keeping your change to dmar.c, and moving your change to intel-iommu.c (i.e. the code you just showed) up after the call to dmar_table_init()?

Quoted 5 lines

Yes, exactly.

Thanks,
Takao Indoh

Sounds great. If you want to make the change and get your patch accepted that's fine with me.