From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
To: Avi Kivity <avi@redhat.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>,
LKML <linux-kernel@vger.kernel.org>, KVM <kvm@vger.kernel.org>
Subject: [PATCH 6/8] KVM: simply wakup async pf
Date: Wed, 27 Oct 2010 17:07:32 +0800 [thread overview]
Message-ID: <4CC7EBD4.6070105@cn.fujitsu.com> (raw)
In-Reply-To: <4CC7EA7D.5020901@cn.fujitsu.com>
The current way is queued a complete async pf with:
asyc_pf.page = bad_page
async_pf.arch.gfn = 0
It has two problems while kvm_check_async_pf_completion handle this
async_pf:
- since !async_pf.page, it can retry a pseudo #PF
- it can delete gfn 0 from vcpu->arch.apf.gfns[]
Actually, we can simply record this wakeup request and let
kvm_check_async_pf_completion simply break the wait
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
---
include/linux/kvm_host.h | 1 +
virt/kvm/async_pf.c | 21 ++++++---------------
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 0c1b7c5..d91add9 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -131,6 +131,7 @@ struct kvm_vcpu {
struct list_head queue;
struct list_head done;
spinlock_t lock;
+ bool wakeup;
} async_pf;
#endif
diff --git a/virt/kvm/async_pf.c b/virt/kvm/async_pf.c
index 5307a32..0d1f6c4 100644
--- a/virt/kvm/async_pf.c
+++ b/virt/kvm/async_pf.c
@@ -124,6 +124,11 @@ bool kvm_check_async_pf_completion(struct kvm_vcpu *vcpu)
{
struct kvm_async_pf *work;
+ if (vcpu->async_pf.wakeup) {
+ vcpu->async_pf.wakeup = false;
+ return true;
+ }
+
if (list_empty_careful(&vcpu->async_pf.done) ||
!kvm_arch_can_inject_async_page_present(vcpu))
return false;
@@ -197,20 +202,6 @@ retry_sync:
int kvm_async_pf_wakeup_all(struct kvm_vcpu *vcpu)
{
- struct kvm_async_pf *work;
-
- if (!list_empty(&vcpu->async_pf.done))
- return 0;
-
- work = kmem_cache_zalloc(async_pf_cache, GFP_ATOMIC);
- if (!work)
- return -ENOMEM;
-
- work->page = bad_page;
- get_page(bad_page);
- INIT_LIST_HEAD(&work->queue); /* for list_del to work */
-
- list_add_tail(&work->link, &vcpu->async_pf.done);
- vcpu->async_pf.queued++;
+ vcpu->async_pf.wakeup = true;
return 0;
}
--
1.7.0.4
next prev parent reply other threads:[~2010-10-27 9:03 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-27 9:01 [PATCH 1/8] KVM: fix tracing kvm_try_async_get_page Xiao Guangrong
2010-10-27 9:02 ` [PATCH 2/8] KVM: cleanup aysnc_pf tracepoints Xiao Guangrong
2010-10-27 10:10 ` Gleb Natapov
2010-10-27 9:03 ` [PATCH 3/8] KVM: fix searching async gfn in kvm_async_pf_gfn_slot Xiao Guangrong
2010-10-27 10:29 ` Gleb Natapov
2010-10-27 9:04 ` [PATCH 4/8] KVM: avoid unnecessary wait for a async pf Xiao Guangrong
2010-10-27 10:42 ` Gleb Natapov
2010-10-28 7:06 ` Xiao Guangrong
2010-10-27 9:05 ` [PATCH 5/8] KVM: don't touch vcpu stat after async pf is complete Xiao Guangrong
2010-10-27 10:44 ` Gleb Natapov
2010-10-28 7:35 ` Xiao Guangrong
2010-10-28 7:41 ` Gleb Natapov
2010-10-27 9:07 ` Xiao Guangrong [this message]
2010-10-27 10:50 ` [PATCH 6/8] KVM: simply wakup async pf Gleb Natapov
2010-10-28 7:59 ` Xiao Guangrong
2010-10-27 9:09 ` [PATCH 7/8] KVM: make async_pf work queue lockless Xiao Guangrong
2010-10-27 11:41 ` Gleb Natapov
2010-10-28 9:08 ` Xiao Guangrong
2010-10-28 9:14 ` Gleb Natapov
2010-10-27 9:10 ` [PATCH 8/8] KVM: add debugfs file to show the number of async pf Xiao Guangrong
2010-10-27 10:58 ` Gleb Natapov
2010-10-28 9:09 ` Xiao Guangrong
2010-10-27 9:59 ` [PATCH 1/8] KVM: fix tracing kvm_try_async_get_page Gleb Natapov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4CC7EBD4.6070105@cn.fujitsu.com \
--to=xiaoguangrong@cn.fujitsu.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mtosatti@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox