summaryrefslogtreecommitdiffstats
path: root/virt/kvm
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2018-05-25 12:23:11 +0100
committerMarc Zyngier <marc.zyngier@arm.com>2018-07-09 11:37:42 +0100
commit88dc25e8ea7c968bbf76d033431e2d7e1418bcd7 (patch)
tree78581102d167da491f21f0110666a050d696b473 /virt/kvm
parent2f6ea23f63cca99cd514c221f075c986b57c927e (diff)
downloadlinux-stable-88dc25e8ea7c968bbf76d033431e2d7e1418bcd7.tar.gz
linux-stable-88dc25e8ea7c968bbf76d033431e2d7e1418bcd7.tar.bz2
linux-stable-88dc25e8ea7c968bbf76d033431e2d7e1418bcd7.zip
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: Mark Rutland <mark.rutland@arm.com> Acked-by: Christoffer Dall <christoffer.dall@arm.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'virt/kvm')
-rw-r--r--virt/kvm/arm/mmu.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/virt/kvm/arm/mmu.c b/virt/kvm/arm/mmu.c
index ea7314296ad1..a6bdbed1903a 100644
--- a/virt/kvm/arm/mmu.c
+++ b/virt/kvm/arm/mmu.c
@@ -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));
}
+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:
*