SQUASHME: pKVM: x86: Use host_mmu_pte_prot() in host_mmu_map()

Dmytro Maluka · cxdong · commit 27135321e212 · 2026-01-05T13:08:06.000+08:00
Fixes: e365103 ("pKVM: x86: Remove pkvm_host_mmu_map/unmap") Signed-off-by: Dmytro Maluka <dmaluka@google.com>
diff --git a/arch/x86/kvm/pkvm/mmu.c b/arch/x86/kvm/pkvm/mmu.c
@@ -338,11 +338,9 @@ static int fix_host_mmu_pgstate(void)
 
 static int host_mmu_map(unsigned long phys, unsigned long size, bool mmio)
 {
-	u64 prot = host_mmu.pgt_ops->calc_pte_perm(true, true, true) |
-		   host_mmu.pgt_ops->calc_pte_memtype(mmio);
-
 	/* The vaddr == phys for the host MMU */
-	return pkvm_pgtable_map(&host_mmu, phys, phys, size, prot);
+	return pkvm_pgtable_map(&host_mmu, phys, phys, size,
+				host_mmu_pte_prot(mmio));
 }
 
 int pkvm_hyp_mmu_init(void *pool_base, unsigned long pool_pages)

Original file line number	Diff line number	Diff line change
`@@ -338,11 +338,9 @@ static int fix_host_mmu_pgstate(void)`
`338`	`338`
`339`	`339`	`static int host_mmu_map(unsigned long phys, unsigned long size, bool mmio)`
`340`	`340`	`{`
`341`		`- u64 prot = host_mmu.pgt_ops->calc_pte_perm(true, true, true) \|`
`342`		`- host_mmu.pgt_ops->calc_pte_memtype(mmio);`
`343`		`-`
`344`	`341`	`/* The vaddr == phys for the host MMU */`
`345`		`- return pkvm_pgtable_map(&host_mmu, phys, phys, size, prot);`
	`342`	`+ return pkvm_pgtable_map(&host_mmu, phys, phys, size,`
	`343`	`+ host_mmu_pte_prot(mmio));`
`346`	`344`	`}`
`347`	`345`
`348`	`346`	`int pkvm_hyp_mmu_init(void *pool_base, unsigned long pool_pages)`