diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2020-10-21 18:05:58 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-10-21 18:05:58 -0400 |
| commit | c0623f5e5d21d65d08f6276ca4e64d470c833761 (patch) | |
| tree | 5bc1f615341a08b0d2bd9af5a893ae65f8499f05 /arch/arm64 | |
| parent | KVM: PPC: Book3S HV: Make struct kernel_param_ops definition const (diff) | |
| parent | Merge tag 'kvmarm-fixes-5.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master (diff) | |
| download | linux-dev-c0623f5e5d21d65d08f6276ca4e64d470c833761.tar.xz linux-dev-c0623f5e5d21d65d08f6276ca4e64d470c833761.zip | |
Merge branch 'kvm-fixes' into 'next'
Pick up bugfixes from 5.9, otherwise various tests fail.
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/kvm/hyp/nvhe/tlb.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm64/kvm/hyp/nvhe/tlb.c b/arch/arm64/kvm/hyp/nvhe/tlb.c index 544bca3072b7..39ca71ab8866 100644 --- a/arch/arm64/kvm/hyp/nvhe/tlb.c +++ b/arch/arm64/kvm/hyp/nvhe/tlb.c @@ -31,7 +31,14 @@ static void __tlb_switch_to_guest(struct kvm_s2_mmu *mmu, isb(); } + /* + * __load_guest_stage2() includes an ISB only when the AT + * workaround is applied. Take care of the opposite condition, + * ensuring that we always have an ISB, but not two ISBs back + * to back. + */ __load_guest_stage2(mmu); + asm(ALTERNATIVE("isb", "nop", ARM64_WORKAROUND_SPECULATIVE_AT)); } static void __tlb_switch_to_host(struct tlb_inv_context *cxt) |