From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
To: unlisted-recipients:; (no To-header on input)
Cc: Avi Kivity <avi@redhat.com>,
Marcelo Tosatti <mtosatti@redhat.com>,
KVM list <kvm@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH v4 1/9] KVM MMU: split kvm_sync_page() function
Date: Thu, 06 May 2010 17:30:30 +0800 [thread overview]
Message-ID: <4BE28C36.705@cn.fujitsu.com> (raw)
In-Reply-To: <4BE2818A.5000301@cn.fujitsu.com>
Split kvm_sync_page() into kvm_sync_page() and kvm_sync_page_transient()
to clarify the code address Avi's suggestion
kvm_sync_page_transient() function only update shadow page but not mark
it sync and not write protect sp->gfn. it will be used by later patch
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
---
arch/x86/kvm/mmu.c | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index de99638..72238ec 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -1196,16 +1196,20 @@ static void kvm_unlink_unsync_page(struct kvm *kvm, struct kvm_mmu_page *sp)
static int kvm_mmu_zap_page(struct kvm *kvm, struct kvm_mmu_page *sp);
-static int kvm_sync_page(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp)
+static int __kvm_sync_page(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
+ bool clear_unsync)
{
if (sp->role.cr4_pae != !!is_pae(vcpu)) {
kvm_mmu_zap_page(vcpu->kvm, sp);
return 1;
}
- if (rmap_write_protect(vcpu->kvm, sp->gfn))
- kvm_flush_remote_tlbs(vcpu->kvm);
- kvm_unlink_unsync_page(vcpu->kvm, sp);
+ if (clear_unsync) {
+ if (rmap_write_protect(vcpu->kvm, sp->gfn))
+ kvm_flush_remote_tlbs(vcpu->kvm);
+ kvm_unlink_unsync_page(vcpu->kvm, sp);
+ }
+
if (vcpu->arch.mmu.sync_page(vcpu, sp)) {
kvm_mmu_zap_page(vcpu->kvm, sp);
return 1;
@@ -1215,6 +1219,22 @@ static int kvm_sync_page(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp)
return 0;
}
+static void mmu_convert_notrap(struct kvm_mmu_page *sp);
+static int kvm_sync_page_transient(struct kvm_vcpu *vcpu,
+ struct kvm_mmu_page *sp)
+{
+ int ret;
+
+ ret = __kvm_sync_page(vcpu, sp, false);
+ mmu_convert_notrap(sp);
+ return ret;
+}
+
+static int kvm_sync_page(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp)
+{
+ return __kvm_sync_page(vcpu, sp, true);
+}
+
struct mmu_page_path {
struct kvm_mmu_page *parent[PT64_ROOT_LEVEL-1];
unsigned int idx[PT64_ROOT_LEVEL-1];
--
1.6.1.2
next parent reply other threads:[~2010-05-06 9:33 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <4BE2818A.5000301@cn.fujitsu.com>
2010-05-06 9:30 ` Xiao Guangrong [this message]
2010-05-06 9:30 ` [PATCH v4 2/9] KVM MMU: don't write-protect if have new mapping to unsync page Xiao Guangrong
2010-05-06 9:30 ` [PATCH v4 3/9] KVM MMU: allow more page become unsync at gfn mapping time Xiao Guangrong
2010-05-06 9:30 ` [PATCH v4 4/9] KVM MMU: allow more page become unsync at getting sp time Xiao Guangrong
2010-05-06 9:31 ` [PATCH v4 5/9] KVM MMU: rename 'root_count' to 'active_count' Xiao Guangrong
2010-05-07 3:57 ` [PATCH v5 " Xiao Guangrong
2010-05-06 9:31 ` [PATCH v4 6/9] KVM MMU: support keeping sp live while it's out of protection Xiao Guangrong
2010-05-07 3:58 ` [PATCH v5 " Xiao Guangrong
2010-05-06 9:31 ` [PATCH v4 7/9] KVM MMU: separate invlpg code form kvm_mmu_pte_write() Xiao Guangrong
2010-05-06 9:31 ` [PATCH v4 8/9] KVM MMU: no need atomic operation for 'invlpg_counter' Xiao Guangrong
2010-05-06 9:31 ` [PATCH v4 9/9] KVM MMU: optimize sync/update unsync-page 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=4BE28C36.705@cn.fujitsu.com \
--to=xiaoguangrong@cn.fujitsu.com \
--cc=avi@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.