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

Commit 88dc25e8 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm/arm64: Consolidate page-table accessors 



The arm and arm64 KVM page tables accessors are pointlessly different
between the two architectures, and likely both wrong one way or another:
arm64 lacks a dsb(), and arm doesn't use WRITE_ONCE.

Let's unify them.

Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarChristoffer Dall <christoffer.dall@arm.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 2f6ea23f

arch/arm/include/asm/kvm_mmu.h

+0 −12
Original line number Original line Diff line number Diff line
@@ -75,18 +75,6 @@ phys_addr_t kvm_get_idmap_vector(void); 
int kvm_mmu_init(void);

int kvm_mmu_init(void);

void kvm_clear_hyp_idmap(void);

void kvm_clear_hyp_idmap(void);





static inline void kvm_set_pmd(pmd_t *pmd, pmd_t new_pmd)

{

	*pmd = new_pmd;

	dsb(ishst);

}



static inline void kvm_set_pte(pte_t *pte, pte_t new_pte)

{

	*pte = new_pte;

	dsb(ishst);

}



static inline pte_t kvm_s2pte_mkwrite(pte_t pte)

static inline pte_t kvm_s2pte_mkwrite(pte_t pte)

{

{

	pte_val(pte) |= L_PTE_S2_RDWR;

	pte_val(pte) |= L_PTE_S2_RDWR;

arch/arm64/include/asm/kvm_mmu.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -169,9 +169,6 @@ phys_addr_t kvm_get_idmap_vector(void); 
int kvm_mmu_init(void);

int kvm_mmu_init(void);

void kvm_clear_hyp_idmap(void);

void kvm_clear_hyp_idmap(void);





#define	kvm_set_pte(ptep, pte)		set_pte(ptep, pte)

#define	kvm_set_pmd(pmdp, pmd)		set_pmd(pmdp, pmd)



static inline pte_t kvm_s2pte_mkwrite(pte_t pte)

static inline pte_t kvm_s2pte_mkwrite(pte_t pte)

{

{

	pte_val(pte) |= PTE_S2_RDWR;

	pte_val(pte) |= PTE_S2_RDWR;

virt/kvm/arm/mmu.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -177,6 +177,18 @@ static void clear_stage2_pmd_entry(struct kvm *kvm, pmd_t *pmd, phys_addr_t addr 
	put_page(virt_to_page(pmd));

	put_page(virt_to_page(pmd));

}

}





static inline void kvm_set_pte(pte_t *ptep, pte_t new_pte)

{

	WRITE_ONCE(*ptep, new_pte);

	dsb(ishst);

}



static inline void kvm_set_pmd(pmd_t *pmdp, pmd_t new_pmd)

{

	WRITE_ONCE(*pmdp, new_pmd);

	dsb(ishst);

}



/*

/*

 * Unmapping vs dcache management:

 * Unmapping vs dcache management:

 *

 *