[PATCH 3/8] KVM: fix searching async gfn in kvm_async_pf_gfn_slot

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Xiao Guangrong
Date: Wednesday, October 27, 2010 - 2:03 am

The 'gfn' is not recorded if the next slot is empty

Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
---
 arch/x86/kvm/x86.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 7876ec8..16f42ff 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -6207,8 +6207,8 @@ static u32 kvm_async_pf_gfn_slot(struct kvm_vcpu *vcpu, gfn_t gfn)
 	u32 key = kvm_async_pf_hash_fn(gfn);
 
 	for (i = 0; i < roundup_pow_of_two(ASYNC_PF_PER_VCPU) &&
-		     (vcpu->arch.apf.gfns[key] != gfn ||
-		      vcpu->arch.apf.gfns[key] == ~0); i++)
+		     (vcpu->arch.apf.gfns[key] != gfn &&
+		      vcpu->arch.apf.gfns[key] != ~0); i++)
 		key = kvm_async_pf_next_probe(key);
 
 	return key;
-- 
1.7.0.4

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 1/8] KVM: fix tracing kvm_try_async_get_page, Xiao Guangrong, (Wed Oct 27, 2:01 am)
[PATCH 2/8] KVM: cleanup aysnc_pf tracepoints, Xiao Guangrong, (Wed Oct 27, 2:02 am)
[PATCH 3/8] KVM: fix searching async gfn in kvm_async_pf_g ..., Xiao Guangrong, (Wed Oct 27, 2:03 am)
[PATCH 4/8] KVM: avoid unnecessary wait for a async pf, Xiao Guangrong, (Wed Oct 27, 2:04 am)
[PATCH 6/8] KVM: simply wakup async pf, Xiao Guangrong, (Wed Oct 27, 2:07 am)
[PATCH 7/8] KVM: make async_pf work queue lockless, Xiao Guangrong, (Wed Oct 27, 2:09 am)
Re: [PATCH 1/8] KVM: fix tracing kvm_try_async_get_page, Gleb Natapov, (Wed Oct 27, 2:59 am)
Re: [PATCH 2/8] KVM: cleanup aysnc_pf tracepoints, Gleb Natapov, (Wed Oct 27, 3:10 am)
Re: [PATCH 6/8] KVM: simply wakup async pf, Gleb Natapov, (Wed Oct 27, 3:50 am)
Re: [PATCH 7/8] KVM: make async_pf work queue lockless, Gleb Natapov, (Wed Oct 27, 4:41 am)
Re: [PATCH 4/8] KVM: avoid unnecessary wait for a async pf, Xiao Guangrong, (Thu Oct 28, 12:06 am)
Re: [PATCH 6/8] KVM: simply wakup async pf, Xiao Guangrong, (Thu Oct 28, 12:59 am)
Re: [PATCH 7/8] KVM: make async_pf work queue lockless, Xiao Guangrong, (Thu Oct 28, 2:08 am)
Re: [PATCH 7/8] KVM: make async_pf work queue lockless, Gleb Natapov, (Thu Oct 28, 2:14 am)