Skip to content

Commit bcf3e7d

Browse files
author
Marc Zyngier
committed
KVM: arm64: vhe: Drop extra isb() on guest exit
__kvm_vcpu_run_vhe() end on VHE with an isb(). However, this function is only reachable via kvm_call_hyp_ret(), which already contains an isb() in order to mimick the behaviour of nVHE and provide a context synchronisation event. We thus have two isb()s back to back, which is one too many. Drop the first one and solely rely on the one in the helper. Signed-off-by: Marc Zyngier <maz@kernel.org> Reviewed-by: Oliver Upton <oliver.upton@linux.dev>
1 parent 1ff2755 commit bcf3e7d

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

arch/arm64/kvm/hyp/vhe/switch.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,11 +227,10 @@ int __kvm_vcpu_run(struct kvm_vcpu *vcpu)
227227

228228
/*
229229
* When we exit from the guest we change a number of CPU configuration
230-
* parameters, such as traps. Make sure these changes take effect
231-
* before running the host or additional guests.
230+
* parameters, such as traps. We rely on the isb() in kvm_call_hyp*()
231+
* to make sure these changes take effect before running the host or
232+
* additional guests.
232233
*/
233-
isb();
234-
235234
return ret;
236235
}
237236

0 commit comments

Comments
 (0)