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

Dmytro Maluka · cxdong · commit 13ca91641cc3 · 2026-01-05T13:08:06.000+08:00
Fixes: 1bcae0c ("pKVM: x86: Add MMIO donation from hyp to host") Signed-off-by: Dmytro Maluka <dmaluka@google.com>
diff --git a/arch/x86/kvm/pkvm/mmu.c b/arch/x86/kvm/pkvm/mmu.c
@@ -607,8 +607,7 @@ void pkvm_hyp_donate_host(unsigned long phys, unsigned long size, bool clear)
  */
 int pkvm_hyp_donate_host_mmio_locked(unsigned long phys, unsigned long size)
 {
-	u64 prot = host_mmu.pgt_ops->calc_pte_perm(true, true, true) |
-		   host_mmu.pgt_ops->calc_pte_memtype(true) |
+	u64 prot = host_mmu_pte_prot(true) |
 		   host_mmu.pgt_ops->pte_mk_pgstate(PKVM_PAGE_OWNED);
 	int ret;
 

Original file line number	Diff line number	Diff line change
`@@ -607,8 +607,7 @@ void pkvm_hyp_donate_host(unsigned long phys, unsigned long size, bool clear)`
`607`	`607`	`*/`
`608`	`608`	`int pkvm_hyp_donate_host_mmio_locked(unsigned long phys, unsigned long size)`
`609`	`609`	`{`
`610`		`- u64 prot = host_mmu.pgt_ops->calc_pte_perm(true, true, true) \|`
`611`		`- host_mmu.pgt_ops->calc_pte_memtype(true) \|`
	`610`	`+ u64 prot = host_mmu_pte_prot(true) \|`
`612`	`611`	`host_mmu.pgt_ops->pte_mk_pgstate(PKVM_PAGE_OWNED);`
`613`	`612`	`int ret;`
`614`	`613`