vtd: dmar_uint->root_table_addr should be hpa

JasonChenCJ · jren1 · commit 403076e6b95d · 2018-05-15T17:25:27.000+08:00
add necessary HPA2HVA/HVA2HPA transition for root_table_addr

Signed-off-by: Jason Chen CJ &lt;jason.cj.chen@intel.com&gt;
Acked-by: Tian, Kevin &lt;kevin.tian@intel.com&gt;
Acked-by: Xu, Anthony &lt;anthony.xu@intel.com&gt;
diff --git a/hypervisor/arch/x86/vtd.c b/hypervisor/arch/x86/vtd.c
@@ -965,14 +965,10 @@ static int add_iommu_device(struct iommu_domain *domain, uint16_t segment,
 	}
 
 	if (dmar_uint->root_table_addr == 0) {
-		/* 1:1 mapping for hypervisor HEAP,
-		 * physical address equals virtual address
-		 */
-		dmar_uint->root_table_addr =
-			(uint64_t)alloc_paging_struct();
+		dmar_uint->root_table_addr = HVA2HPA(alloc_paging_struct());
 	}
 
-	root_table = (uint64_t *)dmar_uint->root_table_addr;
+	root_table = (uint64_t *)HPA2HVA(dmar_uint->root_table_addr);
 
 	root_entry = (struct dmar_root_entry *)&root_table[bus * 2];
 
@@ -1071,7 +1067,7 @@ remove_iommu_device(struct iommu_domain *domain, uint16_t segment,
 		return 1;
 	}
 
-	root_table = (uint64_t *)dmar_uint->root_table_addr;
+	root_table = (uint64_t *)HPA2HVA(dmar_uint->root_table_addr);
 	root_entry = (struct dmar_root_entry *)&root_table[bus * 2];
 
 	context_table_addr = DMAR_GET_BITSLICE(root_entry->lower,

Original file line number	Diff line number	Diff line change
`@@ -965,14 +965,10 @@ static int add_iommu_device(struct iommu_domain *domain, uint16_t segment,`
`965`	`965`	`}`
`966`	`966`
`967`	`967`	`if (dmar_uint->root_table_addr == 0) {`
`968`		`- /* 1:1 mapping for hypervisor HEAP,`
`969`		`- * physical address equals virtual address`
`970`		`- */`
`971`		`- dmar_uint->root_table_addr =`
`972`		`- (uint64_t)alloc_paging_struct();`
	`968`	`+ dmar_uint->root_table_addr = HVA2HPA(alloc_paging_struct());`
`973`	`969`	`}`
`974`	`970`
`975`		`- root_table = (uint64_t *)dmar_uint->root_table_addr;`
	`971`	`+ root_table = (uint64_t *)HPA2HVA(dmar_uint->root_table_addr);`
`976`	`972`
`977`	`973`	`root_entry = (struct dmar_root_entry )&root_table[bus 2];`
`978`	`974`
`@@ -1071,7 +1067,7 @@ remove_iommu_device(struct iommu_domain *domain, uint16_t segment,`
`1071`	`1067`	`return 1;`
`1072`	`1068`	`}`
`1073`	`1069`
`1074`		`- root_table = (uint64_t *)dmar_uint->root_table_addr;`
	`1070`	`+ root_table = (uint64_t *)HPA2HVA(dmar_uint->root_table_addr);`
`1075`	`1071`	`root_entry = (struct dmar_root_entry )&root_table[bus 2];`
`1076`	`1072`
`1077`	`1073`	`context_table_addr = DMAR_GET_BITSLICE(root_entry->lower,`