KVM: fix searching async gfn in kvm_async_pf_gfn_slot
Xiao Guangrong [Mon, 1 Nov 2010 09:00:30 +0000 (17:00 +0800)]
Don't search later slots if the slot is empty

Acked-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

arch/x86/kvm/x86.c

index c10135b..ab10a6c 100644 (file)
@@ -6209,8 +6209,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;