Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8199ed0e authored by Mario Smarduch's avatar Mario Smarduch Committed by Christoffer Dall
Browse files

KVM: arm64: ARMv8 header changes for page logging 



This patch adds arm64 helpers to write protect pmds/ptes and retrieve
permissions while logging dirty pages. Also adds prototype to write protect
a memory slot and adds a pmd define to check for read-only pmds.

Reviewed-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarMario Smarduch <m.smarduch@samsung.com>
parent 15a49a44

arch/arm64/include/asm/kvm_asm.h

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ extern char __kvm_hyp_vector[]; 


extern void __kvm_flush_vm_context(void);

extern void __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa);

extern void __kvm_tlb_flush_vmid(struct kvm *kvm);



extern int __kvm_vcpu_run(struct kvm_vcpu *vcpu);

arch/arm64/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ struct kvm_vcpu * __percpu *kvm_get_running_vcpus(void); 


u64 kvm_call_hyp(void *hypfn, ...);

void force_vm_exit(const cpumask_t *mask);

void kvm_mmu_wp_memory_region(struct kvm *kvm, int slot);



int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *run,

		int exception_index);

arch/arm64/include/asm/kvm_mmu.h

+21 −0
Original line number Diff line number Diff line
@@ -118,6 +118,27 @@ static inline void kvm_set_s2pmd_writable(pmd_t *pmd) 
	pmd_val(*pmd) |= PMD_S2_RDWR;

}



static inline void kvm_set_s2pte_readonly(pte_t *pte)

{

	pte_val(*pte) = (pte_val(*pte) & ~PTE_S2_RDWR) | PTE_S2_RDONLY;

}



static inline bool kvm_s2pte_readonly(pte_t *pte)

{

	return (pte_val(*pte) & PTE_S2_RDWR) == PTE_S2_RDONLY;

}



static inline void kvm_set_s2pmd_readonly(pmd_t *pmd)

{

	pmd_val(*pmd) = (pmd_val(*pmd) & ~PMD_S2_RDWR) | PMD_S2_RDONLY;

}



static inline bool kvm_s2pmd_readonly(pmd_t *pmd)

{

	return (pmd_val(*pmd) & PMD_S2_RDWR) == PMD_S2_RDONLY;

}





#define kvm_pgd_addr_end(addr, end)	pgd_addr_end(addr, end)

#define kvm_pud_addr_end(addr, end)	pud_addr_end(addr, end)

#define kvm_pmd_addr_end(addr, end)	pmd_addr_end(addr, end)

arch/arm64/include/asm/pgtable-hwdef.h

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ 
#define PTE_S2_RDONLY		(_AT(pteval_t, 1) << 6)   /* HAP[2:1] */

#define PTE_S2_RDWR		(_AT(pteval_t, 3) << 6)   /* HAP[2:1] */



#define PMD_S2_RDONLY		(_AT(pmdval_t, 1) << 6)   /* HAP[2:1] */

#define PMD_S2_RDWR		(_AT(pmdval_t, 3) << 6)   /* HAP[2:1] */



/*