mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Xiao Guangrong <guangrong.xiao@linux.intel.com>
To: pbonzini@redhat.com
Cc: gleb@kernel.org, mtosatti@redhat.com, kvm@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Xiao Guangrong <guangrong.xiao@linux.intel.com>
Subject: [PATCH v2 6/9] KVM: MMU: introduce kvm_zap_rmapp
Date: Tue, 12 May 2015 10:32:30 +0800	[thread overview]
Message-ID: <1431397953-16642-7-git-send-email-guangrong.xiao@linux.intel.com> (raw)
In-Reply-To: <1431397953-16642-1-git-send-email-guangrong.xiao@linux.intel.com>

Split kvm_unmap_rmapp and introduce kvm_zap_rmapp which will be used in the
later patch

Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
---
 arch/x86/kvm/mmu.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index fae349a..10d5e03 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -1353,25 +1353,29 @@ static bool rmap_write_protect(struct kvm *kvm, u64 gfn)
 	return write_protected;
 }
 
-static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp,
-			   struct kvm_memory_slot *slot, gfn_t gfn, int level,
-			   unsigned long data)
+static bool kvm_zap_rmapp(struct kvm *kvm, unsigned long *rmapp)
 {
 	u64 *sptep;
 	struct rmap_iterator iter;
-	int need_tlb_flush = 0;
+	bool flush = false;
 
 restart:
 	for_each_rmap_spte(rmapp, &iter, sptep) {
-		rmap_printk("kvm_rmap_unmap_hva: spte %p %llx gfn %llx (%d)\n",
-			     sptep, *sptep, gfn, level);
+		rmap_printk("%s: spte %p %llx.\n", __func__, sptep, *sptep);
 
 		drop_spte(kvm, sptep);
-		need_tlb_flush = 1;
+		flush = true;
 		goto restart;
 	}
 
-	return need_tlb_flush;
+	return flush;
+}
+
+static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp,
+			   struct kvm_memory_slot *slot, gfn_t gfn, int level,
+			   unsigned long data)
+{
+	return kvm_zap_rmapp(kvm, rmapp);
 }
 
 static int kvm_set_pte_rmapp(struct kvm *kvm, unsigned long *rmapp,
-- 
2.1.0


  parent reply	other threads:[~2015-05-12  2:37 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-12  2:32 [PATCH v2 0/9] KVM: MTRR fixes and some cleanups Xiao Guangrong
2015-05-12  2:32 ` [PATCH v2 1/9] KVM: MMU: fix decoding cache type from MTRR Xiao Guangrong
2015-05-12  2:32 ` [PATCH v2 2/9] KVM: MMU: introduce for_each_rmap_spte() Xiao Guangrong
2015-05-12  8:08   ` Paolo Bonzini
2015-05-12  9:36     ` Xiao Guangrong
2015-05-12  2:32 ` [PATCH v2 3/9] KVM: MMU: introduce for_each_slot_rmap_range Xiao Guangrong
2015-05-12  8:22   ` Paolo Bonzini
2015-05-12  9:38     ` Xiao Guangrong
2015-05-12  2:32 ` [PATCH v2 4/9] KVM: MMU: introduce slot_handle_level_range() and its helpers Xiao Guangrong
2015-05-12  8:22   ` Paolo Bonzini
2015-05-12  9:37     ` Xiao Guangrong
2015-05-12  2:32 ` [PATCH v2 5/9] KVM: MMU: use slot_handle_level and its helper to clean up the code Xiao Guangrong
2015-05-12  2:32 ` Xiao Guangrong [this message]
2015-05-12  2:32 ` [PATCH v2 7/9] KVM: MMU: introduce kvm_zap_gfn_range Xiao Guangrong
2015-05-12  2:32 ` [PATCH v2 8/9] KVM: MMU: fix MTRR update Xiao Guangrong
2015-05-12  2:32 ` [PATCH v2 9/9] KVM: x86: do not reset mmu if CR0.CD and CR0.NW are changed Xiao Guangrong

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=1431397953-16642-7-git-send-email-guangrong.xiao@linux.intel.com \
    --to=guangrong.xiao@linux.intel.com \
    --cc=gleb@kernel.org \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mtosatti@redhat.com \
    --cc=pbonzini@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

all inboxes | Powered by JetHome®