diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2013-09-04 22:32:23 +0200 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2013-09-17 12:53:15 +0300 |
| commit | 28b441e24088081c1e213139d1303b451a34a4f4 (patch) | |
| tree | b5f1b975ed8b5dafa126bd58092677cc273171a1 /virt/kvm | |
| parent | 72f857950f6f19cba42a9ded078bbc99f10aa667 (diff) | |
| download | linux-stable-28b441e24088081c1e213139d1303b451a34a4f4.tar.gz linux-stable-28b441e24088081c1e213139d1303b451a34a4f4.tar.bz2 linux-stable-28b441e24088081c1e213139d1303b451a34a4f4.zip | |
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: Radim Krčmář <rkrcmar@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'virt/kvm')
| -rw-r--r-- | virt/kvm/async_pf.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/virt/kvm/async_pf.c b/virt/kvm/async_pf.c index ea475cd03511..8a39dda7a325 100644 --- a/virt/kvm/async_pf.c +++ b/virt/kvm/async_pf.c @@ -101,8 +101,11 @@ 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); |