public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
To: Avi Kivity <avi@redhat.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>,
	Gleb Natapov <gleb@redhat.com>,
	LKML <linux-kernel@vger.kernel.org>, KVM <kvm@vger.kernel.org>
Subject: [PATCH v2 3/7] KVM: fix searching async gfn in kvm_async_pf_gfn_slot
Date: Mon, 01 Nov 2010 17:00:30 +0800	[thread overview]
Message-ID: <4CCE81AE.2010600@cn.fujitsu.com> (raw)
In-Reply-To: <4CCE8143.3090105@cn.fujitsu.com>

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>
---
 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 2cfdf2d..9b543f4 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -6206,8 +6206,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


  parent reply	other threads:[~2010-11-01  8:56 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-01  8:58 [PATCH v2 1/7] KVM: fix tracing kvm_try_async_get_page Xiao Guangrong
2010-11-01  8:59 ` [PATCH v2 2/7] KVM: cleanup aysnc_pf tracepoints Xiao Guangrong
2010-11-01  9:00 ` Xiao Guangrong [this message]
2010-11-01  9:01 ` [PATCH v2 4/7] KVM: avoid unnecessary wait for a async pf Xiao Guangrong
2010-11-01  9:25   ` Gleb Natapov
2010-11-01  9:02 ` [PATCH v2 5/7] KVM: handle more completed apfs if possible Xiao Guangrong
2010-11-01  9:24   ` Gleb Natapov
2010-11-01  9:34     ` Xiao Guangrong
2010-11-02  9:35     ` [PATCH v3 " Xiao Guangrong
2010-11-02 12:38       ` Gleb Natapov
2010-11-01  9:03 ` [RFC PATCH v2 6/7] KVM: fix the race while wakeup all pv guest Xiao Guangrong
2010-11-01 12:58   ` Gleb Natapov
2010-11-01  9:05 ` [RFC PATCH v2 7/7] KVM: KVM: don't break vcpu 'halt' state due to apfs Xiao Guangrong
2010-11-01 12:55   ` Gleb Natapov
2010-11-02  2:30     ` Xiao Guangrong
2010-11-02  6:56       ` Gleb Natapov
2010-11-02  7:31         ` Xiao Guangrong
2010-11-02  7:45           ` Gleb Natapov
2010-11-02  9:09             ` Xiao Guangrong
2010-11-02  9:14               ` Gleb Natapov
2010-11-02  9:30                 ` Xiao Guangrong
2010-11-02 12:39                   ` Gleb Natapov
2010-11-03  9:47     ` Xiao Guangrong
2010-11-03  9:45       ` Gleb Natapov
2010-11-03 13:43         ` Marcelo Tosatti
2010-11-01 13:09 ` [PATCH v2 1/7] 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=4CCE81AE.2010600@cn.fujitsu.com \
    --to=xiaoguangrong@cn.fujitsu.com \
    --cc=avi@redhat.com \
    --cc=gleb@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