From: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
To: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Cc: Avi Kivity <avi@redhat.com>,
Marcelo Tosatti <mtosatti@redhat.com>,
LKML <linux-kernel@vger.kernel.org>, KVM <kvm@vger.kernel.org>
Subject: [PATCH v3 7/9] KVM: MMU: trace fast page fault
Date: Fri, 20 Apr 2012 16:20:15 +0800 [thread overview]
Message-ID: <4F911C3F.5080602@linux.vnet.ibm.com> (raw)
In-Reply-To: <4F911B74.4040305@linux.vnet.ibm.com>
To see what happen on this path and help us to optimize it
Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
---
arch/x86/kvm/mmu.c | 2 ++
arch/x86/kvm/mmutrace.h | 41 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 7aea156..ac9c285 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -2830,6 +2830,8 @@ static bool fast_page_fault(struct kvm_vcpu *vcpu, gva_t gva, gfn_t gfn,
spte, gfn);
exit:
+ trace_fast_page_fault(vcpu, gva, gfn, error_code, iterator.sptep,
+ spte, ret);
walk_shadow_page_lockless_end(vcpu);
return ret;
diff --git a/arch/x86/kvm/mmutrace.h b/arch/x86/kvm/mmutrace.h
index 89fb0e8..84da94f 100644
--- a/arch/x86/kvm/mmutrace.h
+++ b/arch/x86/kvm/mmutrace.h
@@ -243,6 +243,47 @@ TRACE_EVENT(
TP_printk("addr:%llx gfn %llx access %x", __entry->addr, __entry->gfn,
__entry->access)
);
+
+#define __spte_satisfied(__spte) \
+ (__entry->retry && is_writable_pte(__entry->__spte))
+
+TRACE_EVENT(
+ fast_page_fault,
+ TP_PROTO(struct kvm_vcpu *vcpu, gva_t gva, gfn_t gfn, u32 error_code,
+ u64 *sptep, u64 old_spte, bool retry),
+ TP_ARGS(vcpu, gva, gfn, error_code, sptep, old_spte, retry),
+
+ TP_STRUCT__entry(
+ __field(int, vcpu_id)
+ __field(gva_t, gva)
+ __field(gfn_t, gfn)
+ __field(u32, error_code)
+ __field(u64 *, sptep)
+ __field(u64, old_spte)
+ __field(u64, new_spte)
+ __field(bool, retry)
+ ),
+
+ TP_fast_assign(
+ __entry->vcpu_id = vcpu->vcpu_id;
+ __entry->gva = gva;
+ __entry->gfn = gfn;
+ __entry->error_code = error_code;
+ __entry->sptep = sptep;
+ __entry->old_spte = old_spte;
+ __entry->new_spte = *sptep;
+ __entry->retry = retry;
+ ),
+
+ TP_printk("vcpu %d gva %lx gfn %llx error_code %s sptep %p "
+ "old %#llx new %llx spurious %d fixed %d", __entry->vcpu_id,
+ __entry->gva, __entry->gfn,
+ __print_flags(__entry->error_code, "|",
+ kvm_mmu_trace_pferr_flags),
+ __entry->sptep, __entry->old_spte, __entry->new_spte,
+ __spte_satisfied(old_spte), __spte_satisfied(new_spte)
+ )
+);
#endif /* _TRACE_KVMMMU_H */
#undef TRACE_INCLUDE_PATH
--
1.7.7.6
next prev parent reply other threads:[~2012-04-20 8:20 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-20 8:16 [PATCH v3 0/9] KVM: MMU: fast page fault Xiao Guangrong
2012-04-20 8:17 ` [PATCH v3 1/9] KVM: MMU: return bool in __rmap_write_protect Xiao Guangrong
2012-04-20 8:17 ` [PATCH v3 2/9] KVM: MMU: abstract spte write-protect Xiao Guangrong
2012-04-20 21:33 ` Marcelo Tosatti
2012-04-21 1:10 ` Takuya Yoshikawa
2012-04-21 4:34 ` Xiao Guangrong
2012-04-21 3:24 ` Xiao Guangrong
2012-04-21 4:18 ` Marcelo Tosatti
2012-04-21 6:52 ` Xiao Guangrong
2012-04-20 8:18 ` [PATCH v3 3/9] KVM: VMX: export PFEC.P bit on ept Xiao Guangrong
2012-04-20 8:18 ` [PATCH v3 4/9] KVM: MMU: introduce SPTE_ALLOW_WRITE bit Xiao Guangrong
2012-04-20 21:39 ` Marcelo Tosatti
2012-04-21 3:30 ` Xiao Guangrong
2012-04-21 4:22 ` Marcelo Tosatti
2012-04-21 6:55 ` Xiao Guangrong
2012-04-22 15:12 ` Avi Kivity
2012-04-23 7:24 ` Xiao Guangrong
2012-04-20 8:19 ` [PATCH v3 5/9] KVM: MMU: introduce SPTE_WRITE_PROTECT bit Xiao Guangrong
2012-04-20 21:52 ` Marcelo Tosatti
2012-04-21 0:40 ` Marcelo Tosatti
2012-04-21 0:55 ` Marcelo Tosatti
2012-04-21 1:38 ` Takuya Yoshikawa
2012-04-21 4:29 ` Xiao Guangrong
2012-04-21 4:00 ` Xiao Guangrong
2012-04-24 0:45 ` Marcelo Tosatti
2012-04-24 3:34 ` Xiao Guangrong
2012-04-21 3:47 ` Xiao Guangrong
2012-04-21 4:38 ` Marcelo Tosatti
2012-04-21 7:25 ` Xiao Guangrong
2012-04-24 0:24 ` Marcelo Tosatti
2012-04-20 8:19 ` [PATCH v3 6/9] KVM: MMU: fast path of handling guest page fault Xiao Guangrong
2012-04-20 8:20 ` Xiao Guangrong [this message]
2012-04-20 8:20 ` [PATCH v3 8/9] KVM: MMU: fix kvm_mmu_pagetable_walk tracepoint Xiao Guangrong
2012-04-20 8:21 ` [PATCH v3 9/9] KVM: MMU: document mmu-lock and fast page fault Xiao Guangrong
2012-04-21 0:59 ` [PATCH v3 0/9] KVM: MMU: " Marcelo Tosatti
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=4F911C3F.5080602@linux.vnet.ibm.com \
--to=xiaoguangrong@linux.vnet.ibm.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox