KVM: s390: pv: simplify shutdown and fix race
Claudio Imbrenda
maintainerPATCH 1/1 KVM: s390: pv: simplify shutdown and fix race
Simplify the shutdown of non-protected VMs. There is no need to do complex manipulations of the counter if it was zero.
This also fixes a very rare race which caused pages to be torn down from the address space with a non-zero counter even on older machines that don't support the UVC instruction, causing a crash.
Reported-by Marc Hartmayer <[email protected]>
Fixes fb491d5500a7 ("KVM: s390: pv: asynchronous destroy for reboot")
Signed-off-by Claudio Imbrenda <[email protected]>
--- arch/s390/kvm/pv.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/s390/kvm/pv.c +6 -2
@@ -411,8 +411,12 @@ int kvm_s390_pv_deinit_cleanup_all(struct kvm *kvm, u16 *rc, u16 *rrc)u16 _rc, _rrc;int cc =0 ; -/* Make sure the counter does not reach 0 before calling s390_uv_destroy_range */ -atomic_inc (&kvm->mm->context.protected_count); +/* +* Nothing to do if the counter was already 0. Otherwise make sure +* the counter does not reach 0 before calling s390_uv_destroy_range. +*/ +if (!atomic_inc_not_zero (&kvm->mm->context.protected_count)) +return 0 ; *rc =1 ;/* If the current VM is protected, destroy it */
Signature · 1 line
2.41.0