Skip to contentSkip to conversation

iommu/amd: Initialize device table after dma_ops

PATCH Applied Shuah Khan 3 participants 4 messages Feb 28, 2013 – Mar 17, 2013

Subsystems (2)
lore
Share & tools
lore

Shuah Khan

author
#0 lore raw

PATCH 1/1 iommu/amd: Initialize device table after dma_ops

When dma_ops are initialized the unity mappings are created. The init_device_table_dma() function makes sure DMA from all devices is blocked by default. This opens a short window in time where DMA to unity mapped regions is blocked by the IOMMU. Make sure this does not happen by initializing the device table after dma_ops.

Back-port upstream commit: f528d980c17b8714aedc918ba86e058af914d66b Tested on 3.2.38

---
 drivers/iommu/amd_iommu_init.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/iommu/amd_iommu_init.c +7 -3
index 62a4d5c..b7d1cdd 100644
@@ -1396,6 +1396,7 @@ static struct syscore_ops amd_iommu_syscore_ops = {
  */
 static int __init amd_iommu_init(void)
 {
+	struct amd_iommu *iommu;
 	int i, ret = 0;
 
 	/*
@@ -1444,9 +1445,6 @@ static int __init amd_iommu_init(void)
 	if (amd_iommu_pd_alloc_bitmap == NULL)
 		goto free;
 
-	/* init the device table */
-	init_device_table();
-
 	/*
 	 * let all alias entries point to itself
 	 */
@@ -1496,6 +1494,12 @@ static int __init amd_iommu_init(void)
 	if (ret)
 		goto free_disable;
 
+	/* init the device table */
+	init_device_table();
+
+	for_each_iommu(iommu)
+		iommu_flush_all_caches(iommu);
+
 	amd_iommu_init_api();
 
 	amd_iommu_init_notifier();
Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 6 lines · Shuah Khan

When dma_ops are initialized the unity mappings are created. The init_device_table_dma() function makes sure DMA from all devices is blocked by default. This opens a short window in time where DMA to unity mapped regions is blocked by the IOMMU. Make sure this does not happen by initializing the device table after dma_ops.

Quoted 6 lines

Back-port upstream commit: f528d980c17b8714aedc918ba86e058af914d66b Tested on 3.2.38

I'm not convinced about this backport, because the order of initialisation already changed a lot after 3.2 and before the upstream commit. So I'm going to wait for Joerg to confirm that this makes sense before adding it to the patch queue.

Ben.

Quoted 39 lines
---
 drivers/iommu/amd_iommu_init.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/iommu/amd_iommu_init.c +7 -3
index 62a4d5c..b7d1cdd 100644
@@ -1396,6 +1396,7 @@ static struct syscore_ops amd_iommu_syscore_ops = {
  */
 static int __init amd_iommu_init(void)
 {
+	struct amd_iommu *iommu;
 	int i, ret = 0;
 
 	/*
@@ -1444,9 +1445,6 @@ static int __init amd_iommu_init(void)
 	if (amd_iommu_pd_alloc_bitmap == NULL)
 		goto free;
 
-	/* init the device table */
-	init_device_table();
-
 	/*
 	 * let all alias entries point to itself
 	 */
@@ -1496,6 +1494,12 @@ static int __init amd_iommu_init(void)
 	if (ret)
 		goto free_disable;
 
+	/* init the device table */
+	init_device_table();
+
+	for_each_iommu(iommu)
+		iommu_flush_all_caches(iommu);
+
 	amd_iommu_init_api();
 
 	amd_iommu_init_notifier();
Signature · 2 lines
Ben Hutchings
Computers are not intelligent.	They only think they are.
maintainer
#2 lore raw

Hi Ben,

Quoted 4 lines · Ben Hutchings

I'm not convinced about this backport, because the order of initialisation already changed a lot after 3.2 and before the upstream commit. So I'm going to wait for Joerg to confirm that this makes sense before adding it to the patch queue.

The patch looks good, it fixes a race condition during amd_iommu initialization. I'll also gave the backport a test to be sure it doesn't break anything.

Thanks,

Joerg

#3 lore raw
Quoted 11 lines · Joerg Roedel

Hi Ben,

Quoted 4 lines · Ben Hutchings

I'm not convinced about this backport, because the order of initialisation already changed a lot after 3.2 and before the upstream commit. So I'm going to wait for Joerg to confirm that this makes sense before adding it to the patch queue.

The patch looks good, it fixes a race condition during amd_iommu initialization. I'll also gave the backport a test to be sure it doesn't break anything.

Applied, thanks all.

Ben.

Signature · 3 lines
Ben Hutchings
Usenet is essentially a HUGE group of people passing notes in class.
                      - Rachel Kadel, `A Quick Guide to Newsgroup Etiquette'