MIPS: kvm: Use vm_get_page_prot to get protection bits
authorThomas Bogendoerfer <tsbogend@alpha.franken.de>
Fri, 13 Nov 2020 11:09:50 +0000 (12:09 +0100)
committerThomas Bogendoerfer <tsbogend@alpha.franken.de>
Thu, 19 Nov 2020 12:26:53 +0000 (13:26 +0100)
MIPS protection bits are setup during runtime so using defines like
PAGE_SHARED ignores this runtime changes. Using vm_get_page_prot
to get correct page protection fixes this.

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
arch/mips/kvm/mmu.c

index 28c366d..3dabeda 100644 (file)
@@ -1074,6 +1074,7 @@ int kvm_mips_handle_commpage_tlb_fault(unsigned long badvaddr,
 {
        kvm_pfn_t pfn;
        pte_t *ptep;
+       pgprot_t prot;
 
        ptep = kvm_trap_emul_pte_for_gva(vcpu, badvaddr);
        if (!ptep) {
@@ -1083,7 +1084,8 @@ int kvm_mips_handle_commpage_tlb_fault(unsigned long badvaddr,
 
        pfn = PFN_DOWN(virt_to_phys(vcpu->arch.kseg0_commpage));
        /* Also set valid and dirty, so refill handler doesn't have to */
-       *ptep = pte_mkyoung(pte_mkdirty(pfn_pte(pfn, PAGE_SHARED)));
+       prot = vm_get_page_prot(VM_READ|VM_WRITE|VM_SHARED);
+       *ptep = pte_mkyoung(pte_mkdirty(pfn_pte(pfn, prot)));
 
        /* Invalidate this entry in the TLB, guest kernel ASID only */
        kvm_mips_host_tlb_inv(vcpu, badvaddr, false, true);