Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28b441e2 authored by Radim Krčmář's avatar Radim Krčmář Committed by Gleb Natapov
Browse files

kvm: free resources after canceling async_pf 



When we cancel 'async_pf_execute()', we should behave as if the work was
never scheduled in 'kvm_setup_async_pf()'.
Fixes a bug when we can't unload module because the vm wasn't destroyed.

Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 72f85795

virt/kvm/async_pf.c

+4 −1
Original line number Diff line number Diff line
@@ -101,9 +101,12 @@ void kvm_clear_async_pf_completion_queue(struct kvm_vcpu *vcpu) 
				   typeof(*work), queue);

		cancel_work_sync(&work->work);

		list_del(&work->queue);

		if (!work->done) /* work was canceled */

		if (!work->done) { /* work was canceled */

			mmdrop(work->mm);

			kvm_put_kvm(vcpu->kvm); /* == work->vcpu->kvm */

			kmem_cache_free(async_pf_cache, work);

		}

	}



	spin_lock(&vcpu->async_pf.lock);

	while (!list_empty(&vcpu->async_pf.done)) {