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

Commit 98fda169 authored by Radim Krčmář's avatar Radim Krčmář Committed by Paolo Bonzini
Browse files

kvm: remove .done from struct kvm_async_pf 



'.done' is used to mark the completion of 'async_pf_execute()', but
'cancel_work_sync()' returns true when the work was canceled, so we
use it instead.

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 519192aa

include/linux/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ struct kvm_async_pf { 
	unsigned long addr;

	struct kvm_arch_async_pf arch;

	struct page *page;

	bool done;

};



void kvm_clear_async_pf_completion_queue(struct kvm_vcpu *vcpu);

virt/kvm/async_pf.c

+1 −4
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ static void async_pf_execute(struct work_struct *work) 
	spin_lock(&vcpu->async_pf.lock);

	list_add_tail(&apf->link, &vcpu->async_pf.done);

	apf->page = page;

	apf->done = true;

	spin_unlock(&vcpu->async_pf.lock);



	/*
@@ -99,9 +98,8 @@ void kvm_clear_async_pf_completion_queue(struct kvm_vcpu *vcpu) 
		struct kvm_async_pf *work =

			list_entry(vcpu->async_pf.queue.next,

				   typeof(*work), queue);

		cancel_work_sync(&work->work);

		list_del(&work->queue);

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

		if (cancel_work_sync(&work->work)) {

			mmdrop(work->mm);

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

			kmem_cache_free(async_pf_cache, work);
@@ -166,7 +164,6 @@ int kvm_setup_async_pf(struct kvm_vcpu *vcpu, gva_t gva, gfn_t gfn, 
		return 0;



	work->page = NULL;

	work->done = false;

	work->vcpu = vcpu;

	work->gva = gva;

	work->addr = gfn_to_hva(vcpu->kvm, gfn);