diff options
| author | Marc Zyngier | 2021-08-20 12:23:15 +0100 |
|---|---|---|
| committer | Marc Zyngier | 2021-08-20 12:23:15 +0100 |
| commit | deb151a58210d8dfb1a7cc1f14fec35b520c38a6 (patch) | |
| tree | 7cb32e5af5d49ec5e90022c88e0497627f8b614f /arch/arm64/kvm/mmu.c | |
| parent | ca3385a507ad918fb8b7a6a52ad3d321601a66f2 (diff) | |
| parent | cf364e08ea1c5dd217afb658d510aaef7d0cc6f4 (diff) | |
Merge branch kvm-arm64/mmu/vmid-cleanups into kvmarm-master/next
* kvm-arm64/mmu/vmid-cleanups:
: Cleanup the stage-2 configuration by providing a single helper,
: and tidy up some of the ordering requirements for the VMID
: allocator.
KVM: arm64: Upgrade VMID accesses to {READ,WRITE}_ONCE
KVM: arm64: Unify stage-2 programming behind __load_stage2()
KVM: arm64: Move kern_hyp_va() usage in __load_guest_stage2() into the callers
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/mmu.c')
| -rw-r--r-- | arch/arm64/kvm/mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 3f0aabb3a1e4..862bc534e295 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -532,7 +532,7 @@ int kvm_init_stage2_mmu(struct kvm *kvm, struct kvm_s2_mmu *mmu) mmu->arch = &kvm->arch; mmu->pgt = pgt; mmu->pgd_phys = __pa(pgt->pgd); - mmu->vmid.vmid_gen = 0; + WRITE_ONCE(mmu->vmid.vmid_gen, 0); return 0; out_destroy_pgtable: |