From: Alexander Graf <agraf@suse.de> To: kvm-ppc@vger.kernel.org Cc: KVM list <kvm@vger.kernel.org> Subject: [PATCH 09/38] KVM: PPC: PR: Use generic tracepoint for guest exit Date: Wed, 15 Aug 2012 01:04:14 +0200 [thread overview] Message-ID: <1344985483-7440-10-git-send-email-agraf@suse.de> (raw) In-Reply-To: <1344985483-7440-1-git-send-email-agraf@suse.de> We want to have tracing information on guest exits for booke as well as book3s. Since most information is identical, use a common trace point. Signed-off-by: Alexander Graf <agraf@suse.de> --- arch/powerpc/kvm/book3s_pr.c | 2 +- arch/powerpc/kvm/booke.c | 3 ++ arch/powerpc/kvm/trace.h | 79 +++++++++++++++++++++++++++--------------- 3 files changed, 55 insertions(+), 29 deletions(-) diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c index 05c28f5..7f0fe6f 100644 --- a/arch/powerpc/kvm/book3s_pr.c +++ b/arch/powerpc/kvm/book3s_pr.c @@ -549,7 +549,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, /* We get here with MSR.EE=0, so enable it to be a nice citizen */ __hard_irq_enable(); - trace_kvm_book3s_exit(exit_nr, vcpu); + trace_kvm_exit(exit_nr, vcpu); preempt_enable(); kvm_resched(vcpu); switch (exit_nr) { diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index d25a097..7ce2ed0 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c @@ -39,6 +39,7 @@ #include "timing.h" #include "booke.h" +#include "trace.h" unsigned long kvmppc_booke_handlers; @@ -677,6 +678,8 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, local_irq_enable(); + trace_kvm_exit(exit_nr, vcpu); + run->exit_reason = KVM_EXIT_UNKNOWN; run->ready_for_interrupt_injection = 1; diff --git a/arch/powerpc/kvm/trace.h b/arch/powerpc/kvm/trace.h index 877186b..9fab6ed 100644 --- a/arch/powerpc/kvm/trace.h +++ b/arch/powerpc/kvm/trace.h @@ -31,6 +31,57 @@ TRACE_EVENT(kvm_ppc_instr, __entry->inst, __entry->pc, __entry->emulate) ); +TRACE_EVENT(kvm_exit, + TP_PROTO(unsigned int exit_nr, struct kvm_vcpu *vcpu), + TP_ARGS(exit_nr, vcpu), + + TP_STRUCT__entry( + __field( unsigned int, exit_nr ) + __field( unsigned long, pc ) + __field( unsigned long, msr ) + __field( unsigned long, dar ) +#ifdef CONFIG_KVM_BOOK3S_PR + __field( unsigned long, srr1 ) +#endif + __field( unsigned long, last_inst ) + ), + + TP_fast_assign( +#ifdef CONFIG_KVM_BOOK3S_PR + struct kvmppc_book3s_shadow_vcpu *svcpu; +#endif + __entry->exit_nr = exit_nr; + __entry->pc = kvmppc_get_pc(vcpu); + __entry->dar = kvmppc_get_fault_dar(vcpu); + __entry->msr = vcpu->arch.shared->msr; +#ifdef CONFIG_KVM_BOOK3S_PR + svcpu = svcpu_get(vcpu); + __entry->srr1 = svcpu->shadow_srr1; + svcpu_put(svcpu); +#endif + __entry->last_inst = vcpu->arch.last_inst; + ), + + TP_printk("exit=0x%x" + " | pc=0x%lx" + " | msr=0x%lx" + " | dar=0x%lx" +#ifdef CONFIG_KVM_BOOK3S_PR + " | srr1=0x%lx" +#endif + " | last_inst=0x%lx" + , + __entry->exit_nr, + __entry->pc, + __entry->msr, + __entry->dar, +#ifdef CONFIG_KVM_BOOK3S_PR + __entry->srr1, +#endif + __entry->last_inst + ) +); + TRACE_EVENT(kvm_stlb_inval, TP_PROTO(unsigned int stlb_index), TP_ARGS(stlb_index), @@ -105,34 +156,6 @@ TRACE_EVENT(kvm_gtlb_write, #ifdef CONFIG_KVM_BOOK3S_PR -TRACE_EVENT(kvm_book3s_exit, - TP_PROTO(unsigned int exit_nr, struct kvm_vcpu *vcpu), - TP_ARGS(exit_nr, vcpu), - - TP_STRUCT__entry( - __field( unsigned int, exit_nr ) - __field( unsigned long, pc ) - __field( unsigned long, msr ) - __field( unsigned long, dar ) - __field( unsigned long, srr1 ) - ), - - TP_fast_assign( - struct kvmppc_book3s_shadow_vcpu *svcpu; - __entry->exit_nr = exit_nr; - __entry->pc = kvmppc_get_pc(vcpu); - __entry->dar = kvmppc_get_fault_dar(vcpu); - __entry->msr = vcpu->arch.shared->msr; - svcpu = svcpu_get(vcpu); - __entry->srr1 = svcpu->shadow_srr1; - svcpu_put(svcpu); - ), - - TP_printk("exit=0x%x | pc=0x%lx | msr=0x%lx | dar=0x%lx | srr1=0x%lx", - __entry->exit_nr, __entry->pc, __entry->msr, __entry->dar, - __entry->srr1) -); - TRACE_EVENT(kvm_book3s_reenter, TP_PROTO(int r, struct kvm_vcpu *vcpu), TP_ARGS(r, vcpu), -- 1.6.0.2
WARNING: multiple messages have this Message-ID (diff)
From: Alexander Graf <agraf@suse.de> To: kvm-ppc@vger.kernel.org Cc: KVM list <kvm@vger.kernel.org> Subject: [PATCH 09/38] KVM: PPC: PR: Use generic tracepoint for guest exit Date: Tue, 14 Aug 2012 23:04:14 +0000 [thread overview] Message-ID: <1344985483-7440-10-git-send-email-agraf@suse.de> (raw) In-Reply-To: <1344985483-7440-1-git-send-email-agraf@suse.de> We want to have tracing information on guest exits for booke as well as book3s. Since most information is identical, use a common trace point. Signed-off-by: Alexander Graf <agraf@suse.de> --- arch/powerpc/kvm/book3s_pr.c | 2 +- arch/powerpc/kvm/booke.c | 3 ++ arch/powerpc/kvm/trace.h | 79 +++++++++++++++++++++++++++--------------- 3 files changed, 55 insertions(+), 29 deletions(-) diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c index 05c28f5..7f0fe6f 100644 --- a/arch/powerpc/kvm/book3s_pr.c +++ b/arch/powerpc/kvm/book3s_pr.c @@ -549,7 +549,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, /* We get here with MSR.EE=0, so enable it to be a nice citizen */ __hard_irq_enable(); - trace_kvm_book3s_exit(exit_nr, vcpu); + trace_kvm_exit(exit_nr, vcpu); preempt_enable(); kvm_resched(vcpu); switch (exit_nr) { diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index d25a097..7ce2ed0 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c @@ -39,6 +39,7 @@ #include "timing.h" #include "booke.h" +#include "trace.h" unsigned long kvmppc_booke_handlers; @@ -677,6 +678,8 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, local_irq_enable(); + trace_kvm_exit(exit_nr, vcpu); + run->exit_reason = KVM_EXIT_UNKNOWN; run->ready_for_interrupt_injection = 1; diff --git a/arch/powerpc/kvm/trace.h b/arch/powerpc/kvm/trace.h index 877186b..9fab6ed 100644 --- a/arch/powerpc/kvm/trace.h +++ b/arch/powerpc/kvm/trace.h @@ -31,6 +31,57 @@ TRACE_EVENT(kvm_ppc_instr, __entry->inst, __entry->pc, __entry->emulate) ); +TRACE_EVENT(kvm_exit, + TP_PROTO(unsigned int exit_nr, struct kvm_vcpu *vcpu), + TP_ARGS(exit_nr, vcpu), + + TP_STRUCT__entry( + __field( unsigned int, exit_nr ) + __field( unsigned long, pc ) + __field( unsigned long, msr ) + __field( unsigned long, dar ) +#ifdef CONFIG_KVM_BOOK3S_PR + __field( unsigned long, srr1 ) +#endif + __field( unsigned long, last_inst ) + ), + + TP_fast_assign( +#ifdef CONFIG_KVM_BOOK3S_PR + struct kvmppc_book3s_shadow_vcpu *svcpu; +#endif + __entry->exit_nr = exit_nr; + __entry->pc = kvmppc_get_pc(vcpu); + __entry->dar = kvmppc_get_fault_dar(vcpu); + __entry->msr = vcpu->arch.shared->msr; +#ifdef CONFIG_KVM_BOOK3S_PR + svcpu = svcpu_get(vcpu); + __entry->srr1 = svcpu->shadow_srr1; + svcpu_put(svcpu); +#endif + __entry->last_inst = vcpu->arch.last_inst; + ), + + TP_printk("exit=0x%x" + " | pc=0x%lx" + " | msr=0x%lx" + " | dar=0x%lx" +#ifdef CONFIG_KVM_BOOK3S_PR + " | srr1=0x%lx" +#endif + " | last_inst=0x%lx" + , + __entry->exit_nr, + __entry->pc, + __entry->msr, + __entry->dar, +#ifdef CONFIG_KVM_BOOK3S_PR + __entry->srr1, +#endif + __entry->last_inst + ) +); + TRACE_EVENT(kvm_stlb_inval, TP_PROTO(unsigned int stlb_index), TP_ARGS(stlb_index), @@ -105,34 +156,6 @@ TRACE_EVENT(kvm_gtlb_write, #ifdef CONFIG_KVM_BOOK3S_PR -TRACE_EVENT(kvm_book3s_exit, - TP_PROTO(unsigned int exit_nr, struct kvm_vcpu *vcpu), - TP_ARGS(exit_nr, vcpu), - - TP_STRUCT__entry( - __field( unsigned int, exit_nr ) - __field( unsigned long, pc ) - __field( unsigned long, msr ) - __field( unsigned long, dar ) - __field( unsigned long, srr1 ) - ), - - TP_fast_assign( - struct kvmppc_book3s_shadow_vcpu *svcpu; - __entry->exit_nr = exit_nr; - __entry->pc = kvmppc_get_pc(vcpu); - __entry->dar = kvmppc_get_fault_dar(vcpu); - __entry->msr = vcpu->arch.shared->msr; - svcpu = svcpu_get(vcpu); - __entry->srr1 = svcpu->shadow_srr1; - svcpu_put(svcpu); - ), - - TP_printk("exit=0x%x | pc=0x%lx | msr=0x%lx | dar=0x%lx | srr1=0x%lx", - __entry->exit_nr, __entry->pc, __entry->msr, __entry->dar, - __entry->srr1) -); - TRACE_EVENT(kvm_book3s_reenter, TP_PROTO(int r, struct kvm_vcpu *vcpu), TP_ARGS(r, vcpu), -- 1.6.0.2
next prev parent reply other threads:[~2012-08-14 23:04 UTC|newest] Thread overview: 150+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-08-14 23:04 [PULL 00/38] ppc patch queue 2012-08-15 Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 01/38] PPC: epapr: create define for return code value of success Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 02/38] KVM: PPC: use definitions in epapr header for hcalls Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 03/38] KVM: PPC: add pvinfo for hcall opcodes on e500mc/e5500 Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 04/38] KVM: PPC: Add support for ePAPR idle hcall in host kernel Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 05/38] KVM: PPC: ev_idle hcall support for e500 guests Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 06/38] PPC: select EPAPR_PARAVIRT for all users of epapr hcalls Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 07/38] powerpc/fsl-soc: use CONFIG_EPAPR_PARAVIRT for hcalls Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 08/38] PPC: Don't use hardcoded opcode for ePAPR hcall invocation Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` Alexander Graf [this message] 2012-08-14 23:04 ` [PATCH 09/38] KVM: PPC: PR: Use generic tracepoint for guest exit Alexander Graf 2012-08-14 23:04 ` [PATCH 10/38] KVM: PPC: Expose SYNC cap based on mmu notifiers Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 11/38] KVM: PPC: BookE: Expose remote TLB flushes in debugfs Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 12/38] KVM: PPC: E500: Fix clear_tlb_refs Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 13/38] KVM: PPC: Book3S HV: Fix incorrect branch in H_CEDE code Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 14/38] KVM: PPC: Quieten message about allocating linear regions Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 15/38] powerpc/epapr: export epapr_hypercall_start Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 16/38] KVM: PPC: BookE: Add check_requests helper function Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-15 0:10 ` Scott Wood 2012-08-15 0:10 ` Scott Wood 2012-08-15 0:13 ` Alexander Graf 2012-08-15 0:13 ` Alexander Graf 2012-08-15 0:20 ` Scott Wood 2012-08-15 0:20 ` Scott Wood 2012-08-15 18:28 ` Marcelo Tosatti 2012-08-15 18:28 ` Marcelo Tosatti 2012-08-14 23:04 ` [PATCH 17/38] KVM: PPC: BookE: Add support for vcpu->mode Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-15 0:17 ` Scott Wood 2012-08-15 0:17 ` Scott Wood 2012-08-15 0:26 ` Alexander Graf 2012-08-15 0:26 ` Alexander Graf 2012-08-15 1:17 ` Scott Wood 2012-08-15 1:17 ` Scott Wood 2012-08-15 9:29 ` Alexander Graf 2012-08-15 9:29 ` Alexander Graf 2012-08-21 1:41 ` Scott Wood 2012-08-21 1:41 ` Scott Wood 2012-08-15 1:25 ` Scott Wood 2012-08-15 1:25 ` Scott Wood 2012-08-14 23:04 ` [PATCH 18/38] KVM: PPC: E500: Implement MMU notifiers Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-15 1:20 ` Scott Wood 2012-08-15 1:20 ` Scott Wood 2012-08-15 9:38 ` Alexander Graf 2012-08-15 9:38 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 19/38] KVM: PPC: Add cache flush on page map Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-15 1:23 ` Scott Wood 2012-08-15 1:23 ` Scott Wood 2012-08-15 9:52 ` Alexander Graf 2012-08-15 9:52 ` Alexander Graf 2012-08-15 17:26 ` Scott Wood 2012-08-15 17:26 ` Scott Wood 2012-08-15 17:27 ` Alexander Graf 2012-08-15 17:27 ` Alexander Graf 2012-08-15 17:47 ` Scott Wood 2012-08-15 17:47 ` Scott Wood 2012-08-15 18:01 ` Alexander Graf 2012-08-15 18:01 ` Alexander Graf 2012-08-15 18:16 ` Scott Wood 2012-08-15 18:16 ` Scott Wood 2012-08-15 18:27 ` Alexander Graf 2012-08-15 18:27 ` Alexander Graf 2012-08-15 18:29 ` Alexander Graf 2012-08-15 18:29 ` Alexander Graf 2012-08-15 18:33 ` Scott Wood 2012-08-15 18:33 ` Scott Wood 2012-08-15 18:51 ` Alexander Graf 2012-08-15 18:51 ` Alexander Graf 2012-08-15 18:56 ` Scott Wood 2012-08-15 18:56 ` Scott Wood 2012-08-15 18:58 ` Alexander Graf 2012-08-15 18:58 ` Alexander Graf 2012-08-15 19:05 ` Scott Wood 2012-08-15 19:05 ` Scott Wood 2012-08-15 19:29 ` Alexander Graf 2012-08-15 19:29 ` Alexander Graf 2012-08-15 19:53 ` Scott Wood 2012-08-15 19:53 ` Scott Wood 2012-08-14 23:04 ` [PATCH 20/38] KVM: PPC: BookE: Add some more trace points Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 21/38] KVM: PPC: BookE: No duplicate request != 0 check Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 22/38] KVM: PPC: Use same kvmppc_prepare_to_enter code for booke and book3s_pr Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 23/38] KVM: PPC: Book3s: PR: Add (dumb) MMU Notifier support Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 24/38] KVM: PPC: BookE: Drop redundant vcpu->mode set Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 25/38] KVM: PPC: Book3S: PR: Only do resched check once per exit Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 26/38] KVM: PPC: Exit guest context while handling exit Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 27/38] KVM: PPC: Book3S: PR: Indicate we're out of guest mode Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 28/38] KVM: PPC: Consistentify vcpu exit path Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 29/38] KVM: PPC: Book3S: PR: Rework irq disabling Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-17 21:47 ` Benjamin Herrenschmidt 2012-08-17 21:47 ` Benjamin Herrenschmidt 2012-09-28 0:52 ` Alexander Graf 2012-09-28 0:52 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 30/38] KVM: PPC: Move kvm_guest_enter call into generic code Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 31/38] KVM: PPC: Ignore EXITING_GUEST_MODE mode Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 32/38] KVM: PPC: Add return value in prepare_to_enter Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 33/38] KVM: PPC: Add return value to core_check_requests Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 34/38] KVM: PPC: booke: Add watchdog emulation Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 35/38] booke: Added ONE_REG interface for IAC/DAC debug registers Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:44 ` Scott Wood 2012-08-14 23:44 ` Scott Wood 2012-08-14 23:47 ` Alexander Graf 2012-08-14 23:47 ` Alexander Graf 2012-08-15 0:06 ` Scott Wood 2012-08-15 0:06 ` Scott Wood 2012-08-14 23:04 ` [PATCH 36/38] KVM: PPC: 44x: Initialize PVR Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 37/38] KVM: PPC: BookE: Add MCSR SPR support Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 38/38] ppc: e500_tlb memset clears nothing Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-15 10:07 ` Avi Kivity 2012-08-15 10:07 ` Avi Kivity 2012-08-15 10:09 ` Alexander Graf 2012-08-15 10:09 ` Alexander Graf 2012-08-15 10:10 ` Avi Kivity 2012-08-15 10:10 ` Avi Kivity
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=1344985483-7440-10-git-send-email-agraf@suse.de \ --to=agraf@suse.de \ --cc=kvm-ppc@vger.kernel.org \ --cc=kvm@vger.kernel.org \ /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: linkBe 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.