summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiao Guangrong <xiaoguangrong@cn.fujitsu.com>2010-11-01 17:01:28 +0800
committerAvi Kivity <avi@redhat.com>2011-01-12 11:29:00 +0200
commite6d53e3b0db7ae3641f01a2b2af1470fda86d10c (patch)
tree95b94e3caa16222379ef708ed6a073ddbc95a0a8
parentc7d28c24042f7969adc29147d6c0a190192a6808 (diff)
downloadop-kernel-dev-e6d53e3b0db7ae3641f01a2b2af1470fda86d10c.zip
op-kernel-dev-e6d53e3b0db7ae3641f01a2b2af1470fda86d10c.tar.gz
KVM: avoid unnecessary wait for a async pf
In current code, it checks async pf completion out of the wait context, like this: if (vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE && !vcpu->arch.apf.halted) r = vcpu_enter_guest(vcpu); else { ...... kvm_vcpu_block(vcpu) ^- waiting until 'async_pf.done' is not empty } kvm_check_async_pf_completion(vcpu) ^- delete list from async_pf.done So, if we check aysnc pf completion first, it can be blocked at kvm_vcpu_block Fixed by mark the vcpu is unhalted in kvm_check_async_pf_completion() path Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> Acked-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r--arch/x86/kvm/x86.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index ab10a6c..5daead8 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -6283,6 +6283,7 @@ void kvm_arch_async_page_present(struct kvm_vcpu *vcpu,
vcpu->arch.fault.address = work->arch.token;
kvm_inject_page_fault(vcpu);
}
+ vcpu->arch.apf.halted = false;
}
bool kvm_arch_can_inject_async_page_present(struct kvm_vcpu *vcpu)
OpenPOWER on IntegriCloud