From: Paolo Bonzini <pbonzini@redhat.com>
To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Cc: Takuya Yoshikawa <yoshikawa_takuya_b1@lab.ntt.co.jp>,
Xiao Guangrong <guangrong.xiao@linux.intel.com>
Subject: [PATCH 4/9] KVM: MMU: cleanup __kvm_sync_page and its callers
Date: Mon, 7 Mar 2016 15:15:50 +0100 [thread overview]
Message-ID: <1457360155-9610-6-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1457360155-9610-1-git-send-email-pbonzini@redhat.com>
Calling kvm_unlink_unsync_page in the middle of __kvm_sync_page makes
things unnecessarily tricky. If kvm_mmu_prepare_zap_page is called,
it will call kvm_unlink_unsync_page too. So kvm_unlink_unsync_page can
be called just as well at the beginning or the end of __kvm_sync_page...
which means that we might do it in kvm_sync_page too and remove the
parameter.
kvm_sync_page ends up being the same code that kvm_sync_pages used
to have before the previous patch.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
arch/x86/kvm/mmu.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 56be33714036..88a1a79c869e 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -1917,16 +1917,13 @@ static void kvm_mmu_commit_zap_page(struct kvm *kvm,
/* @sp->gfn should be write-protected at the call site */
static int __kvm_sync_page(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
- struct list_head *invalid_list, bool clear_unsync)
+ struct list_head *invalid_list)
{
if (sp->role.cr4_pae != !!is_pae(vcpu)) {
kvm_mmu_prepare_zap_page(vcpu->kvm, sp, invalid_list);
return 1;
}
- if (clear_unsync)
- kvm_unlink_unsync_page(vcpu->kvm, sp);
-
if (vcpu->arch.mmu.sync_page(vcpu, sp)) {
kvm_mmu_prepare_zap_page(vcpu->kvm, sp, invalid_list);
return 1;
@@ -1956,7 +1953,7 @@ static int kvm_sync_page_transient(struct kvm_vcpu *vcpu,
LIST_HEAD(invalid_list);
int ret;
- ret = __kvm_sync_page(vcpu, sp, &invalid_list, false);
+ ret = __kvm_sync_page(vcpu, sp, &invalid_list);
kvm_mmu_flush_or_zap(vcpu, &invalid_list, false, !ret);
return ret;
@@ -1972,7 +1969,8 @@ static void mmu_audit_disable(void) { }
static int kvm_sync_page(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
struct list_head *invalid_list)
{
- return __kvm_sync_page(vcpu, sp, invalid_list, true);
+ kvm_unlink_unsync_page(vcpu->kvm, sp);
+ return __kvm_sync_page(vcpu, sp, invalid_list);
}
/* @gfn should be write-protected at the call site */
--
1.8.3.1
next prev parent reply other threads:[~2016-03-07 14:19 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-07 14:15 [PATCH v2 0/9] cleanup around kvm_sync_page, and a few micro-optimizations Paolo Bonzini
2016-03-07 14:15 ` Paolo Bonzini
2016-03-08 8:00 ` Takuya Yoshikawa
2016-03-08 8:30 ` Paolo Bonzini
2016-03-08 8:33 ` Takuya Yoshikawa
2016-03-07 14:15 ` [PATCH 1/9] KVM: MMU: introduce kvm_mmu_flush_or_zap Paolo Bonzini
2016-03-07 14:15 ` [PATCH 2/9] KVM: MMU: move TLB flush out of __kvm_sync_page Paolo Bonzini
2016-03-07 14:15 ` [PATCH 3/9] KVM: MMU: use kvm_sync_page in kvm_sync_pages Paolo Bonzini
2016-03-07 14:15 ` Paolo Bonzini [this message]
2016-03-07 14:15 ` [PATCH 5/9] KVM: MMU: invert return value of mmu.sync_page and *kvm_sync_page* Paolo Bonzini
2016-03-07 14:15 ` [PATCH 6/9] KVM: MMU: move zap/flush to kvm_mmu_get_page Paolo Bonzini
2016-03-07 14:15 ` [PATCH 7/9] KVM: MMU: coalesce more page zapping in mmu_sync_children Paolo Bonzini
2016-03-07 14:15 ` [PATCH 8/9] KVM: MMU: simplify is_last_gpte Paolo Bonzini
2016-03-07 14:15 ` [PATCH 9/9] KVM: MMU: micro-optimize gpte_access Paolo Bonzini
2016-03-09 7:12 ` [PATCH v2 0/9] cleanup around kvm_sync_page, and a few micro-optimizations 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=1457360155-9610-6-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=guangrong.xiao@linux.intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=yoshikawa_takuya_b1@lab.ntt.co.jp \
/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®