When mmu notifiers merges a page, make sure the new guest page table
entry uses the stage2 format.
Signed-off-by: Christoffer Dall <c.dall@xxxxxxxxxxxxxxxxxxxxxx>
---
arch/arm/kvm/mmu.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index 033d4f1..53d1dc5 100644
--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -933,11 +933,13 @@ static void kvm_set_spte_handler(struct kvm *kvm, unsigned long hva,
void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte)
{
int found;
+ pte_t stage2_pte;
if (!kvm->arch.pgd)
return;
- found = handle_hva_to_gpa(kvm, hva, &kvm_set_spte_handler, &pte);
+ stage2_pte = pfn_pte(pte_pfn(pte), PAGE_KVM_GUEST);
+ found = handle_hva_to_gpa(kvm, hva, &kvm_set_spte_handler, &stage2_pte);
if (found > 0)
__kvm_tlb_flush_vmid(kvm);
}
--
1.7.9.5
_______________________________________________
kvmarm mailing list
kvmarm@xxxxxxxxxxxxxxxxxxxxx
https://lists.cs.columbia.edu/cucslists/listinfo/kvmarm
