* [PATCH v3 0/3] KVM: perf: a smart tool to analyse kvm events
@ 2012-02-07 13:06 Xiao Guangrong
2012-02-07 13:07 ` [PATCH 1/3] KVM: x86: export svm/vmx exit-code definitions to userspace Xiao Guangrong
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Xiao Guangrong @ 2012-02-07 13:06 UTC (permalink / raw)
To: Avi Kivity
Cc: Marcelo Tosatti, Ingo Molnar, Arnaldo Carvalho de Melo,
Stefan Hajnoczi, LKML, KVM
Changlog:
- directly including svm.h/vmx.h/kvm_host.h instead of
making a new .h file.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/3] KVM: x86: export svm/vmx exit-code definitions to userspace
2012-02-07 13:06 [PATCH v3 0/3] KVM: perf: a smart tool to analyse kvm events Xiao Guangrong
@ 2012-02-07 13:07 ` Xiao Guangrong
2012-02-07 13:08 ` [PATCH v3 2/3] KVM: x86: add tracepoints to trace mmio begin and complete Xiao Guangrong
2012-02-07 13:08 ` [PATCH v3 3/3] KVM: perf: kvm events analysis tool Xiao Guangrong
2 siblings, 0 replies; 9+ messages in thread
From: Xiao Guangrong @ 2012-02-07 13:07 UTC (permalink / raw)
To: Xiao Guangrong
Cc: Avi Kivity, Marcelo Tosatti, Ingo Molnar,
Arnaldo Carvalho de Melo, Stefan Hajnoczi, LKML, KVM
They are needed by 'perf kvm-events'
Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
---
arch/x86/include/asm/kvm_host.h | 36 ++++---
arch/x86/include/asm/svm.h | 205 +++++++++++++++++++++++++--------------
arch/x86/include/asm/vmx.h | 125 ++++++++++++++++--------
arch/x86/kvm/trace.h | 89 -----------------
4 files changed, 233 insertions(+), 222 deletions(-)
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 4610166..01c1b19 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -11,6 +11,24 @@
#ifndef _ASM_X86_KVM_HOST_H
#define _ASM_X86_KVM_HOST_H
+#define DE_VECTOR 0
+#define DB_VECTOR 1
+#define BP_VECTOR 3
+#define OF_VECTOR 4
+#define BR_VECTOR 5
+#define UD_VECTOR 6
+#define NM_VECTOR 7
+#define DF_VECTOR 8
+#define TS_VECTOR 10
+#define NP_VECTOR 11
+#define SS_VECTOR 12
+#define GP_VECTOR 13
+#define PF_VECTOR 14
+#define MF_VECTOR 16
+#define MC_VECTOR 18
+
+#ifdef __KERNEL__
+
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/mmu_notifier.h>
@@ -73,22 +91,6 @@
#define KVM_HPAGE_MASK(x) (~(KVM_HPAGE_SIZE(x) - 1))
#define KVM_PAGES_PER_HPAGE(x) (KVM_HPAGE_SIZE(x) / PAGE_SIZE)
-#define DE_VECTOR 0
-#define DB_VECTOR 1
-#define BP_VECTOR 3
-#define OF_VECTOR 4
-#define BR_VECTOR 5
-#define UD_VECTOR 6
-#define NM_VECTOR 7
-#define DF_VECTOR 8
-#define TS_VECTOR 10
-#define NP_VECTOR 11
-#define SS_VECTOR 12
-#define GP_VECTOR 13
-#define PF_VECTOR 14
-#define MF_VECTOR 16
-#define MC_VECTOR 18
-
#define SELECTOR_TI_MASK (1 << 2)
#define SELECTOR_RPL_MASK 0x03
@@ -939,4 +941,6 @@ int kvm_pmu_read_pmc(struct kvm_vcpu *vcpu, unsigned pmc, u64 *data);
void kvm_handle_pmu_event(struct kvm_vcpu *vcpu);
void kvm_deliver_pmi(struct kvm_vcpu *vcpu);
+#endif
+
#endif /* _ASM_X86_KVM_HOST_H */
diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h
index f2b83bc..d9f0290f 100644
--- a/arch/x86/include/asm/svm.h
+++ b/arch/x86/include/asm/svm.h
@@ -1,6 +1,135 @@
#ifndef __SVM_H
#define __SVM_H
+#define SVM_EXIT_READ_CR0 0x000
+#define SVM_EXIT_READ_CR3 0x003
+#define SVM_EXIT_READ_CR4 0x004
+#define SVM_EXIT_READ_CR8 0x008
+#define SVM_EXIT_WRITE_CR0 0x010
+#define SVM_EXIT_WRITE_CR3 0x013
+#define SVM_EXIT_WRITE_CR4 0x014
+#define SVM_EXIT_WRITE_CR8 0x018
+#define SVM_EXIT_READ_DR0 0x020
+#define SVM_EXIT_READ_DR1 0x021
+#define SVM_EXIT_READ_DR2 0x022
+#define SVM_EXIT_READ_DR3 0x023
+#define SVM_EXIT_READ_DR4 0x024
+#define SVM_EXIT_READ_DR5 0x025
+#define SVM_EXIT_READ_DR6 0x026
+#define SVM_EXIT_READ_DR7 0x027
+#define SVM_EXIT_WRITE_DR0 0x030
+#define SVM_EXIT_WRITE_DR1 0x031
+#define SVM_EXIT_WRITE_DR2 0x032
+#define SVM_EXIT_WRITE_DR3 0x033
+#define SVM_EXIT_WRITE_DR4 0x034
+#define SVM_EXIT_WRITE_DR5 0x035
+#define SVM_EXIT_WRITE_DR6 0x036
+#define SVM_EXIT_WRITE_DR7 0x037
+#define SVM_EXIT_EXCP_BASE 0x040
+#define SVM_EXIT_INTR 0x060
+#define SVM_EXIT_NMI 0x061
+#define SVM_EXIT_SMI 0x062
+#define SVM_EXIT_INIT 0x063
+#define SVM_EXIT_VINTR 0x064
+#define SVM_EXIT_CR0_SEL_WRITE 0x065
+#define SVM_EXIT_IDTR_READ 0x066
+#define SVM_EXIT_GDTR_READ 0x067
+#define SVM_EXIT_LDTR_READ 0x068
+#define SVM_EXIT_TR_READ 0x069
+#define SVM_EXIT_IDTR_WRITE 0x06a
+#define SVM_EXIT_GDTR_WRITE 0x06b
+#define SVM_EXIT_LDTR_WRITE 0x06c
+#define SVM_EXIT_TR_WRITE 0x06d
+#define SVM_EXIT_RDTSC 0x06e
+#define SVM_EXIT_RDPMC 0x06f
+#define SVM_EXIT_PUSHF 0x070
+#define SVM_EXIT_POPF 0x071
+#define SVM_EXIT_CPUID 0x072
+#define SVM_EXIT_RSM 0x073
+#define SVM_EXIT_IRET 0x074
+#define SVM_EXIT_SWINT 0x075
+#define SVM_EXIT_INVD 0x076
+#define SVM_EXIT_PAUSE 0x077
+#define SVM_EXIT_HLT 0x078
+#define SVM_EXIT_INVLPG 0x079
+#define SVM_EXIT_INVLPGA 0x07a
+#define SVM_EXIT_IOIO 0x07b
+#define SVM_EXIT_MSR 0x07c
+#define SVM_EXIT_TASK_SWITCH 0x07d
+#define SVM_EXIT_FERR_FREEZE 0x07e
+#define SVM_EXIT_SHUTDOWN 0x07f
+#define SVM_EXIT_VMRUN 0x080
+#define SVM_EXIT_VMMCALL 0x081
+#define SVM_EXIT_VMLOAD 0x082
+#define SVM_EXIT_VMSAVE 0x083
+#define SVM_EXIT_STGI 0x084
+#define SVM_EXIT_CLGI 0x085
+#define SVM_EXIT_SKINIT 0x086
+#define SVM_EXIT_RDTSCP 0x087
+#define SVM_EXIT_ICEBP 0x088
+#define SVM_EXIT_WBINVD 0x089
+#define SVM_EXIT_MONITOR 0x08a
+#define SVM_EXIT_MWAIT 0x08b
+#define SVM_EXIT_MWAIT_COND 0x08c
+#define SVM_EXIT_XSETBV 0x08d
+#define SVM_EXIT_NPF 0x400
+
+#define SVM_EXIT_ERR -1
+
+#define SVM_EXIT_REASONS \
+ { SVM_EXIT_READ_CR0, "read_cr0" }, \
+ { SVM_EXIT_READ_CR3, "read_cr3" }, \
+ { SVM_EXIT_READ_CR4, "read_cr4" }, \
+ { SVM_EXIT_READ_CR8, "read_cr8" }, \
+ { SVM_EXIT_WRITE_CR0, "write_cr0" }, \
+ { SVM_EXIT_WRITE_CR3, "write_cr3" }, \
+ { SVM_EXIT_WRITE_CR4, "write_cr4" }, \
+ { SVM_EXIT_WRITE_CR8, "write_cr8" }, \
+ { SVM_EXIT_READ_DR0, "read_dr0" }, \
+ { SVM_EXIT_READ_DR1, "read_dr1" }, \
+ { SVM_EXIT_READ_DR2, "read_dr2" }, \
+ { SVM_EXIT_READ_DR3, "read_dr3" }, \
+ { SVM_EXIT_WRITE_DR0, "write_dr0" }, \
+ { SVM_EXIT_WRITE_DR1, "write_dr1" }, \
+ { SVM_EXIT_WRITE_DR2, "write_dr2" }, \
+ { SVM_EXIT_WRITE_DR3, "write_dr3" }, \
+ { SVM_EXIT_WRITE_DR5, "write_dr5" }, \
+ { SVM_EXIT_WRITE_DR7, "write_dr7" }, \
+ { SVM_EXIT_EXCP_BASE + DB_VECTOR, "DB excp" }, \
+ { SVM_EXIT_EXCP_BASE + BP_VECTOR, "BP excp" }, \
+ { SVM_EXIT_EXCP_BASE + UD_VECTOR, "UD excp" }, \
+ { SVM_EXIT_EXCP_BASE + PF_VECTOR, "PF excp" }, \
+ { SVM_EXIT_EXCP_BASE + NM_VECTOR, "NM excp" }, \
+ { SVM_EXIT_EXCP_BASE + MC_VECTOR, "MC excp" }, \
+ { SVM_EXIT_INTR, "interrupt" }, \
+ { SVM_EXIT_NMI, "nmi" }, \
+ { SVM_EXIT_SMI, "smi" }, \
+ { SVM_EXIT_INIT, "init" }, \
+ { SVM_EXIT_VINTR, "vintr" }, \
+ { SVM_EXIT_CPUID, "cpuid" }, \
+ { SVM_EXIT_INVD, "invd" }, \
+ { SVM_EXIT_HLT, "hlt" }, \
+ { SVM_EXIT_INVLPG, "invlpg" }, \
+ { SVM_EXIT_INVLPGA, "invlpga" }, \
+ { SVM_EXIT_IOIO, "io" }, \
+ { SVM_EXIT_MSR, "msr" }, \
+ { SVM_EXIT_TASK_SWITCH, "task_switch" }, \
+ { SVM_EXIT_SHUTDOWN, "shutdown" }, \
+ { SVM_EXIT_VMRUN, "vmrun" }, \
+ { SVM_EXIT_VMMCALL, "hypercall" }, \
+ { SVM_EXIT_VMLOAD, "vmload" }, \
+ { SVM_EXIT_VMSAVE, "vmsave" }, \
+ { SVM_EXIT_STGI, "stgi" }, \
+ { SVM_EXIT_CLGI, "clgi" }, \
+ { SVM_EXIT_SKINIT, "skinit" }, \
+ { SVM_EXIT_WBINVD, "wbinvd" }, \
+ { SVM_EXIT_MONITOR, "monitor" }, \
+ { SVM_EXIT_MWAIT, "mwait" }, \
+ { SVM_EXIT_XSETBV, "xsetbv" }, \
+ { SVM_EXIT_NPF, "npf" }
+
+#ifdef __KERNEL__
+
enum {
INTERCEPT_INTR,
INTERCEPT_NMI,
@@ -264,81 +393,6 @@ struct __attribute__ ((__packed__)) vmcb {
#define SVM_EXITINFO_REG_MASK 0x0F
-#define SVM_EXIT_READ_CR0 0x000
-#define SVM_EXIT_READ_CR3 0x003
-#define SVM_EXIT_READ_CR4 0x004
-#define SVM_EXIT_READ_CR8 0x008
-#define SVM_EXIT_WRITE_CR0 0x010
-#define SVM_EXIT_WRITE_CR3 0x013
-#define SVM_EXIT_WRITE_CR4 0x014
-#define SVM_EXIT_WRITE_CR8 0x018
-#define SVM_EXIT_READ_DR0 0x020
-#define SVM_EXIT_READ_DR1 0x021
-#define SVM_EXIT_READ_DR2 0x022
-#define SVM_EXIT_READ_DR3 0x023
-#define SVM_EXIT_READ_DR4 0x024
-#define SVM_EXIT_READ_DR5 0x025
-#define SVM_EXIT_READ_DR6 0x026
-#define SVM_EXIT_READ_DR7 0x027
-#define SVM_EXIT_WRITE_DR0 0x030
-#define SVM_EXIT_WRITE_DR1 0x031
-#define SVM_EXIT_WRITE_DR2 0x032
-#define SVM_EXIT_WRITE_DR3 0x033
-#define SVM_EXIT_WRITE_DR4 0x034
-#define SVM_EXIT_WRITE_DR5 0x035
-#define SVM_EXIT_WRITE_DR6 0x036
-#define SVM_EXIT_WRITE_DR7 0x037
-#define SVM_EXIT_EXCP_BASE 0x040
-#define SVM_EXIT_INTR 0x060
-#define SVM_EXIT_NMI 0x061
-#define SVM_EXIT_SMI 0x062
-#define SVM_EXIT_INIT 0x063
-#define SVM_EXIT_VINTR 0x064
-#define SVM_EXIT_CR0_SEL_WRITE 0x065
-#define SVM_EXIT_IDTR_READ 0x066
-#define SVM_EXIT_GDTR_READ 0x067
-#define SVM_EXIT_LDTR_READ 0x068
-#define SVM_EXIT_TR_READ 0x069
-#define SVM_EXIT_IDTR_WRITE 0x06a
-#define SVM_EXIT_GDTR_WRITE 0x06b
-#define SVM_EXIT_LDTR_WRITE 0x06c
-#define SVM_EXIT_TR_WRITE 0x06d
-#define SVM_EXIT_RDTSC 0x06e
-#define SVM_EXIT_RDPMC 0x06f
-#define SVM_EXIT_PUSHF 0x070
-#define SVM_EXIT_POPF 0x071
-#define SVM_EXIT_CPUID 0x072
-#define SVM_EXIT_RSM 0x073
-#define SVM_EXIT_IRET 0x074
-#define SVM_EXIT_SWINT 0x075
-#define SVM_EXIT_INVD 0x076
-#define SVM_EXIT_PAUSE 0x077
-#define SVM_EXIT_HLT 0x078
-#define SVM_EXIT_INVLPG 0x079
-#define SVM_EXIT_INVLPGA 0x07a
-#define SVM_EXIT_IOIO 0x07b
-#define SVM_EXIT_MSR 0x07c
-#define SVM_EXIT_TASK_SWITCH 0x07d
-#define SVM_EXIT_FERR_FREEZE 0x07e
-#define SVM_EXIT_SHUTDOWN 0x07f
-#define SVM_EXIT_VMRUN 0x080
-#define SVM_EXIT_VMMCALL 0x081
-#define SVM_EXIT_VMLOAD 0x082
-#define SVM_EXIT_VMSAVE 0x083
-#define SVM_EXIT_STGI 0x084
-#define SVM_EXIT_CLGI 0x085
-#define SVM_EXIT_SKINIT 0x086
-#define SVM_EXIT_RDTSCP 0x087
-#define SVM_EXIT_ICEBP 0x088
-#define SVM_EXIT_WBINVD 0x089
-#define SVM_EXIT_MONITOR 0x08a
-#define SVM_EXIT_MWAIT 0x08b
-#define SVM_EXIT_MWAIT_COND 0x08c
-#define SVM_EXIT_XSETBV 0x08d
-#define SVM_EXIT_NPF 0x400
-
-#define SVM_EXIT_ERR -1
-
#define SVM_CR0_SELECTIVE_MASK (X86_CR0_TS | X86_CR0_MP)
#define SVM_VMLOAD ".byte 0x0f, 0x01, 0xda"
@@ -350,3 +404,4 @@ struct __attribute__ ((__packed__)) vmcb {
#endif
+#endif
diff --git a/arch/x86/include/asm/vmx.h b/arch/x86/include/asm/vmx.h
index 31f180c..c644034 100644
--- a/arch/x86/include/asm/vmx.h
+++ b/arch/x86/include/asm/vmx.h
@@ -25,6 +25,87 @@
*
*/
+#define VMX_EXIT_REASONS_FAILED_VMENTRY 0x80000000
+
+#define EXIT_REASON_EXCEPTION_NMI 0
+#define EXIT_REASON_EXTERNAL_INTERRUPT 1
+#define EXIT_REASON_TRIPLE_FAULT 2
+
+#define EXIT_REASON_PENDING_INTERRUPT 7
+#define EXIT_REASON_NMI_WINDOW 8
+#define EXIT_REASON_TASK_SWITCH 9
+#define EXIT_REASON_CPUID 10
+#define EXIT_REASON_HLT 12
+#define EXIT_REASON_INVD 13
+#define EXIT_REASON_INVLPG 14
+#define EXIT_REASON_RDPMC 15
+#define EXIT_REASON_RDTSC 16
+#define EXIT_REASON_VMCALL 18
+#define EXIT_REASON_VMCLEAR 19
+#define EXIT_REASON_VMLAUNCH 20
+#define EXIT_REASON_VMPTRLD 21
+#define EXIT_REASON_VMPTRST 22
+#define EXIT_REASON_VMREAD 23
+#define EXIT_REASON_VMRESUME 24
+#define EXIT_REASON_VMWRITE 25
+#define EXIT_REASON_VMOFF 26
+#define EXIT_REASON_VMON 27
+#define EXIT_REASON_CR_ACCESS 28
+#define EXIT_REASON_DR_ACCESS 29
+#define EXIT_REASON_IO_INSTRUCTION 30
+#define EXIT_REASON_MSR_READ 31
+#define EXIT_REASON_MSR_WRITE 32
+#define EXIT_REASON_INVALID_STATE 33
+#define EXIT_REASON_MWAIT_INSTRUCTION 36
+#define EXIT_REASON_MONITOR_INSTRUCTION 39
+#define EXIT_REASON_PAUSE_INSTRUCTION 40
+#define EXIT_REASON_MCE_DURING_VMENTRY 41
+#define EXIT_REASON_TPR_BELOW_THRESHOLD 43
+#define EXIT_REASON_APIC_ACCESS 44
+#define EXIT_REASON_EPT_VIOLATION 48
+#define EXIT_REASON_EPT_MISCONFIG 49
+#define EXIT_REASON_WBINVD 54
+#define EXIT_REASON_XSETBV 55
+
+#define VMX_EXIT_REASONS \
+ { EXIT_REASON_EXCEPTION_NMI, "EXCEPTION_NMI" }, \
+ { EXIT_REASON_EXTERNAL_INTERRUPT, "EXTERNAL_INTERRUPT" }, \
+ { EXIT_REASON_TRIPLE_FAULT, "TRIPLE_FAULT" }, \
+ { EXIT_REASON_PENDING_INTERRUPT, "PENDING_INTERRUPT" }, \
+ { EXIT_REASON_NMI_WINDOW, "NMI_WINDOW" }, \
+ { EXIT_REASON_TASK_SWITCH, "TASK_SWITCH" }, \
+ { EXIT_REASON_CPUID, "CPUID" }, \
+ { EXIT_REASON_HLT, "HLT" }, \
+ { EXIT_REASON_INVLPG, "INVLPG" }, \
+ { EXIT_REASON_RDPMC, "RDPMC" }, \
+ { EXIT_REASON_RDTSC, "RDTSC" }, \
+ { EXIT_REASON_VMCALL, "VMCALL" }, \
+ { EXIT_REASON_VMCLEAR, "VMCLEAR" }, \
+ { EXIT_REASON_VMLAUNCH, "VMLAUNCH" }, \
+ { EXIT_REASON_VMPTRLD, "VMPTRLD" }, \
+ { EXIT_REASON_VMPTRST, "VMPTRST" }, \
+ { EXIT_REASON_VMREAD, "VMREAD" }, \
+ { EXIT_REASON_VMRESUME, "VMRESUME" }, \
+ { EXIT_REASON_VMWRITE, "VMWRITE" }, \
+ { EXIT_REASON_VMOFF, "VMOFF" }, \
+ { EXIT_REASON_VMON, "VMON" }, \
+ { EXIT_REASON_CR_ACCESS, "CR_ACCESS" }, \
+ { EXIT_REASON_DR_ACCESS, "DR_ACCESS" }, \
+ { EXIT_REASON_IO_INSTRUCTION, "IO_INSTRUCTION" }, \
+ { EXIT_REASON_MSR_READ, "MSR_READ" }, \
+ { EXIT_REASON_MSR_WRITE, "MSR_WRITE" }, \
+ { EXIT_REASON_MWAIT_INSTRUCTION, "MWAIT_INSTRUCTION" }, \
+ { EXIT_REASON_MONITOR_INSTRUCTION, "MONITOR_INSTRUCTION" }, \
+ { EXIT_REASON_PAUSE_INSTRUCTION, "PAUSE_INSTRUCTION" }, \
+ { EXIT_REASON_MCE_DURING_VMENTRY, "MCE_DURING_VMENTRY" }, \
+ { EXIT_REASON_TPR_BELOW_THRESHOLD, "TPR_BELOW_THRESHOLD" }, \
+ { EXIT_REASON_APIC_ACCESS, "APIC_ACCESS" }, \
+ { EXIT_REASON_EPT_VIOLATION, "EPT_VIOLATION" }, \
+ { EXIT_REASON_EPT_MISCONFIG, "EPT_MISCONFIG" }, \
+ { EXIT_REASON_WBINVD, "WBINVD" }
+
+#ifdef __KERNEL__
+
#include <linux/types.h>
/*
@@ -240,48 +321,6 @@ enum vmcs_field {
HOST_RIP = 0x00006c16,
};
-#define VMX_EXIT_REASONS_FAILED_VMENTRY 0x80000000
-
-#define EXIT_REASON_EXCEPTION_NMI 0
-#define EXIT_REASON_EXTERNAL_INTERRUPT 1
-#define EXIT_REASON_TRIPLE_FAULT 2
-
-#define EXIT_REASON_PENDING_INTERRUPT 7
-#define EXIT_REASON_NMI_WINDOW 8
-#define EXIT_REASON_TASK_SWITCH 9
-#define EXIT_REASON_CPUID 10
-#define EXIT_REASON_HLT 12
-#define EXIT_REASON_INVD 13
-#define EXIT_REASON_INVLPG 14
-#define EXIT_REASON_RDPMC 15
-#define EXIT_REASON_RDTSC 16
-#define EXIT_REASON_VMCALL 18
-#define EXIT_REASON_VMCLEAR 19
-#define EXIT_REASON_VMLAUNCH 20
-#define EXIT_REASON_VMPTRLD 21
-#define EXIT_REASON_VMPTRST 22
-#define EXIT_REASON_VMREAD 23
-#define EXIT_REASON_VMRESUME 24
-#define EXIT_REASON_VMWRITE 25
-#define EXIT_REASON_VMOFF 26
-#define EXIT_REASON_VMON 27
-#define EXIT_REASON_CR_ACCESS 28
-#define EXIT_REASON_DR_ACCESS 29
-#define EXIT_REASON_IO_INSTRUCTION 30
-#define EXIT_REASON_MSR_READ 31
-#define EXIT_REASON_MSR_WRITE 32
-#define EXIT_REASON_INVALID_STATE 33
-#define EXIT_REASON_MWAIT_INSTRUCTION 36
-#define EXIT_REASON_MONITOR_INSTRUCTION 39
-#define EXIT_REASON_PAUSE_INSTRUCTION 40
-#define EXIT_REASON_MCE_DURING_VMENTRY 41
-#define EXIT_REASON_TPR_BELOW_THRESHOLD 43
-#define EXIT_REASON_APIC_ACCESS 44
-#define EXIT_REASON_EPT_VIOLATION 48
-#define EXIT_REASON_EPT_MISCONFIG 49
-#define EXIT_REASON_WBINVD 54
-#define EXIT_REASON_XSETBV 55
-
/*
* Interruption-information format
*/
@@ -482,3 +521,5 @@ enum vm_instruction_error_number {
};
#endif
+
+#endif
diff --git a/arch/x86/kvm/trace.h b/arch/x86/kvm/trace.h
index 911d264..89cbbe5 100644
--- a/arch/x86/kvm/trace.h
+++ b/arch/x86/kvm/trace.h
@@ -183,95 +183,6 @@ TRACE_EVENT(kvm_apic,
#define KVM_ISA_VMX 1
#define KVM_ISA_SVM 2
-#define VMX_EXIT_REASONS \
- { EXIT_REASON_EXCEPTION_NMI, "EXCEPTION_NMI" }, \
- { EXIT_REASON_EXTERNAL_INTERRUPT, "EXTERNAL_INTERRUPT" }, \
- { EXIT_REASON_TRIPLE_FAULT, "TRIPLE_FAULT" }, \
- { EXIT_REASON_PENDING_INTERRUPT, "PENDING_INTERRUPT" }, \
- { EXIT_REASON_NMI_WINDOW, "NMI_WINDOW" }, \
- { EXIT_REASON_TASK_SWITCH, "TASK_SWITCH" }, \
- { EXIT_REASON_CPUID, "CPUID" }, \
- { EXIT_REASON_HLT, "HLT" }, \
- { EXIT_REASON_INVLPG, "INVLPG" }, \
- { EXIT_REASON_RDPMC, "RDPMC" }, \
- { EXIT_REASON_RDTSC, "RDTSC" }, \
- { EXIT_REASON_VMCALL, "VMCALL" }, \
- { EXIT_REASON_VMCLEAR, "VMCLEAR" }, \
- { EXIT_REASON_VMLAUNCH, "VMLAUNCH" }, \
- { EXIT_REASON_VMPTRLD, "VMPTRLD" }, \
- { EXIT_REASON_VMPTRST, "VMPTRST" }, \
- { EXIT_REASON_VMREAD, "VMREAD" }, \
- { EXIT_REASON_VMRESUME, "VMRESUME" }, \
- { EXIT_REASON_VMWRITE, "VMWRITE" }, \
- { EXIT_REASON_VMOFF, "VMOFF" }, \
- { EXIT_REASON_VMON, "VMON" }, \
- { EXIT_REASON_CR_ACCESS, "CR_ACCESS" }, \
- { EXIT_REASON_DR_ACCESS, "DR_ACCESS" }, \
- { EXIT_REASON_IO_INSTRUCTION, "IO_INSTRUCTION" }, \
- { EXIT_REASON_MSR_READ, "MSR_READ" }, \
- { EXIT_REASON_MSR_WRITE, "MSR_WRITE" }, \
- { EXIT_REASON_MWAIT_INSTRUCTION, "MWAIT_INSTRUCTION" }, \
- { EXIT_REASON_MONITOR_INSTRUCTION, "MONITOR_INSTRUCTION" }, \
- { EXIT_REASON_PAUSE_INSTRUCTION, "PAUSE_INSTRUCTION" }, \
- { EXIT_REASON_MCE_DURING_VMENTRY, "MCE_DURING_VMENTRY" }, \
- { EXIT_REASON_TPR_BELOW_THRESHOLD, "TPR_BELOW_THRESHOLD" }, \
- { EXIT_REASON_APIC_ACCESS, "APIC_ACCESS" }, \
- { EXIT_REASON_EPT_VIOLATION, "EPT_VIOLATION" }, \
- { EXIT_REASON_EPT_MISCONFIG, "EPT_MISCONFIG" }, \
- { EXIT_REASON_WBINVD, "WBINVD" }
-
-#define SVM_EXIT_REASONS \
- { SVM_EXIT_READ_CR0, "read_cr0" }, \
- { SVM_EXIT_READ_CR3, "read_cr3" }, \
- { SVM_EXIT_READ_CR4, "read_cr4" }, \
- { SVM_EXIT_READ_CR8, "read_cr8" }, \
- { SVM_EXIT_WRITE_CR0, "write_cr0" }, \
- { SVM_EXIT_WRITE_CR3, "write_cr3" }, \
- { SVM_EXIT_WRITE_CR4, "write_cr4" }, \
- { SVM_EXIT_WRITE_CR8, "write_cr8" }, \
- { SVM_EXIT_READ_DR0, "read_dr0" }, \
- { SVM_EXIT_READ_DR1, "read_dr1" }, \
- { SVM_EXIT_READ_DR2, "read_dr2" }, \
- { SVM_EXIT_READ_DR3, "read_dr3" }, \
- { SVM_EXIT_WRITE_DR0, "write_dr0" }, \
- { SVM_EXIT_WRITE_DR1, "write_dr1" }, \
- { SVM_EXIT_WRITE_DR2, "write_dr2" }, \
- { SVM_EXIT_WRITE_DR3, "write_dr3" }, \
- { SVM_EXIT_WRITE_DR5, "write_dr5" }, \
- { SVM_EXIT_WRITE_DR7, "write_dr7" }, \
- { SVM_EXIT_EXCP_BASE + DB_VECTOR, "DB excp" }, \
- { SVM_EXIT_EXCP_BASE + BP_VECTOR, "BP excp" }, \
- { SVM_EXIT_EXCP_BASE + UD_VECTOR, "UD excp" }, \
- { SVM_EXIT_EXCP_BASE + PF_VECTOR, "PF excp" }, \
- { SVM_EXIT_EXCP_BASE + NM_VECTOR, "NM excp" }, \
- { SVM_EXIT_EXCP_BASE + MC_VECTOR, "MC excp" }, \
- { SVM_EXIT_INTR, "interrupt" }, \
- { SVM_EXIT_NMI, "nmi" }, \
- { SVM_EXIT_SMI, "smi" }, \
- { SVM_EXIT_INIT, "init" }, \
- { SVM_EXIT_VINTR, "vintr" }, \
- { SVM_EXIT_CPUID, "cpuid" }, \
- { SVM_EXIT_INVD, "invd" }, \
- { SVM_EXIT_HLT, "hlt" }, \
- { SVM_EXIT_INVLPG, "invlpg" }, \
- { SVM_EXIT_INVLPGA, "invlpga" }, \
- { SVM_EXIT_IOIO, "io" }, \
- { SVM_EXIT_MSR, "msr" }, \
- { SVM_EXIT_TASK_SWITCH, "task_switch" }, \
- { SVM_EXIT_SHUTDOWN, "shutdown" }, \
- { SVM_EXIT_VMRUN, "vmrun" }, \
- { SVM_EXIT_VMMCALL, "hypercall" }, \
- { SVM_EXIT_VMLOAD, "vmload" }, \
- { SVM_EXIT_VMSAVE, "vmsave" }, \
- { SVM_EXIT_STGI, "stgi" }, \
- { SVM_EXIT_CLGI, "clgi" }, \
- { SVM_EXIT_SKINIT, "skinit" }, \
- { SVM_EXIT_WBINVD, "wbinvd" }, \
- { SVM_EXIT_MONITOR, "monitor" }, \
- { SVM_EXIT_MWAIT, "mwait" }, \
- { SVM_EXIT_XSETBV, "xsetbv" }, \
- { SVM_EXIT_NPF, "npf" }
-
/*
* Tracepoint for kvm guest exit:
*/
--
1.7.7.6
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v3 2/3] KVM: x86: add tracepoints to trace mmio begin and complete
2012-02-07 13:06 [PATCH v3 0/3] KVM: perf: a smart tool to analyse kvm events Xiao Guangrong
2012-02-07 13:07 ` [PATCH 1/3] KVM: x86: export svm/vmx exit-code definitions to userspace Xiao Guangrong
@ 2012-02-07 13:08 ` Xiao Guangrong
2012-02-07 13:08 ` [PATCH v3 3/3] KVM: perf: kvm events analysis tool Xiao Guangrong
2 siblings, 0 replies; 9+ messages in thread
From: Xiao Guangrong @ 2012-02-07 13:08 UTC (permalink / raw)
To: Xiao Guangrong
Cc: Avi Kivity, Marcelo Tosatti, Ingo Molnar,
Arnaldo Carvalho de Melo, Stefan Hajnoczi, LKML, KVM
'perf kvm-events' will use kvm_exit and kvm_mmio(read...) to calculate
mmio read emulated time for the old kernel, in order to trace mmio read
event more exactly, we add kvm_mmio_begin to trace the time when mmio read
begins
Also, add kvm_mmio_done to trace the time when mmio/pio is completed
Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
---
arch/x86/kvm/x86.c | 21 ++++++++++++++-------
include/trace/events/kvm.h | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 2bd77a3..6750978 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3766,9 +3766,12 @@ mmio:
/*
* Is this MMIO handled locally?
*/
+ trace_kvm_mmio_begin(vcpu->vcpu_id, write, gpa);
handled = ops->read_write_mmio(vcpu, gpa, bytes, val);
- if (handled == bytes)
+ if (handled == bytes) {
+ trace_kvm_mmio_done(vcpu->vcpu_id);
return X86EMUL_CONTINUE;
+ }
gpa += handled;
bytes -= handled;
@@ -3934,6 +3937,7 @@ static int emulator_pio_in_out(struct kvm_vcpu *vcpu, int size,
vcpu->arch.pio.size = size;
if (!kernel_pio(vcpu, vcpu->arch.pio_data)) {
+ trace_kvm_mmio_done(vcpu->vcpu_id);
vcpu->arch.pio.count = 0;
return 1;
}
@@ -4544,9 +4548,7 @@ restart:
inject_emulated_exception(vcpu);
r = EMULATE_DONE;
} else if (vcpu->arch.pio.count) {
- if (!vcpu->arch.pio.in)
- vcpu->arch.pio.count = 0;
- else
+ if (vcpu->arch.pio.in)
writeback = false;
r = EMULATE_DO_MMIO;
} else if (vcpu->mmio_needed) {
@@ -4577,8 +4579,6 @@ int kvm_fast_pio_out(struct kvm_vcpu *vcpu, int size, unsigned short port)
unsigned long val = kvm_register_read(vcpu, VCPU_REGS_RAX);
int ret = emulator_pio_out_emulated(&vcpu->arch.emulate_ctxt,
size, port, &val, 1);
- /* do not return to emulator after return from userspace */
- vcpu->arch.pio.count = 0;
return ret;
}
EXPORT_SYMBOL_GPL(kvm_fast_pio_out);
@@ -5407,6 +5407,11 @@ static int complete_mmio(struct kvm_vcpu *vcpu)
if (!(vcpu->arch.pio.count || vcpu->mmio_needed))
return 1;
+ if (vcpu->arch.pio.count && !vcpu->arch.pio.in) {
+ vcpu->arch.pio.count = 0;
+ goto exit;
+ }
+
if (vcpu->mmio_needed) {
vcpu->mmio_needed = 0;
if (!vcpu->mmio_is_write)
@@ -5423,7 +5428,7 @@ static int complete_mmio(struct kvm_vcpu *vcpu)
return 0;
}
if (vcpu->mmio_is_write)
- return 1;
+ goto exit;
vcpu->mmio_read_completed = 1;
}
vcpu->srcu_idx = srcu_read_lock(&vcpu->kvm->srcu);
@@ -5431,6 +5436,8 @@ static int complete_mmio(struct kvm_vcpu *vcpu)
srcu_read_unlock(&vcpu->kvm->srcu, vcpu->srcu_idx);
if (r != EMULATE_DONE)
return 0;
+exit:
+ trace_kvm_mmio_done(vcpu->vcpu_id);
return 1;
}
diff --git a/include/trace/events/kvm.h b/include/trace/events/kvm.h
index 46e3cd8..16c8a6d 100644
--- a/include/trace/events/kvm.h
+++ b/include/trace/events/kvm.h
@@ -174,6 +174,43 @@ TRACE_EVENT(kvm_mmio,
__entry->len, __entry->gpa, __entry->val)
);
+TRACE_EVENT(kvm_mmio_begin,
+ TP_PROTO(unsigned int vcpu_id, bool rw, u64 gpa),
+ TP_ARGS(vcpu_id, rw, gpa),
+
+ TP_STRUCT__entry(
+ __field(unsigned int, vcpu_id)
+ __field(int, type)
+ __field(u64, gpa)
+ ),
+
+ TP_fast_assign(
+ __entry->vcpu_id = vcpu_id;
+ __entry->type = rw ? KVM_TRACE_MMIO_WRITE :
+ KVM_TRACE_MMIO_READ;
+ __entry->gpa = gpa;
+ ),
+
+ TP_printk("vcpu %u mmio %s gpa 0x%llx", __entry->vcpu_id,
+ __print_symbolic(__entry->type, kvm_trace_symbol_mmio),
+ __entry->gpa)
+);
+
+TRACE_EVENT(kvm_mmio_done,
+ TP_PROTO(unsigned int vcpu_id),
+ TP_ARGS(vcpu_id),
+
+ TP_STRUCT__entry(
+ __field( unsigned int, vcpu_id )
+ ),
+
+ TP_fast_assign(
+ __entry->vcpu_id = vcpu_id;
+ ),
+
+ TP_printk("vcpu %u", __entry->vcpu_id)
+);
+
#define kvm_fpu_load_symbol \
{0, "unload"}, \
{1, "load"}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v3 3/3] KVM: perf: kvm events analysis tool
2012-02-07 13:06 [PATCH v3 0/3] KVM: perf: a smart tool to analyse kvm events Xiao Guangrong
2012-02-07 13:07 ` [PATCH 1/3] KVM: x86: export svm/vmx exit-code definitions to userspace Xiao Guangrong
2012-02-07 13:08 ` [PATCH v3 2/3] KVM: x86: add tracepoints to trace mmio begin and complete Xiao Guangrong
@ 2012-02-07 13:08 ` Xiao Guangrong
2012-02-07 17:55 ` David Ahern
2 siblings, 1 reply; 9+ messages in thread
From: Xiao Guangrong @ 2012-02-07 13:08 UTC (permalink / raw)
To: Xiao Guangrong
Cc: Avi Kivity, Marcelo Tosatti, Ingo Molnar,
Arnaldo Carvalho de Melo, Stefan Hajnoczi, LKML, KVM
Add 'perf kvm-events' support to analyze kvm vmexit/mmio/ioport smartly
Usage:
- trace kvm events:
perf kvm-events record, or, if other tracepoints are also
interesting, we can append the events like this:
perf kvm-events record -e timer:*
- show the result:
perf kvm-events report
Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
---
tools/perf/Documentation/perf-kvm-events.txt | 56 ++
tools/perf/Makefile | 1 +
tools/perf/builtin-kvm-events.c | 911 ++++++++++++++++++++++++++
tools/perf/builtin.h | 1 +
tools/perf/command-list.txt | 1 +
tools/perf/perf.c | 1 +
6 files changed, 971 insertions(+), 0 deletions(-)
create mode 100644 tools/perf/Documentation/perf-kvm-events.txt
create mode 100644 tools/perf/builtin-kvm-events.c
diff --git a/tools/perf/Documentation/perf-kvm-events.txt b/tools/perf/Documentation/perf-kvm-events.txt
new file mode 100644
index 0000000..d46789a
--- /dev/null
+++ b/tools/perf/Documentation/perf-kvm-events.txt
@@ -0,0 +1,56 @@
+perf-kvm-events(1)
+============
+
+NAME
+----
+perf-kvm-events - Analyze kvm events
+
+SYNOPSIS
+--------
+[verse]
+'perf kvm-events' {record|report}
+
+DESCRIPTION
+-----------
+You can analyze some crucial kvm events and statistics with this
+'perf kvm-events' command. Currently, vmexit, mmio and ioport events
+are supported.
+
+ 'perf kvm-events record <command>' records kvm events(vmexit,
+ mmio and ioport) and the events between start and end <command>.
+ And this command produces the file "perf.data" which contains
+ tracing results of kvm events.
+
+ 'perf kvm-events report' reports statistical data which includes
+ events handled time, samples, and so on.
+
+COMMON OPTIONS
+--------------
+
+-i::
+--input=<file>::
+ Input file name. (default: perf.data unless stdin is a fifo)
+
+-v::
+--verbose::
+ Be more verbose (show symbol address, etc).
+
+-D::
+--dump-raw-trace::
+ Dump raw trace in ASCII.
+
+REPORT OPTIONS
+--------------
+--vcpu=<value>::
+ analyze events which occures on this vcpu
+
+--events=<value>::
+ events to be analyzed. Possible values: vmexit, mmio, ioport.
+-k::
+--key=<value>::
+ Sorting key. Possible values: sample(default, sort by samples number),
+time(sort by average time).
+
+SEE ALSO
+--------
+linkperf:perf[1]
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index ac86d67..ee43451 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -382,6 +382,7 @@ BUILTIN_OBJS += $(OUTPUT)builtin-probe.o
BUILTIN_OBJS += $(OUTPUT)builtin-kmem.o
BUILTIN_OBJS += $(OUTPUT)builtin-lock.o
BUILTIN_OBJS += $(OUTPUT)builtin-kvm.o
+BUILTIN_OBJS += $(OUTPUT)builtin-kvm-events.o
BUILTIN_OBJS += $(OUTPUT)builtin-test.o
BUILTIN_OBJS += $(OUTPUT)builtin-inject.o
diff --git a/tools/perf/builtin-kvm-events.c b/tools/perf/builtin-kvm-events.c
new file mode 100644
index 0000000..8388c54
--- /dev/null
+++ b/tools/perf/builtin-kvm-events.c
@@ -0,0 +1,911 @@
+#include "builtin.h"
+#include "perf.h"
+#include "util/util.h"
+#include "util/cache.h"
+#include "util/symbol.h"
+#include "util/thread.h"
+#include "util/header.h"
+#include "util/parse-options.h"
+#include "util/trace-event.h"
+#include "util/debug.h"
+#include "util/debugfs.h"
+#include "util/session.h"
+#include "util/tool.h"
+
+#include <math.h>
+
+#include <linux/kvm.h>
+
+#include "../../arch/x86/include/asm/svm.h"
+#include "../../arch/x86/include/asm/vmx.h"
+#include "../../arch/x86/include/asm/kvm_host.h"
+
+struct event_key {
+ #define INVALID_KEY (~0ULL)
+ u64 key;
+ int info;
+};
+
+struct kvm_events_ops {
+ bool (*is_begin_event)(struct event *event, void *data,
+ struct event_key *key);
+ bool (*is_end_event)(struct event *event, void *data,
+ struct event_key *key);
+ void (*decode_key)(struct event_key *key, char decode[20]);
+ const char *name;
+};
+
+static void exit_event_get_key(struct event *event, void *data,
+ struct event_key *key)
+{
+ key->info = 0;
+ key->key = raw_field_value(event, "exit_reason", data);
+}
+
+static bool kvm_exit_event(struct event *event)
+{
+ return !strcmp(event->name, "kvm_exit");
+}
+
+static bool exit_event_begin(struct event *event, void *data,
+ struct event_key *key)
+{
+ if (kvm_exit_event(event)) {
+ exit_event_get_key(event, data, key);
+ return true;
+ }
+
+ return false;
+}
+
+static bool kvm_entry_event(struct event *event)
+{
+ return !strcmp(event->name, "kvm_entry");
+}
+
+static bool exit_event_end(struct event *event, void *data __unused,
+ struct event_key *key __unused)
+{
+ return kvm_entry_event(event);
+}
+
+struct exit_reasons_table {
+ unsigned long exit_code;
+ const char *reason;
+};
+
+struct exit_reasons_table vmx_exit_reasons[] = {
+ VMX_EXIT_REASONS
+};
+
+struct exit_reasons_table svm_exit_reasons[] = {
+ SVM_EXIT_REASONS
+};
+
+static int get_cpu_isa(void)
+{
+ FILE *f;
+ char line[512], vendor[64];
+ int ret;
+
+ f = fopen("/proc/cpuinfo", "r");
+ if (!f)
+ die("/proc/cpuinfo does not exist.\n");
+
+ while (fgets(line, sizeof(line), f))
+ if (sscanf(line, "vendor_id : %s", vendor) > 0) {
+ if (strstr(vendor, "Intel"))
+ ret = 1;
+ else if (strstr(vendor, "AMD"))
+ ret = 0;
+ else
+ break;
+ goto exit;
+ }
+
+ die("CPU vendor is unknown.\n");
+exit:
+ fclose(f);
+ return ret;
+}
+
+static const char *get_exit_reason(u64 exit_code)
+{
+ static int isa = -1;
+ int table_size = ARRAY_SIZE(svm_exit_reasons);
+ struct exit_reasons_table *table = svm_exit_reasons;
+
+ /*
+ * Do not use 'isa' recorded in kvm_exit tracepoint since it is not
+ * traced in the old kernel.
+ */
+ if (isa < 0)
+ isa = get_cpu_isa();
+
+ if (isa == 1) {
+ table = vmx_exit_reasons;
+ table_size = ARRAY_SIZE(vmx_exit_reasons);
+ }
+
+ while (table_size--) {
+ if (table->exit_code == exit_code)
+ return table->reason;
+ table++;
+ }
+
+ die("unknown kvm exit code:%ld on %s\n", exit_code,
+ isa ? "VMX" : "SVM");
+}
+
+static void exit_event_decode_key(struct event_key *key, char decode[20])
+{
+ const char *exit_reason = get_exit_reason(key->key);
+
+ snprintf(decode, 20, "%s", exit_reason);
+}
+
+static struct kvm_events_ops exit_events = {
+ .is_begin_event = exit_event_begin,
+ .is_end_event = exit_event_end,
+ .decode_key = exit_event_decode_key,
+ .name = "VM-EXIT"
+};
+
+/*
+ * For the old kernel, we treat:
+ * the time of MMIO write: kvm_mmio(KVM_TRACE_MMIO_WRITE...) -> kvm_entry
+ * the time of MMIO read: kvm_exit -> kvm_mmio(KVM_TRACE_MMIO_READ...).
+ *
+ * For the new kernel, we use kvm_mmio_begin and kvm_mmio_done to make
+ * things better.
+ */
+static void mmio_event_get_key(struct event *event, void *data,
+ struct event_key *key)
+{
+ key->key = raw_field_value(event, "gpa", data);
+ key->info = raw_field_value(event, "type", data);
+}
+
+#define KVM_TRACE_MMIO_READ_UNSATISFIED 0
+#define KVM_TRACE_MMIO_READ 1
+#define KVM_TRACE_MMIO_WRITE 2
+
+static bool kvm_mmio_done_event(struct event *event)
+{
+ return !strcmp(event->name, "kvm_mmio_done");
+}
+
+static bool mmio_event_begin(struct event *event, void *data,
+ struct event_key *key)
+{
+ /* MMIO read begin in old kernel. */
+ if (kvm_exit_event(event))
+ return true;
+
+ /* MMIO write begin in old kernel. */
+ if (!strcmp(event->name, "kvm_mmio") &&
+ raw_field_value(event, "type", data) == KVM_TRACE_MMIO_WRITE) {
+ mmio_event_get_key(event, data, key);
+ return true;
+ }
+
+ /* MMIO read/write begin in new kernel. */
+ if (!strcmp(event->name, "kvm_mmio_begin")) {
+ mmio_event_get_key(event, data, key);
+ return true;
+ }
+
+ return false;
+}
+
+static bool mmio_event_end(struct event *event, void *data,
+ struct event_key *key)
+{
+ /* MMIO write end in old kernel. */
+ if (kvm_entry_event(event))
+ return true;
+
+ /* MMIO read end in the old kernel.*/
+ if (!strcmp(event->name, "kvm_mmio") &&
+ raw_field_value(event, "type", data) == KVM_TRACE_MMIO_READ) {
+ mmio_event_get_key(event, data, key);
+ return true;
+ }
+
+ /* MMIO read/write end event in the new kernel.*/
+ return kvm_mmio_done_event(event);
+}
+
+static void mmio_event_decode_key(struct event_key *key, char decode[20])
+{
+ snprintf(decode, 20, "%#lx:%s", key->key,
+ key->info == KVM_TRACE_MMIO_WRITE ? "W" : "R");
+}
+
+static struct kvm_events_ops mmio_events = {
+ .is_begin_event = mmio_event_begin,
+ .is_end_event = mmio_event_end,
+ .decode_key = mmio_event_decode_key,
+ .name = "MMIO Access"
+};
+
+/*
+ * For the old kernel, the time of emulation pio access is from kvm_pio to
+ * kvm_entry. In the new kernel, the end time is indicated by kvm_mmio_done.
+ */
+static void ioport_event_get_key(struct event *event, void *data,
+ struct event_key *key)
+{
+ key->key = raw_field_value(event, "port", data);
+ key->info = raw_field_value(event, "rw", data);
+}
+
+static bool ioport_event_begin(struct event *event, void *data,
+ struct event_key *key)
+{
+ if (!strcmp(event->name, "kvm_pio")) {
+ ioport_event_get_key(event, data, key);
+ return true;
+ }
+
+ return false;
+}
+
+static bool ioport_event_end(struct event *event, void *data __unused,
+ struct event_key *key __unused)
+{
+ if (kvm_entry_event(event))
+ return true;
+
+ return kvm_mmio_done_event(event);
+}
+
+static void ioport_event_decode_key(struct event_key *key, char decode[20])
+{
+ snprintf(decode, 20, "%#lx:%s", key->key, key->info ? "POUT" : "PIN");
+}
+
+static struct kvm_events_ops ioport_events = {
+ .is_begin_event = ioport_event_begin,
+ .is_end_event = ioport_event_end,
+ .decode_key = ioport_event_decode_key,
+ .name = "IO Port Access"
+};
+
+static const char *report_event = "vmexit";
+struct kvm_events_ops *events_ops;
+
+static void register_kvm_events_ops(void)
+{
+ if (!strcmp(report_event, "vmexit"))
+ events_ops = &exit_events;
+ else if (!strcmp(report_event, "mmio"))
+ events_ops = &mmio_events;
+ else if (!strcmp(report_event, "ioport"))
+ events_ops = &ioport_events;
+ else
+ die("Unknown report event:%s\n", report_event);
+}
+
+struct event_stats {
+ u64 count;
+ u64 time;
+
+ /* used to calculate stddev. */
+ double mean;
+ double M2;
+};
+
+struct kvm_event {
+ struct list_head hash_entry;
+ struct rb_node rb;
+
+ struct event_key key;
+
+ struct event_stats total;
+ struct event_stats vcpu[0]; /* max vcpus */
+};
+
+struct {
+ u64 start_time;
+ struct kvm_event *last_event;
+} *vcpu_event_record;
+
+#define EVENTS_BITS 12
+#define EVENTS_CACHE_SIZE (1UL << EVENTS_BITS)
+
+static int kvm_max_vcpus;
+static u64 total_time;
+static u64 total_count;
+static struct list_head kvm_events_cache[EVENTS_CACHE_SIZE];
+
+#ifndef KVM_CAP_MAX_VCPUS
+#define KVM_CAP_MAX_VCPUS 66
+#endif
+
+static int kvm_max_cpus(void)
+{
+ int kvm_fd, ret;
+
+ kvm_fd = open("/dev/kvm", O_RDWR);
+ if (kvm_fd < 0)
+ die("KVM is not available.\n");
+
+ ret = ioctl(kvm_fd, KVM_CHECK_EXTENSION, KVM_CAP_MAX_VCPUS);
+
+ if (ret <= 0)
+ ret = ioctl(kvm_fd, KVM_CHECK_EXTENSION, KVM_CAP_NR_VCPUS);
+
+ if (ret <= 0)
+ die("inquiry max vcpu fail.\n");
+
+ return ret;
+}
+
+static void init_kvm_event_record(void)
+{
+ int i;
+
+ kvm_max_vcpus = kvm_max_cpus();
+
+ vcpu_event_record = zalloc(sizeof(*vcpu_event_record) * kvm_max_vcpus);
+ if (!vcpu_event_record)
+ die("zalloc.\n");
+
+ for (i = 0; i < (int)EVENTS_CACHE_SIZE; i++)
+ INIT_LIST_HEAD(&kvm_events_cache[i]);
+}
+
+static int kvm_events_hash_fn(u64 key)
+{
+ return key & (EVENTS_CACHE_SIZE - 1);
+}
+
+static struct kvm_event *kvm_alloc_init_event(struct event_key *key)
+{
+ struct kvm_event *event;
+
+ event = zalloc(sizeof(*event) +
+ sizeof(struct event_stats) * kvm_max_vcpus);
+
+ if (!event)
+ die("Not enough memory\n");
+
+ event->key = *key;
+ return event;
+}
+
+static struct kvm_event *find_create_kvm_event(struct event_key *key)
+{
+ struct kvm_event *event;
+ struct list_head *head;
+
+ BUG_ON(key->key == INVALID_KEY);
+
+ head = &kvm_events_cache[kvm_events_hash_fn(key->key)];
+ list_for_each_entry(event, head, hash_entry)
+ if (event->key.key == key->key && event->key.info == key->info)
+ return event;
+
+ event = kvm_alloc_init_event(key);
+ list_add(&event->hash_entry, head);
+ return event;
+}
+
+#define VCPU_ID_BITS 6
+#define VCPU_ID_CACHE_SIZE (1UL << VCPU_ID_BITS)
+
+struct kvm_tid_vcpu_id {
+ struct list_head hash_entry;
+
+ u32 tid;
+ int vcpu_id;
+};
+
+static struct list_head kvm_vcpu_id_cache[VCPU_ID_CACHE_SIZE];
+
+static int kvm_tid_hash_fn(u32 tid)
+{
+ return tid & (VCPU_ID_CACHE_SIZE - 1);
+}
+
+static int get_vcpu_id(u32 tid)
+{
+ struct list_head *head;
+ struct kvm_tid_vcpu_id *tid2pid;
+
+ head = &kvm_vcpu_id_cache[kvm_tid_hash_fn(tid)];
+ list_for_each_entry(tid2pid, head, hash_entry)
+ if (tid2pid->tid == tid)
+ return tid2pid->vcpu_id;
+
+ return -1;
+}
+
+static int get_record_vcpu_id(struct event *event, u32 tid, void *data)
+{
+ struct list_head *head;
+ struct kvm_tid_vcpu_id *tid2pid;
+ int vcpu_id;
+
+ vcpu_id = get_vcpu_id(tid);
+ if (vcpu_id >= 0)
+ return vcpu_id;
+
+ /* Only kvm_entry records vcpu id. */
+ if (!kvm_entry_event(event))
+ return -1;
+
+ head = &kvm_vcpu_id_cache[kvm_tid_hash_fn(tid)];
+
+ tid2pid = zalloc(sizeof(*tid2pid));
+ if (!tid2pid)
+ die("Not enough memory\n");
+
+ tid2pid->tid = tid;
+ vcpu_id = tid2pid->vcpu_id = raw_field_value(event, "vcpu_id", data);
+ list_add(&tid2pid->hash_entry, head);
+
+ return vcpu_id;
+}
+
+static void init_kvm_tid_to_pid(void)
+{
+ int i;
+
+ for (i = 0; i < (int)VCPU_ID_CACHE_SIZE; i++)
+ INIT_LIST_HEAD(&kvm_vcpu_id_cache[i]);
+}
+
+static void handle_begin_event(struct event_key *key, int vcpu_id,
+ u64 timestamp)
+{
+ struct kvm_event *event = NULL;
+
+ if (key->key != INVALID_KEY)
+ event = find_create_kvm_event(key);
+
+ vcpu_event_record[vcpu_id].last_event = event;
+ vcpu_event_record[vcpu_id].start_time = timestamp;
+}
+
+static void update_event_stats(struct event_stats *stats, u64 time_diff)
+{
+ double delta;
+
+ stats->count++;
+ stats->time += time_diff;
+
+ delta = time_diff - stats->mean;
+ stats->mean += delta / stats->count;
+ stats->M2 += delta*(time_diff - stats->mean);
+}
+
+static double event_stats_stddev(int vcpu_id, struct kvm_event *event)
+{
+ struct event_stats *stats = &event->total;
+ double variance, variance_mean, stddev;
+
+ if (vcpu_id != -1)
+ stats = &event->vcpu[vcpu_id];
+
+ BUG_ON(!stats->count);
+
+ variance = stats->M2 / (stats->count - 1);
+ variance_mean = variance / stats->count;
+ stddev = sqrt(variance_mean);
+
+ return stddev * 100 / stats->mean;
+}
+
+static void update_kvm_event(struct kvm_event *event, int vcpu_id,
+ u64 time_diff)
+{
+ update_event_stats(&event->total, time_diff);
+ update_event_stats(&event->vcpu[vcpu_id], time_diff);
+}
+
+static void handle_end_event(struct event_key *key, int vcpu_id, u64 timestamp)
+{
+ struct kvm_event *event;
+ u64 time_begin, time_diff;
+
+ event = vcpu_event_record[vcpu_id].last_event;
+ time_begin = vcpu_event_record[vcpu_id].start_time;
+
+ /* The begin event is not caught. */
+ if (!time_begin)
+ return;
+
+ /* Both begin and end events did not get the key. */
+ if (!event && key->key == INVALID_KEY)
+ return;
+
+ if (!event)
+ event = find_create_kvm_event(key);
+
+ vcpu_event_record[vcpu_id].last_event = NULL;
+ vcpu_event_record[vcpu_id].start_time = 0;
+
+ BUG_ON(timestamp < time_begin);
+
+ time_diff = timestamp - time_begin;
+ update_kvm_event(event, vcpu_id, time_diff);
+}
+
+static void handle_kvm_event(struct event *event, void *data, u64 timestamp,
+ u32 tid)
+{
+ struct event_key key = {.key = INVALID_KEY};
+ int vcpu_id = get_record_vcpu_id(event, tid, data);
+
+ if (vcpu_id < 0)
+ return;
+
+ if (events_ops->is_begin_event(event, data, &key))
+ return handle_begin_event(&key, vcpu_id, timestamp);
+
+ if (events_ops->is_end_event(event, data, &key))
+ return handle_end_event(&key, vcpu_id, timestamp);
+}
+
+typedef int (*key_cmp_fun)(struct kvm_event*, struct kvm_event*, int);
+struct kvm_event_key {
+ const char *name;
+ key_cmp_fun key;
+};
+
+static int trace_vcpu = -1;
+#define GET_EVENT_KEY(member) \
+static u64 get_event_ ##member(struct kvm_event *event, int vcpu) \
+{ \
+ if (vcpu == -1) \
+ return event->total.member; \
+ \
+ return event->vcpu[vcpu].member; \
+}
+
+#define COMPARE_EVENT_KEY(member) \
+GET_EVENT_KEY(member) \
+static int compare_kvm_event_ ## member(struct kvm_event *one, \
+ struct kvm_event *two, int vcpu)\
+{ \
+ return get_event_ ##member(one, vcpu) > \
+ get_event_ ##member(two, vcpu); \
+}
+
+GET_EVENT_KEY(time);
+COMPARE_EVENT_KEY(count);
+COMPARE_EVENT_KEY(mean);
+
+#define DEF_SORT_NAME_KEY(name, compare_key) \
+ { #name, compare_kvm_event_ ## compare_key }
+
+static struct kvm_event_key keys[] = {
+ DEF_SORT_NAME_KEY(sample, count),
+ DEF_SORT_NAME_KEY(time, mean),
+ { NULL, NULL }
+};
+
+static const char *sort_key = "sample";
+static key_cmp_fun compare;
+
+static void select_key(void)
+{
+ int i;
+
+ for (i = 0; keys[i].name; i++) {
+ if (!strcmp(keys[i].name, sort_key)) {
+ compare = keys[i].key;
+ return;
+ }
+ }
+
+ die("Unknown compare key:%s\n", sort_key);
+}
+
+static struct rb_root result;
+static void insert_to_result(struct kvm_event *event, key_cmp_fun bigger,
+ int vcpu)
+{
+ struct rb_node **rb = &result.rb_node;
+ struct rb_node *parent = NULL;
+ struct kvm_event *p;
+
+ while (*rb) {
+ p = container_of(*rb, struct kvm_event, rb);
+ parent = *rb;
+
+ if (bigger(event, p, vcpu))
+ rb = &(*rb)->rb_left;
+ else
+ rb = &(*rb)->rb_right;
+ }
+
+ rb_link_node(&event->rb, parent, rb);
+ rb_insert_color(&event->rb, &result);
+}
+
+static void update_total_count(struct kvm_event *event, int vcpu)
+{
+ total_count += get_event_count(event, vcpu);
+ total_time += get_event_time(event, vcpu);
+}
+
+static bool event_is_valid(struct kvm_event *event, int vcpu)
+{
+ return get_event_count(event, vcpu);
+}
+
+static void sort_result(int vcpu)
+{
+ unsigned int i;
+ struct kvm_event *event;
+
+ for (i = 0; i < EVENTS_CACHE_SIZE; i++)
+ list_for_each_entry(event, &kvm_events_cache[i], hash_entry)
+ if (event_is_valid(event, vcpu)) {
+ update_total_count(event, vcpu);
+ insert_to_result(event, compare, vcpu);
+ }
+}
+
+/* returns left most element of result, and erase it */
+static struct kvm_event *pop_from_result(void)
+{
+ struct rb_node *node = result.rb_node;
+
+ if (!node)
+ return NULL;
+
+ while (node->rb_left)
+ node = node->rb_left;
+
+ rb_erase(node, &result);
+ return container_of(node, struct kvm_event, rb);
+}
+
+static void print_vcpu_info(int vcpu)
+{
+ pr_info("Analyze events for ");
+
+ if (vcpu == -1)
+ pr_info("all VCPUs:\n\n");
+ else
+ pr_info("VCPU %d:\n\n", vcpu);
+}
+
+static void print_result(int vcpu)
+{
+ char decode[20];
+ struct kvm_event *event;
+
+ pr_info("\n\n");
+ print_vcpu_info(vcpu);
+ pr_info("%20s ", events_ops->name);
+ pr_info("%10s ", "Samples");
+ pr_info("%9s ", "Samples%");
+
+ pr_info("%9s ", "Time%");
+ pr_info("%16s ", "Avg time");
+ pr_info("\n\n");
+
+ while ((event = pop_from_result())) {
+ u64 ecount, etime;
+
+ ecount = get_event_count(event, vcpu);
+ etime = get_event_time(event, vcpu);
+
+ events_ops->decode_key(&event->key, decode);
+ pr_info("%20s ", decode);
+ pr_info("%10lu ", ecount);
+ pr_info("%8.2f%% ", (double)ecount / total_count * 100);
+ pr_info("%8.2f%% ", (double)etime / total_time * 100);
+ pr_info("%9.2fus ( +-%7.2f%% )", (double)etime / ecount/1e3,
+ event_stats_stddev(trace_vcpu, event));
+ pr_info("\n");
+ }
+
+ pr_info("\nTotal Samples:%ld, Total events handled time:%.2fus.\n\n",
+ total_count, total_time / 1e3);
+}
+
+static void process_raw_event(void *data, int __unused cpu, u64 timestamp,
+ u32 tid)
+{
+ struct event *event;
+ int type;
+
+ type = trace_parse_common_type(data);
+ event = trace_find_event(type);
+
+ return handle_kvm_event(event, data, timestamp, tid);
+}
+
+static int process_sample_event(struct perf_tool *tool __used,
+ union perf_event *event,
+ struct perf_sample *sample,
+ struct perf_evsel *evsel __used,
+ struct machine *machine)
+{
+ struct thread *thread = machine__findnew_thread(machine, sample->tid);
+
+ if (thread == NULL) {
+ pr_debug("problem processing %d event, skipping it.\n",
+ event->header.type);
+ return -1;
+ }
+
+ process_raw_event(sample->raw_data, sample->cpu, sample->time,
+ sample->tid);
+
+ return 0;
+}
+
+static struct perf_tool eops = {
+ .sample = process_sample_event,
+ .comm = perf_event__process_comm,
+ .ordered_samples = true,
+};
+
+static char const *input_name = "perf.data";
+
+static int read_events(void)
+{
+ struct perf_session *session;
+
+ session = perf_session__new(input_name, O_RDONLY, 0, false, &eops);
+ if (!session)
+ die("Initializing perf session failed\n");
+
+ if (!perf_session__has_traces(session, "kvm record"))
+ return -1;
+
+ return perf_session__process_events(session, &eops);
+}
+
+static void verify_vcpu(int vcpu)
+{
+ if (vcpu != -1 && (vcpu > kvm_max_vcpus || vcpu < 0))
+ die("Unknown vcpu:%d.\n", vcpu);
+
+}
+
+static int kvm_events_report(int vcpu)
+{
+ init_kvm_event_record();
+ init_kvm_tid_to_pid();
+ verify_vcpu(vcpu);
+ select_key();
+ register_kvm_events_ops();
+ setup_pager();
+ read_events();
+ sort_result(vcpu);
+ print_result(vcpu);
+ return 0;
+}
+
+static const char * const record_args[] = {
+ "record",
+ "-a",
+ "-R",
+ "-f",
+ "-m", "1024",
+ "-c", "1",
+ "-e", "kvm:kvm_entry",
+ "-e", "kvm:kvm_exit",
+ "-e", "kvm:kvm_mmio",
+ "-e", "kvm:kvm_pio",
+};
+
+static const char * const new_event[] = {
+ "kvm_mmio_begin",
+ "kvm_mmio_done"
+};
+
+static bool kvm_events_exist(const char *event)
+{
+ char evt_path[MAXPATHLEN];
+ int fd;
+
+ snprintf(evt_path, MAXPATHLEN, "%s/kvm/%s/id", tracing_events_path,
+ event);
+
+ fd = open(evt_path, O_RDONLY);
+
+ if (fd < 0)
+ return false;
+
+ close(fd);
+
+ return true;
+}
+
+static int kvm_events_record(int argc, const char **argv)
+{
+ unsigned int rec_argc, i, j;
+ const char **rec_argv;
+
+ rec_argc = ARRAY_SIZE(record_args) + argc - 1;
+ rec_argc += ARRAY_SIZE(new_event) * 2;
+ rec_argv = calloc(rec_argc + 1, sizeof(char *));
+
+ if (rec_argv == NULL)
+ return -ENOMEM;
+
+ for (i = 0; i < ARRAY_SIZE(record_args); i++)
+ rec_argv[i] = strdup(record_args[i]);
+
+ for (j = 0; j < ARRAY_SIZE(new_event); j++)
+ if (kvm_events_exist(new_event[j])) {
+ char event[256];
+
+ sprintf(event, "kvm:%s", new_event[j]);
+
+ rec_argv[i++] = strdup("-e");
+ rec_argv[i++] = strdup(event);
+ }
+
+ for (j = 1; j < (unsigned int)argc; j++, i++)
+ rec_argv[i] = argv[j];
+
+ return cmd_record(i, rec_argv, NULL);
+}
+
+static const char * const kvm_events_report_usage[] = {
+ "perf kvm events report [<options>]",
+ NULL
+};
+
+static const struct option kvm_events_report_options[] = {
+ OPT_STRING(0, "event", &report_event, "reprot event",
+ "event for reporting: vmexit, mmio, ioport"),
+ OPT_INTEGER(0, "vcpu", &trace_vcpu,
+ "vcpu id to report"),
+ OPT_STRING('k', "key", &sort_key, "sort-key",
+ "key for sorting: sample(sort by samples number)"
+ " time (sort by avg time)"),
+ OPT_END()
+};
+
+static const char * const kvm_events_usage[] = {
+ "perf kvm events [<options>] {record|report}",
+ NULL
+};
+
+static const struct option kvm_events_options[] = {
+ OPT_STRING('i', "input", &input_name, "file", "input file name"),
+ OPT_INCR('v', "verbose", &verbose,
+ "be more verbose (show symbol address, etc)"),
+ OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,
+ "dump raw trace in ASCII"),
+ OPT_END()
+};
+
+int cmd_kvm_events(int argc, const char **argv, const char *prefix __used)
+{
+ argc = parse_options(argc, argv, kvm_events_options, kvm_events_usage,
+ PARSE_OPT_STOP_AT_NON_OPTION);
+ if (!argc)
+ usage_with_options(kvm_events_usage, kvm_events_options);
+
+ symbol__init();
+
+ if (!strncmp(argv[0], "rec", 3))
+ return kvm_events_record(argc, argv);
+
+ if (!strncmp(argv[0], "report", 6)) {
+ if (argc) {
+ argc = parse_options(argc, argv,
+ kvm_events_report_options,
+ kvm_events_report_usage, 0);
+ if (argc)
+ usage_with_options(kvm_events_report_usage,
+ kvm_events_report_options);
+ }
+ return kvm_events_report(trace_vcpu);
+ }
+
+ usage_with_options(kvm_events_usage, kvm_events_options);
+ return 0;
+}
diff --git a/tools/perf/builtin.h b/tools/perf/builtin.h
index b382bd5..fb19e3d 100644
--- a/tools/perf/builtin.h
+++ b/tools/perf/builtin.h
@@ -33,6 +33,7 @@ extern int cmd_probe(int argc, const char **argv, const char *prefix);
extern int cmd_kmem(int argc, const char **argv, const char *prefix);
extern int cmd_lock(int argc, const char **argv, const char *prefix);
extern int cmd_kvm(int argc, const char **argv, const char *prefix);
+extern int cmd_kvm_events(int argc, const char **argv, const char *prefix);
extern int cmd_test(int argc, const char **argv, const char *prefix);
extern int cmd_inject(int argc, const char **argv, const char *prefix);
diff --git a/tools/perf/command-list.txt b/tools/perf/command-list.txt
index d695fe4..c5e97d8 100644
--- a/tools/perf/command-list.txt
+++ b/tools/perf/command-list.txt
@@ -22,4 +22,5 @@ perf-probe mainporcelain common
perf-kmem mainporcelain common
perf-lock mainporcelain common
perf-kvm mainporcelain common
+perf-kvm-events mainporcelain common
perf-test mainporcelain common
diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 2b2e225..ab85ea5 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -317,6 +317,7 @@ static void handle_internal_command(int argc, const char **argv)
{ "kmem", cmd_kmem, 0 },
{ "lock", cmd_lock, 0 },
{ "kvm", cmd_kvm, 0 },
+ { "kvm-events", cmd_kvm_events, 0},
{ "test", cmd_test, 0 },
{ "inject", cmd_inject, 0 },
};
--
1.7.7.6
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v3 3/3] KVM: perf: kvm events analysis tool
2012-02-07 13:08 ` [PATCH v3 3/3] KVM: perf: kvm events analysis tool Xiao Guangrong
@ 2012-02-07 17:55 ` David Ahern
2012-02-08 6:14 ` Xiao Guangrong
0 siblings, 1 reply; 9+ messages in thread
From: David Ahern @ 2012-02-07 17:55 UTC (permalink / raw)
To: Xiao Guangrong
Cc: Xiao Guangrong, Avi Kivity, Marcelo Tosatti, Ingo Molnar,
Arnaldo Carvalho de Melo, Stefan Hajnoczi, LKML, KVM
On 02/07/2012 06:08 AM, Xiao Guangrong wrote:
> Add 'perf kvm-events' support to analyze kvm vmexit/mmio/ioport smartly
example output?
>
> Usage:
>
> - trace kvm events:
> perf kvm-events record, or, if other tracepoints are also
> interesting, we can append the events like this:
> perf kvm-events record -e timer:*
>
> - show the result:
> perf kvm-events report
>
> Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
> ---
> tools/perf/Documentation/perf-kvm-events.txt | 56 ++
> tools/perf/Makefile | 1 +
> tools/perf/builtin-kvm-events.c | 911 ++++++++++++++++++++++++++
> tools/perf/builtin.h | 1 +
> tools/perf/command-list.txt | 1 +
> tools/perf/perf.c | 1 +
> 6 files changed, 971 insertions(+), 0 deletions(-)
> create mode 100644 tools/perf/Documentation/perf-kvm-events.txt
> create mode 100644 tools/perf/builtin-kvm-events.c
>
> diff --git a/tools/perf/Documentation/perf-kvm-events.txt b/tools/perf/Documentation/perf-kvm-events.txt
> new file mode 100644
> index 0000000..d46789a
> --- /dev/null
> +++ b/tools/perf/Documentation/perf-kvm-events.txt
> @@ -0,0 +1,56 @@
> +perf-kvm-events(1)
> +============
> +
> +NAME
> +----
> +perf-kvm-events - Analyze kvm events
> +
> +SYNOPSIS
> +--------
> +[verse]
> +'perf kvm-events' {record|report}
command name is very generic -- kvm-events; but command focus is rather
narrow -- I/O events.
> +
> +DESCRIPTION
> +-----------
> +You can analyze some crucial kvm events and statistics with this
> +'perf kvm-events' command. Currently, vmexit, mmio and ioport events
> +are supported.
> +
> + 'perf kvm-events record <command>' records kvm events(vmexit,
> + mmio and ioport) and the events between start and end <command>.
> + And this command produces the file "perf.data" which contains
> + tracing results of kvm events.
> +
> + 'perf kvm-events report' reports statistical data which includes
> + events handled time, samples, and so on.
> +
> +COMMON OPTIONS
> +--------------
> +
> +-i::
> +--input=<file>::
> + Input file name. (default: perf.data unless stdin is a fifo)
> +
> +-v::
> +--verbose::
> + Be more verbose (show symbol address, etc).
> +
> +-D::
> +--dump-raw-trace::
> + Dump raw trace in ASCII.
> +
> +REPORT OPTIONS
> +--------------
> +--vcpu=<value>::
> + analyze events which occures on this vcpu
> +
> +--events=<value>::
> + events to be analyzed. Possible values: vmexit, mmio, ioport.
> +-k::
> +--key=<value>::
> + Sorting key. Possible values: sample(default, sort by samples number),
> +time(sort by average time).
> +
> +SEE ALSO
> +--------
> +linkperf:perf[1]
> diff --git a/tools/perf/Makefile b/tools/perf/Makefile
> index ac86d67..ee43451 100644
> --- a/tools/perf/Makefile
> +++ b/tools/perf/Makefile
> @@ -382,6 +382,7 @@ BUILTIN_OBJS += $(OUTPUT)builtin-probe.o
> BUILTIN_OBJS += $(OUTPUT)builtin-kmem.o
> BUILTIN_OBJS += $(OUTPUT)builtin-lock.o
> BUILTIN_OBJS += $(OUTPUT)builtin-kvm.o
> +BUILTIN_OBJS += $(OUTPUT)builtin-kvm-events.o
> BUILTIN_OBJS += $(OUTPUT)builtin-test.o
> BUILTIN_OBJS += $(OUTPUT)builtin-inject.o
>
> diff --git a/tools/perf/builtin-kvm-events.c b/tools/perf/builtin-kvm-events.c
> new file mode 100644
> index 0000000..8388c54
> --- /dev/null
> +++ b/tools/perf/builtin-kvm-events.c
> @@ -0,0 +1,911 @@
> +#include "builtin.h"
> +#include "perf.h"
> +#include "util/util.h"
> +#include "util/cache.h"
> +#include "util/symbol.h"
> +#include "util/thread.h"
> +#include "util/header.h"
> +#include "util/parse-options.h"
> +#include "util/trace-event.h"
> +#include "util/debug.h"
> +#include "util/debugfs.h"
> +#include "util/session.h"
> +#include "util/tool.h"
> +
> +#include <math.h>
> +
> +#include <linux/kvm.h>
> +
> +#include "../../arch/x86/include/asm/svm.h"
> +#include "../../arch/x86/include/asm/vmx.h"
> +#include "../../arch/x86/include/asm/kvm_host.h"
> +
> +struct event_key {
> + #define INVALID_KEY (~0ULL)
> + u64 key;
> + int info;
> +};
> +
> +struct kvm_events_ops {
> + bool (*is_begin_event)(struct event *event, void *data,
> + struct event_key *key);
> + bool (*is_end_event)(struct event *event, void *data,
> + struct event_key *key);
> + void (*decode_key)(struct event_key *key, char decode[20]);
> + const char *name;
> +};
> +
> +static void exit_event_get_key(struct event *event, void *data,
> + struct event_key *key)
> +{
> + key->info = 0;
> + key->key = raw_field_value(event, "exit_reason", data);
> +}
> +
> +static bool kvm_exit_event(struct event *event)
> +{
> + return !strcmp(event->name, "kvm_exit");
> +}
> +
> +static bool exit_event_begin(struct event *event, void *data,
> + struct event_key *key)
> +{
> + if (kvm_exit_event(event)) {
> + exit_event_get_key(event, data, key);
> + return true;
> + }
> +
> + return false;
> +}
> +
> +static bool kvm_entry_event(struct event *event)
> +{
> + return !strcmp(event->name, "kvm_entry");
> +}
> +
> +static bool exit_event_end(struct event *event, void *data __unused,
> + struct event_key *key __unused)
> +{
> + return kvm_entry_event(event);
> +}
> +
> +struct exit_reasons_table {
> + unsigned long exit_code;
> + const char *reason;
> +};
> +
> +struct exit_reasons_table vmx_exit_reasons[] = {
> + VMX_EXIT_REASONS
> +};
> +
> +struct exit_reasons_table svm_exit_reasons[] = {
> + SVM_EXIT_REASONS
> +};
> +
> +static int get_cpu_isa(void)
> +{
> + FILE *f;
> + char line[512], vendor[64];
> + int ret;
> +
> + f = fopen("/proc/cpuinfo", "r");
> + if (!f)
> + die("/proc/cpuinfo does not exist.\n");
> +
> + while (fgets(line, sizeof(line), f))
> + if (sscanf(line, "vendor_id : %s", vendor) > 0) {
> + if (strstr(vendor, "Intel"))
> + ret = 1;
> + else if (strstr(vendor, "AMD"))
> + ret = 0;
> + else
> + break;
> + goto exit;
> + }
> +
> + die("CPU vendor is unknown.\n");
> +exit:
> + fclose(f);
> + return ret;
> +}
This breaks with off-box analysis -- collect data on target and analyze
it on another. I would think the HEADER_CPUDESC or HEADER_CPUID feature
would cover what you need.
> +
> +static const char *get_exit_reason(u64 exit_code)
> +{
> + static int isa = -1;
> + int table_size = ARRAY_SIZE(svm_exit_reasons);
> + struct exit_reasons_table *table = svm_exit_reasons;
> +
> + /*
> + * Do not use 'isa' recorded in kvm_exit tracepoint since it is not
> + * traced in the old kernel.
> + */
> + if (isa < 0)
> + isa = get_cpu_isa();
> +
> + if (isa == 1) {
> + table = vmx_exit_reasons;
> + table_size = ARRAY_SIZE(vmx_exit_reasons);
> + }
> +
> + while (table_size--) {
> + if (table->exit_code == exit_code)
> + return table->reason;
> + table++;
> + }
> +
> + die("unknown kvm exit code:%ld on %s\n", exit_code,
> + isa ? "VMX" : "SVM");
> +}
> +
> +static void exit_event_decode_key(struct event_key *key, char decode[20])
> +{
> + const char *exit_reason = get_exit_reason(key->key);
> +
> + snprintf(decode, 20, "%s", exit_reason);
> +}
> +
> +static struct kvm_events_ops exit_events = {
> + .is_begin_event = exit_event_begin,
> + .is_end_event = exit_event_end,
> + .decode_key = exit_event_decode_key,
> + .name = "VM-EXIT"
> +};
> +
> +/*
> + * For the old kernel, we treat:
> + * the time of MMIO write: kvm_mmio(KVM_TRACE_MMIO_WRITE...) -> kvm_entry
> + * the time of MMIO read: kvm_exit -> kvm_mmio(KVM_TRACE_MMIO_READ...).
> + *
> + * For the new kernel, we use kvm_mmio_begin and kvm_mmio_done to make
> + * things better.
> + */
> +static void mmio_event_get_key(struct event *event, void *data,
> + struct event_key *key)
> +{
> + key->key = raw_field_value(event, "gpa", data);
> + key->info = raw_field_value(event, "type", data);
> +}
> +
> +#define KVM_TRACE_MMIO_READ_UNSATISFIED 0
> +#define KVM_TRACE_MMIO_READ 1
> +#define KVM_TRACE_MMIO_WRITE 2
> +
> +static bool kvm_mmio_done_event(struct event *event)
> +{
> + return !strcmp(event->name, "kvm_mmio_done");
> +}
> +
> +static bool mmio_event_begin(struct event *event, void *data,
> + struct event_key *key)
> +{
> + /* MMIO read begin in old kernel. */
> + if (kvm_exit_event(event))
> + return true;
> +
> + /* MMIO write begin in old kernel. */
> + if (!strcmp(event->name, "kvm_mmio") &&
> + raw_field_value(event, "type", data) == KVM_TRACE_MMIO_WRITE) {
> + mmio_event_get_key(event, data, key);
> + return true;
> + }
> +
> + /* MMIO read/write begin in new kernel. */
> + if (!strcmp(event->name, "kvm_mmio_begin")) {
> + mmio_event_get_key(event, data, key);
> + return true;
> + }
> +
> + return false;
> +}
> +
> +static bool mmio_event_end(struct event *event, void *data,
> + struct event_key *key)
> +{
> + /* MMIO write end in old kernel. */
> + if (kvm_entry_event(event))
> + return true;
> +
> + /* MMIO read end in the old kernel.*/
> + if (!strcmp(event->name, "kvm_mmio") &&
> + raw_field_value(event, "type", data) == KVM_TRACE_MMIO_READ) {
> + mmio_event_get_key(event, data, key);
> + return true;
> + }
> +
> + /* MMIO read/write end event in the new kernel.*/
> + return kvm_mmio_done_event(event);
> +}
> +
> +static void mmio_event_decode_key(struct event_key *key, char decode[20])
> +{
> + snprintf(decode, 20, "%#lx:%s", key->key,
> + key->info == KVM_TRACE_MMIO_WRITE ? "W" : "R");
> +}
> +
> +static struct kvm_events_ops mmio_events = {
> + .is_begin_event = mmio_event_begin,
> + .is_end_event = mmio_event_end,
> + .decode_key = mmio_event_decode_key,
> + .name = "MMIO Access"
> +};
> +
> +/*
> + * For the old kernel, the time of emulation pio access is from kvm_pio to
> + * kvm_entry. In the new kernel, the end time is indicated by kvm_mmio_done.
> + */
> +static void ioport_event_get_key(struct event *event, void *data,
> + struct event_key *key)
> +{
> + key->key = raw_field_value(event, "port", data);
> + key->info = raw_field_value(event, "rw", data);
> +}
> +
> +static bool ioport_event_begin(struct event *event, void *data,
> + struct event_key *key)
> +{
> + if (!strcmp(event->name, "kvm_pio")) {
> + ioport_event_get_key(event, data, key);
> + return true;
> + }
> +
> + return false;
> +}
> +
> +static bool ioport_event_end(struct event *event, void *data __unused,
> + struct event_key *key __unused)
> +{
> + if (kvm_entry_event(event))
> + return true;
> +
> + return kvm_mmio_done_event(event);
> +}
> +
> +static void ioport_event_decode_key(struct event_key *key, char decode[20])
> +{
> + snprintf(decode, 20, "%#lx:%s", key->key, key->info ? "POUT" : "PIN");
> +}
> +
> +static struct kvm_events_ops ioport_events = {
> + .is_begin_event = ioport_event_begin,
> + .is_end_event = ioport_event_end,
> + .decode_key = ioport_event_decode_key,
> + .name = "IO Port Access"
> +};
> +
> +static const char *report_event = "vmexit";
> +struct kvm_events_ops *events_ops;
> +
> +static void register_kvm_events_ops(void)
> +{
> + if (!strcmp(report_event, "vmexit"))
> + events_ops = &exit_events;
> + else if (!strcmp(report_event, "mmio"))
> + events_ops = &mmio_events;
> + else if (!strcmp(report_event, "ioport"))
> + events_ops = &ioport_events;
> + else
> + die("Unknown report event:%s\n", report_event);
> +}
> +
> +struct event_stats {
> + u64 count;
> + u64 time;
> +
> + /* used to calculate stddev. */
> + double mean;
> + double M2;
> +};
> +
> +struct kvm_event {
> + struct list_head hash_entry;
> + struct rb_node rb;
> +
> + struct event_key key;
> +
> + struct event_stats total;
> + struct event_stats vcpu[0]; /* max vcpus */
> +};
> +
> +struct {
> + u64 start_time;
> + struct kvm_event *last_event;
> +} *vcpu_event_record;
> +
> +#define EVENTS_BITS 12
> +#define EVENTS_CACHE_SIZE (1UL << EVENTS_BITS)
> +
> +static int kvm_max_vcpus;
> +static u64 total_time;
> +static u64 total_count;
> +static struct list_head kvm_events_cache[EVENTS_CACHE_SIZE];
> +
> +#ifndef KVM_CAP_MAX_VCPUS
> +#define KVM_CAP_MAX_VCPUS 66
> +#endif
> +
> +static int kvm_max_cpus(void)
> +{
> + int kvm_fd, ret;
> +
> + kvm_fd = open("/dev/kvm", O_RDWR);
> + if (kvm_fd < 0)
> + die("KVM is not available.\n");
> +
> + ret = ioctl(kvm_fd, KVM_CHECK_EXTENSION, KVM_CAP_MAX_VCPUS);
> +
> + if (ret <= 0)
> + ret = ioctl(kvm_fd, KVM_CHECK_EXTENSION, KVM_CAP_NR_VCPUS);
> +
> + if (ret <= 0)
> + die("inquiry max vcpu fail.\n");
> +
> + return ret;
> +}
> +
> +static void init_kvm_event_record(void)
> +{
> + int i;
> +
> + kvm_max_vcpus = kvm_max_cpus();
This breaks off-box analysis too.
> +
> + vcpu_event_record = zalloc(sizeof(*vcpu_event_record) * kvm_max_vcpus);
> + if (!vcpu_event_record)
> + die("zalloc.\n");
> +
> + for (i = 0; i < (int)EVENTS_CACHE_SIZE; i++)
> + INIT_LIST_HEAD(&kvm_events_cache[i]);
> +}
Really, the caches could be tied to thread structs, and then you don't
need a max vcpu style allocation. more below.
> +
> +static int kvm_events_hash_fn(u64 key)
> +{
> + return key & (EVENTS_CACHE_SIZE - 1);
> +}
> +
> +static struct kvm_event *kvm_alloc_init_event(struct event_key *key)
> +{
> + struct kvm_event *event;
> +
> + event = zalloc(sizeof(*event) +
> + sizeof(struct event_stats) * kvm_max_vcpus);
> +
> + if (!event)
> + die("Not enough memory\n");
> +
> + event->key = *key;
> + return event;
> +}
> +
> +static struct kvm_event *find_create_kvm_event(struct event_key *key)
> +{
> + struct kvm_event *event;
> + struct list_head *head;
> +
> + BUG_ON(key->key == INVALID_KEY);
> +
> + head = &kvm_events_cache[kvm_events_hash_fn(key->key)];
> + list_for_each_entry(event, head, hash_entry)
> + if (event->key.key == key->key && event->key.info == key->info)
> + return event;
> +
> + event = kvm_alloc_init_event(key);
> + list_add(&event->hash_entry, head);
> + return event;
> +}
> +
> +#define VCPU_ID_BITS 6
> +#define VCPU_ID_CACHE_SIZE (1UL << VCPU_ID_BITS)
> +
> +struct kvm_tid_vcpu_id {
> + struct list_head hash_entry;
> +
> + u32 tid;
> + int vcpu_id;
> +};
> +
> +static struct list_head kvm_vcpu_id_cache[VCPU_ID_CACHE_SIZE];
> +
> +static int kvm_tid_hash_fn(u32 tid)
> +{
> + return tid & (VCPU_ID_CACHE_SIZE - 1);
> +}
> +
> +static int get_vcpu_id(u32 tid)
> +{
> + struct list_head *head;
> + struct kvm_tid_vcpu_id *tid2pid;
> +
> + head = &kvm_vcpu_id_cache[kvm_tid_hash_fn(tid)];
> + list_for_each_entry(tid2pid, head, hash_entry)
> + if (tid2pid->tid == tid)
> + return tid2pid->vcpu_id;
> +
> + return -1;
> +}
> +
> +static int get_record_vcpu_id(struct event *event, u32 tid, void *data)
> +{
> + struct list_head *head;
> + struct kvm_tid_vcpu_id *tid2pid;
> + int vcpu_id;
> +
> + vcpu_id = get_vcpu_id(tid);
> + if (vcpu_id >= 0)
> + return vcpu_id;
> +
> + /* Only kvm_entry records vcpu id. */
> + if (!kvm_entry_event(event))
> + return -1;
> +
> + head = &kvm_vcpu_id_cache[kvm_tid_hash_fn(tid)];
> +
> + tid2pid = zalloc(sizeof(*tid2pid));
> + if (!tid2pid)
> + die("Not enough memory\n");
> +
> + tid2pid->tid = tid;
> + vcpu_id = tid2pid->vcpu_id = raw_field_value(event, "vcpu_id", data);
> + list_add(&tid2pid->hash_entry, head);
> +
> + return vcpu_id;
> +}
> +
> +static void init_kvm_tid_to_pid(void)
> +{
> + int i;
> +
> + for (i = 0; i < (int)VCPU_ID_CACHE_SIZE; i++)
> + INIT_LIST_HEAD(&kvm_vcpu_id_cache[i]);
> +}
> +
> +static void handle_begin_event(struct event_key *key, int vcpu_id,
> + u64 timestamp)
> +{
> + struct kvm_event *event = NULL;
> +
> + if (key->key != INVALID_KEY)
> + event = find_create_kvm_event(key);
> +
> + vcpu_event_record[vcpu_id].last_event = event;
> + vcpu_event_record[vcpu_id].start_time = timestamp;
> +}
> +
> +static void update_event_stats(struct event_stats *stats, u64 time_diff)
> +{
> + double delta;
> +
> + stats->count++;
> + stats->time += time_diff;
> +
> + delta = time_diff - stats->mean;
> + stats->mean += delta / stats->count;
> + stats->M2 += delta*(time_diff - stats->mean);
> +}
> +
> +static double event_stats_stddev(int vcpu_id, struct kvm_event *event)
> +{
> + struct event_stats *stats = &event->total;
> + double variance, variance_mean, stddev;
> +
> + if (vcpu_id != -1)
> + stats = &event->vcpu[vcpu_id];
> +
> + BUG_ON(!stats->count);
> +
> + variance = stats->M2 / (stats->count - 1);
> + variance_mean = variance / stats->count;
> + stddev = sqrt(variance_mean);
> +
> + return stddev * 100 / stats->mean;
> +}
> +
> +static void update_kvm_event(struct kvm_event *event, int vcpu_id,
> + u64 time_diff)
> +{
> + update_event_stats(&event->total, time_diff);
> + update_event_stats(&event->vcpu[vcpu_id], time_diff);
> +}
> +
> +static void handle_end_event(struct event_key *key, int vcpu_id, u64 timestamp)
> +{
> + struct kvm_event *event;
> + u64 time_begin, time_diff;
> +
> + event = vcpu_event_record[vcpu_id].last_event;
> + time_begin = vcpu_event_record[vcpu_id].start_time;
> +
> + /* The begin event is not caught. */
> + if (!time_begin)
> + return;
> +
> + /* Both begin and end events did not get the key. */
> + if (!event && key->key == INVALID_KEY)
> + return;
> +
> + if (!event)
> + event = find_create_kvm_event(key);
> +
> + vcpu_event_record[vcpu_id].last_event = NULL;
> + vcpu_event_record[vcpu_id].start_time = 0;
> +
> + BUG_ON(timestamp < time_begin);
> +
> + time_diff = timestamp - time_begin;
> + update_kvm_event(event, vcpu_id, time_diff);
> +}
> +
> +static void handle_kvm_event(struct event *event, void *data, u64 timestamp,
> + u32 tid)
> +{
> + struct event_key key = {.key = INVALID_KEY};
> + int vcpu_id = get_record_vcpu_id(event, tid, data);
> +
> + if (vcpu_id < 0)
> + return;
> +
> + if (events_ops->is_begin_event(event, data, &key))
> + return handle_begin_event(&key, vcpu_id, timestamp);
> +
> + if (events_ops->is_end_event(event, data, &key))
> + return handle_end_event(&key, vcpu_id, timestamp);
> +}
> +
> +typedef int (*key_cmp_fun)(struct kvm_event*, struct kvm_event*, int);
> +struct kvm_event_key {
> + const char *name;
> + key_cmp_fun key;
> +};
> +
> +static int trace_vcpu = -1;
> +#define GET_EVENT_KEY(member) \
> +static u64 get_event_ ##member(struct kvm_event *event, int vcpu) \
> +{ \
> + if (vcpu == -1) \
> + return event->total.member; \
> + \
> + return event->vcpu[vcpu].member; \
> +}
> +
> +#define COMPARE_EVENT_KEY(member) \
> +GET_EVENT_KEY(member) \
> +static int compare_kvm_event_ ## member(struct kvm_event *one, \
> + struct kvm_event *two, int vcpu)\
> +{ \
> + return get_event_ ##member(one, vcpu) > \
> + get_event_ ##member(two, vcpu); \
> +}
> +
> +GET_EVENT_KEY(time);
> +COMPARE_EVENT_KEY(count);
> +COMPARE_EVENT_KEY(mean);
> +
> +#define DEF_SORT_NAME_KEY(name, compare_key) \
> + { #name, compare_kvm_event_ ## compare_key }
> +
> +static struct kvm_event_key keys[] = {
> + DEF_SORT_NAME_KEY(sample, count),
> + DEF_SORT_NAME_KEY(time, mean),
> + { NULL, NULL }
> +};
> +
> +static const char *sort_key = "sample";
> +static key_cmp_fun compare;
> +
> +static void select_key(void)
> +{
> + int i;
> +
> + for (i = 0; keys[i].name; i++) {
> + if (!strcmp(keys[i].name, sort_key)) {
> + compare = keys[i].key;
> + return;
> + }
> + }
> +
> + die("Unknown compare key:%s\n", sort_key);
> +}
> +
> +static struct rb_root result;
> +static void insert_to_result(struct kvm_event *event, key_cmp_fun bigger,
> + int vcpu)
> +{
> + struct rb_node **rb = &result.rb_node;
> + struct rb_node *parent = NULL;
> + struct kvm_event *p;
> +
> + while (*rb) {
> + p = container_of(*rb, struct kvm_event, rb);
> + parent = *rb;
> +
> + if (bigger(event, p, vcpu))
> + rb = &(*rb)->rb_left;
> + else
> + rb = &(*rb)->rb_right;
> + }
> +
> + rb_link_node(&event->rb, parent, rb);
> + rb_insert_color(&event->rb, &result);
> +}
> +
> +static void update_total_count(struct kvm_event *event, int vcpu)
> +{
> + total_count += get_event_count(event, vcpu);
> + total_time += get_event_time(event, vcpu);
> +}
> +
> +static bool event_is_valid(struct kvm_event *event, int vcpu)
> +{
> + return get_event_count(event, vcpu);
> +}
> +
> +static void sort_result(int vcpu)
> +{
> + unsigned int i;
> + struct kvm_event *event;
> +
> + for (i = 0; i < EVENTS_CACHE_SIZE; i++)
> + list_for_each_entry(event, &kvm_events_cache[i], hash_entry)
> + if (event_is_valid(event, vcpu)) {
> + update_total_count(event, vcpu);
> + insert_to_result(event, compare, vcpu);
> + }
> +}
> +
> +/* returns left most element of result, and erase it */
> +static struct kvm_event *pop_from_result(void)
> +{
> + struct rb_node *node = result.rb_node;
> +
> + if (!node)
> + return NULL;
> +
> + while (node->rb_left)
> + node = node->rb_left;
> +
> + rb_erase(node, &result);
> + return container_of(node, struct kvm_event, rb);
> +}
> +
> +static void print_vcpu_info(int vcpu)
> +{
> + pr_info("Analyze events for ");
> +
> + if (vcpu == -1)
> + pr_info("all VCPUs:\n\n");
> + else
> + pr_info("VCPU %d:\n\n", vcpu);
> +}
> +
> +static void print_result(int vcpu)
> +{
> + char decode[20];
> + struct kvm_event *event;
> +
> + pr_info("\n\n");
> + print_vcpu_info(vcpu);
> + pr_info("%20s ", events_ops->name);
> + pr_info("%10s ", "Samples");
> + pr_info("%9s ", "Samples%");
> +
> + pr_info("%9s ", "Time%");
> + pr_info("%16s ", "Avg time");
> + pr_info("\n\n");
> +
> + while ((event = pop_from_result())) {
> + u64 ecount, etime;
> +
> + ecount = get_event_count(event, vcpu);
> + etime = get_event_time(event, vcpu);
> +
> + events_ops->decode_key(&event->key, decode);
> + pr_info("%20s ", decode);
> + pr_info("%10lu ", ecount);
> + pr_info("%8.2f%% ", (double)ecount / total_count * 100);
> + pr_info("%8.2f%% ", (double)etime / total_time * 100);
> + pr_info("%9.2fus ( +-%7.2f%% )", (double)etime / ecount/1e3,
> + event_stats_stddev(trace_vcpu, event));
> + pr_info("\n");
> + }
> +
> + pr_info("\nTotal Samples:%ld, Total events handled time:%.2fus.\n\n",
> + total_count, total_time / 1e3);
> +}
> +
> +static void process_raw_event(void *data, int __unused cpu, u64 timestamp,
> + u32 tid)
> +{
> + struct event *event;
> + int type;
> +
> + type = trace_parse_common_type(data);
> + event = trace_find_event(type);
> +
> + return handle_kvm_event(event, data, timestamp, tid);
> +}
> +
> +static int process_sample_event(struct perf_tool *tool __used,
> + union perf_event *event,
> + struct perf_sample *sample,
> + struct perf_evsel *evsel __used,
> + struct machine *machine)
> +{
> + struct thread *thread = machine__findnew_thread(machine, sample->tid);
> +
> + if (thread == NULL) {
> + pr_debug("problem processing %d event, skipping it.\n",
> + event->header.type);
> + return -1;
> + }
> +
> + process_raw_event(sample->raw_data, sample->cpu, sample->time,
> + sample->tid);
I have not taken the time to digest the vcpu to tid logic, but you are
missing a connection I was expecting -- vcpus are tasks which will have
a struct thread associated with them. If you look above you are
retrieving the struct at the start of this function.
What I've done locally -- and something I've been meaning to suggest to
Arnaldo as an exported API -- is to add an entry to struct thread in
util/thread.h:
void *private;
and then in local process_sample_event implementations:
if (thread->private == NULL) {
thread->private = zalloc(sizeof(struct thread_runtime));
if (thread->private == NULL) {
pr_debug("failed to malloc memory for runtime data.\n");
rc = -1;
goto out;
}
}
and in functions processing samples:
struct thread_runtime *r = thread->private;
Doing this means you aren't allocating large, max vcpus structs and you
have the vcpu - tid association on the first kvm_entry event -- ie., you
don't need the code for vcpu-tid tracking.
Events happen in thread contexts and threads == vcpus.
> +
> + return 0;
> +}
> +
> +static struct perf_tool eops = {
> + .sample = process_sample_event,
> + .comm = perf_event__process_comm,
> + .ordered_samples = true,
> +};
> +
> +static char const *input_name = "perf.data";
> +
> +static int read_events(void)
> +{
> + struct perf_session *session;
> +
> + session = perf_session__new(input_name, O_RDONLY, 0, false, &eops);
> + if (!session)
> + die("Initializing perf session failed\n");
> +
> + if (!perf_session__has_traces(session, "kvm record"))
> + return -1;
> +
> + return perf_session__process_events(session, &eops);
> +}
> +
> +static void verify_vcpu(int vcpu)
> +{
> + if (vcpu != -1 && (vcpu > kvm_max_vcpus || vcpu < 0))
> + die("Unknown vcpu:%d.\n", vcpu);
> +
> +}
> +
> +static int kvm_events_report(int vcpu)
> +{
> + init_kvm_event_record();
> + init_kvm_tid_to_pid();
> + verify_vcpu(vcpu);
> + select_key();
> + register_kvm_events_ops();
> + setup_pager();
I believe setup_pager is handled by perf.c
> + read_events();
> + sort_result(vcpu);
> + print_result(vcpu);
> + return 0;
ouch. a little separation in the lines would help readability.
> +}
> +
> +static const char * const record_args[] = {
> + "record",
> + "-a",
> + "-R",
> + "-f",
> + "-m", "1024",
> + "-c", "1",
> + "-e", "kvm:kvm_entry",
> + "-e", "kvm:kvm_exit",
> + "-e", "kvm:kvm_mmio",
> + "-e", "kvm:kvm_pio",
> +};
> +
> +static const char * const new_event[] = {
> + "kvm_mmio_begin",
> + "kvm_mmio_done"
> +};
> +
> +static bool kvm_events_exist(const char *event)
> +{
> + char evt_path[MAXPATHLEN];
> + int fd;
> +
> + snprintf(evt_path, MAXPATHLEN, "%s/kvm/%s/id", tracing_events_path,
> + event);
> +
> + fd = open(evt_path, O_RDONLY);
> +
> + if (fd < 0)
> + return false;
> +
> + close(fd);
> +
> + return true;
> +}
> +
> +static int kvm_events_record(int argc, const char **argv)
> +{
> + unsigned int rec_argc, i, j;
> + const char **rec_argv;
> +
> + rec_argc = ARRAY_SIZE(record_args) + argc - 1;
> + rec_argc += ARRAY_SIZE(new_event) * 2;
> + rec_argv = calloc(rec_argc + 1, sizeof(char *));
> +
> + if (rec_argv == NULL)
> + return -ENOMEM;
> +
> + for (i = 0; i < ARRAY_SIZE(record_args); i++)
> + rec_argv[i] = strdup(record_args[i]);
> +
> + for (j = 0; j < ARRAY_SIZE(new_event); j++)
> + if (kvm_events_exist(new_event[j])) {
> + char event[256];
> +
> + sprintf(event, "kvm:%s", new_event[j]);
> +
> + rec_argv[i++] = strdup("-e");
> + rec_argv[i++] = strdup(event);
> + }
> +
> + for (j = 1; j < (unsigned int)argc; j++, i++)
> + rec_argv[i] = argv[j];
> +
> + return cmd_record(i, rec_argv, NULL);
> +}
> +
> +static const char * const kvm_events_report_usage[] = {
> + "perf kvm events report [<options>]",
> + NULL
> +};
> +
> +static const struct option kvm_events_report_options[] = {
> + OPT_STRING(0, "event", &report_event, "reprot event",
> + "event for reporting: vmexit, mmio, ioport"),
> + OPT_INTEGER(0, "vcpu", &trace_vcpu,
> + "vcpu id to report"),
> + OPT_STRING('k', "key", &sort_key, "sort-key",
> + "key for sorting: sample(sort by samples number)"
> + " time (sort by avg time)"),
> + OPT_END()
> +};
> +
> +static const char * const kvm_events_usage[] = {
> + "perf kvm events [<options>] {record|report}",
> + NULL
> +};
> +
> +static const struct option kvm_events_options[] = {
> + OPT_STRING('i', "input", &input_name, "file", "input file name"),
> + OPT_INCR('v', "verbose", &verbose,
> + "be more verbose (show symbol address, etc)"),
'show symbol address' does not seem relevant for this command.
> + OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,
> + "dump raw trace in ASCII"),
Does the -D make sense?
> + OPT_END()
> +};
> +
> +int cmd_kvm_events(int argc, const char **argv, const char *prefix __used)
> +{
> + argc = parse_options(argc, argv, kvm_events_options, kvm_events_usage,
> + PARSE_OPT_STOP_AT_NON_OPTION);
> + if (!argc)
> + usage_with_options(kvm_events_usage, kvm_events_options);
> +
> + symbol__init();
> +
> + if (!strncmp(argv[0], "rec", 3))
> + return kvm_events_record(argc, argv);
> +
> + if (!strncmp(argv[0], "report", 6)) {
exact match for 'report'?
David
> + if (argc) {
> + argc = parse_options(argc, argv,
> + kvm_events_report_options,
> + kvm_events_report_usage, 0);
> + if (argc)
> + usage_with_options(kvm_events_report_usage,
> + kvm_events_report_options);
> + }
> + return kvm_events_report(trace_vcpu);
> + }
> +
> + usage_with_options(kvm_events_usage, kvm_events_options);
> + return 0;
> +}
> diff --git a/tools/perf/builtin.h b/tools/perf/builtin.h
> index b382bd5..fb19e3d 100644
> --- a/tools/perf/builtin.h
> +++ b/tools/perf/builtin.h
> @@ -33,6 +33,7 @@ extern int cmd_probe(int argc, const char **argv, const char *prefix);
> extern int cmd_kmem(int argc, const char **argv, const char *prefix);
> extern int cmd_lock(int argc, const char **argv, const char *prefix);
> extern int cmd_kvm(int argc, const char **argv, const char *prefix);
> +extern int cmd_kvm_events(int argc, const char **argv, const char *prefix);
> extern int cmd_test(int argc, const char **argv, const char *prefix);
> extern int cmd_inject(int argc, const char **argv, const char *prefix);
>
> diff --git a/tools/perf/command-list.txt b/tools/perf/command-list.txt
> index d695fe4..c5e97d8 100644
> --- a/tools/perf/command-list.txt
> +++ b/tools/perf/command-list.txt
> @@ -22,4 +22,5 @@ perf-probe mainporcelain common
> perf-kmem mainporcelain common
> perf-lock mainporcelain common
> perf-kvm mainporcelain common
> +perf-kvm-events mainporcelain common
> perf-test mainporcelain common
> diff --git a/tools/perf/perf.c b/tools/perf/perf.c
> index 2b2e225..ab85ea5 100644
> --- a/tools/perf/perf.c
> +++ b/tools/perf/perf.c
> @@ -317,6 +317,7 @@ static void handle_internal_command(int argc, const char **argv)
> { "kmem", cmd_kmem, 0 },
> { "lock", cmd_lock, 0 },
> { "kvm", cmd_kvm, 0 },
> + { "kvm-events", cmd_kvm_events, 0},
> { "test", cmd_test, 0 },
> { "inject", cmd_inject, 0 },
> };
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 3/3] KVM: perf: kvm events analysis tool
2012-02-07 17:55 ` David Ahern
@ 2012-02-08 6:14 ` Xiao Guangrong
2012-02-08 14:26 ` David Ahern
0 siblings, 1 reply; 9+ messages in thread
From: Xiao Guangrong @ 2012-02-08 6:14 UTC (permalink / raw)
To: David Ahern
Cc: Xiao Guangrong, Avi Kivity, Marcelo Tosatti, Ingo Molnar,
Arnaldo Carvalho de Melo, Stefan Hajnoczi, LKML, KVM
On 02/08/2012 01:55 AM, David Ahern wrote:
> On 02/07/2012 06:08 AM, Xiao Guangrong wrote:
>> Add 'perf kvm-events' support to analyze kvm vmexit/mmio/ioport smartly
>
> example output?
>
You can find a example output at this website:
http://lwn.net/Articles/479069/
[ Sorry, i did not put it into changlog in the v3 ]
>> +--------
>> +[verse]
>> +'perf kvm-events' {record|report}
>
> command name is very generic -- kvm-events; but command focus is rather
> narrow -- I/O events.
>
It is not only analysing IO events but also for other events(like vmexit,
and other events will be added). I prefer to kvm-events :)
>> +static int get_cpu_isa(void)
>> +{
>> + FILE *f;
>> + char line[512], vendor[64];
>> + int ret;
>> +
>> + f = fopen("/proc/cpuinfo", "r");
>> + if (!f)
>> + die("/proc/cpuinfo does not exist.\n");
>> +
>> + while (fgets(line, sizeof(line), f))
>> + if (sscanf(line, "vendor_id : %s", vendor) > 0) {
>> + if (strstr(vendor, "Intel"))
>> + ret = 1;
>> + else if (strstr(vendor, "AMD"))
>> + ret = 0;
>> + else
>> + break;
>> + goto exit;
>> + }
>> +
>> + die("CPU vendor is unknown.\n");
>> +exit:
>> + fclose(f);
>> + return ret;
>> +}
>
> This breaks with off-box analysis -- collect data on target and analyze
> it on another. I would think the HEADER_CPUDESC or HEADER_CPUID feature
> would cover what you need.
>
Right, i will using these instead.
>> +static void init_kvm_event_record(void)
>> +{
>> + int i;
>> +
>> + kvm_max_vcpus = kvm_max_cpus();
>
> This breaks off-box analysis too.
>
Hmm, actually, i will drop kvm_max_vcpu ant let the buffer to be dynamically
resized.
>> +
>> + vcpu_event_record = zalloc(sizeof(*vcpu_event_record) * kvm_max_vcpus);
>> + if (!vcpu_event_record)
>> + die("zalloc.\n");
>> +
>> + for (i = 0; i < (int)EVENTS_CACHE_SIZE; i++)
>> + INIT_LIST_HEAD(&kvm_events_cache[i]);
>> +}
>
> Really, the caches could be tied to thread structs, and then you don't
> need a max vcpu style allocation. more below.
>
Hmm, this cache is used to cache "event struct", this is the common resources
for all vcpus.
>> +static int process_sample_event(struct perf_tool *tool __used,
>> + union perf_event *event,
>> + struct perf_sample *sample,
>> + struct perf_evsel *evsel __used,
>> + struct machine *machine)
>> +{
>> + struct thread *thread = machine__findnew_thread(machine, sample->tid);
>> +
>> + if (thread == NULL) {
>> + pr_debug("problem processing %d event, skipping it.\n",
>> + event->header.type);
>> + return -1;
>> + }
>> +
>> + process_raw_event(sample->raw_data, sample->cpu, sample->time,
>> + sample->tid);
>
> I have not taken the time to digest the vcpu to tid logic, but you are
> missing a connection I was expecting -- vcpus are tasks which will have
> a struct thread associated with them. If you look above you are
> retrieving the struct at the start of this function.
>
> What I've done locally -- and something I've been meaning to suggest to
> Arnaldo as an exported API -- is to add an entry to struct thread in
> util/thread.h:
>
> void *private;
>
> and then in local process_sample_event implementations:
>
> if (thread->private == NULL) {
> thread->private = zalloc(sizeof(struct thread_runtime));
> if (thread->private == NULL) {
> pr_debug("failed to malloc memory for runtime data.\n");
> rc = -1;
> goto out;
> }
> }
>
> and in functions processing samples:
> struct thread_runtime *r = thread->private;
>
> Doing this means you aren't allocating large, max vcpus structs and you
> have the vcpu - tid association on the first kvm_entry event -- ie., you
> don't need the code for vcpu-tid tracking.
>
> Events happen in thread contexts and threads == vcpus.
>
Good point, it can clean up the code a lot.
>> +static int kvm_events_report(int vcpu)
>> +{
>> + init_kvm_event_record();
>> + init_kvm_tid_to_pid();
>> + verify_vcpu(vcpu);
>> + select_key();
>> + register_kvm_events_ops();
>> + setup_pager();
>
> I believe setup_pager is handled by perf.c
>
Hmm, i did not find it, could you please tell me where is it?
And, setup_pager is also used in other tools such 'perf sched',
'perf lock'...
>> + read_events();
>> + sort_result(vcpu);
>> + print_result(vcpu);
>> + return 0;
>
> ouch. a little separation in the lines would help readability.
Yes. :)
>> +static const struct option kvm_events_options[] = {
>> + OPT_STRING('i', "input", &input_name, "file", "input file name"),
>> + OPT_INCR('v', "verbose", &verbose,
>> + "be more verbose (show symbol address, etc)"),
>
> 'show symbol address' does not seem relevant for this command.
>
Right, i just copied these from other tool.
>
>> + OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,
>> + "dump raw trace in ASCII"),
>
> Does the -D make sense?
Hmm, it is good for trace parsing i think.
>> + if (!strncmp(argv[0], "rec", 3))
>> + return kvm_events_record(argc, argv);
>> +
>> + if (!strncmp(argv[0], "report", 6)) {
>
> exact match for 'report'?
>
It is the style in other tools, what is your suggestion?
Thanks, David! :)
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 3/3] KVM: perf: kvm events analysis tool
2012-02-08 6:14 ` Xiao Guangrong
@ 2012-02-08 14:26 ` David Ahern
2012-02-09 3:07 ` Xiao Guangrong
0 siblings, 1 reply; 9+ messages in thread
From: David Ahern @ 2012-02-08 14:26 UTC (permalink / raw)
To: Xiao Guangrong
Cc: Xiao Guangrong, Avi Kivity, Marcelo Tosatti, Ingo Molnar,
Arnaldo Carvalho de Melo, Stefan Hajnoczi, LKML, KVM
On 02/07/2012 11:14 PM, Xiao Guangrong wrote:
> On 02/08/2012 01:55 AM, David Ahern wrote:
>
>> On 02/07/2012 06:08 AM, Xiao Guangrong wrote:
>>> Add 'perf kvm-events' support to analyze kvm vmexit/mmio/ioport smartly
>>
>> example output?
>>
>
>
> You can find a example output at this website:
> http://lwn.net/Articles/479069/
>
> [ Sorry, i did not put it into changlog in the v3 ]
Right, I meant add an example output to the changelog.
>
>>> +--------
>>> +[verse]
>>> +'perf kvm-events' {record|report}
>>
>> command name is very generic -- kvm-events; but command focus is rather
>> narrow -- I/O events.
>>
>
>
> It is not only analysing IO events but also for other events(like vmexit,
> and other events will be added). I prefer to kvm-events :)
Same. kvm-events should be the name of the command. But from the
admittedly not thorough review of the code it seemed to be expecting I/O
(and entry/exit tracepoints as a part of that) and not easily amendable
to add new tracepoints.
---8<---
>>> +
>>> + vcpu_event_record = zalloc(sizeof(*vcpu_event_record) * kvm_max_vcpus);
>>> + if (!vcpu_event_record)
>>> + die("zalloc.\n");
>>> +
>>> + for (i = 0; i < (int)EVENTS_CACHE_SIZE; i++)
>>> + INIT_LIST_HEAD(&kvm_events_cache[i]);
>>> +}
>>
>> Really, the caches could be tied to thread structs, and then you don't
>> need a max vcpu style allocation. more below.
>>
>
>
> Hmm, this cache is used to cache "event struct", this is the common resources
> for all vcpus.
But consecutive events that are analyzed together happen in the context
of a thread -- the vcpu task.
---8<---
>>> +static int kvm_events_report(int vcpu)
>>> +{
>>> + init_kvm_event_record();
>>> + init_kvm_tid_to_pid();
>>> + verify_vcpu(vcpu);
>>> + select_key();
>>> + register_kvm_events_ops();
>>> + setup_pager();
>>
>> I believe setup_pager is handled by perf.c
>>
>
>
> Hmm, i did not find it, could you please tell me where is it?
> And, setup_pager is also used in other tools such 'perf sched',
> 'perf lock'...
>
run_builtin() --> commit_pager_choice() --> setup_pager()
It could be that the other commands need to be updated.
---8<---
>>> + if (!strncmp(argv[0], "rec", 3))
>>> + return kvm_events_record(argc, argv);
>>> +
>>> + if (!strncmp(argv[0], "report", 6)) {
>>
>> exact match for 'report'?
>>
>
>
> It is the style in other tools, what is your suggestion?
Right, I see that. builtin-lock should be fixed.
rec is ok for record; is report123 ok for report? if not that string
should be an exact match.
David
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 3/3] KVM: perf: kvm events analysis tool
2012-02-08 14:26 ` David Ahern
@ 2012-02-09 3:07 ` Xiao Guangrong
2012-02-09 3:36 ` David Ahern
0 siblings, 1 reply; 9+ messages in thread
From: Xiao Guangrong @ 2012-02-09 3:07 UTC (permalink / raw)
To: David Ahern
Cc: Xiao Guangrong, Avi Kivity, Marcelo Tosatti, Ingo Molnar,
Arnaldo Carvalho de Melo, Stefan Hajnoczi, LKML, KVM
On 02/08/2012 10:26 PM, David Ahern wrote:
>>>> +static int kvm_events_report(int vcpu)
>>>> +{
>>>> + init_kvm_event_record();
>>>> + init_kvm_tid_to_pid();
>>>> + verify_vcpu(vcpu);
>>>> + select_key();
>>>> + register_kvm_events_ops();
>>>> + setup_pager();
>>>
>>> I believe setup_pager is handled by perf.c
>>>
>>
>>
>> Hmm, i did not find it, could you please tell me where is it?
>> And, setup_pager is also used in other tools such 'perf sched',
>> 'perf lock'...
>>
>
> run_builtin() --> commit_pager_choice() --> setup_pager()
>
> It could be that the other commands need to be updated.
>
David,
Thanks for your review and explanation!
The code of commit_pager_choice():
static void commit_pager_choice(void)
{
switch (use_pager) {
case 0:
setenv("PERF_PAGER", "cat", 1);
break;
case 1:
/* setup_pager(); */
break;
default:
break;
}
}
setup_pager() is not called.
And it looks like kvm-events can not show the result properly if
i try to remove setup_pager.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 3/3] KVM: perf: kvm events analysis tool
2012-02-09 3:07 ` Xiao Guangrong
@ 2012-02-09 3:36 ` David Ahern
0 siblings, 0 replies; 9+ messages in thread
From: David Ahern @ 2012-02-09 3:36 UTC (permalink / raw)
To: Xiao Guangrong
Cc: Xiao Guangrong, Avi Kivity, Marcelo Tosatti, Ingo Molnar,
Arnaldo Carvalho de Melo, Stefan Hajnoczi, LKML, KVM
On 02/08/2012 08:07 PM, Xiao Guangrong wrote:
> Thanks for your review and explanation!
>
> The code of commit_pager_choice():
> static void commit_pager_choice(void)
> {
> switch (use_pager) {
> case 0:
> setenv("PERF_PAGER", "cat", 1);
> break;
> case 1:
> /* setup_pager(); */
> break;
> default:
> break;
> }
> }
>
> setup_pager() is not called.
>
> And it looks like kvm-events can not show the result properly if
> i try to remove setup_pager.
>
>
You're right; I blew right past the fact that it is a comment.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-02-09 3:36 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-07 13:06 [PATCH v3 0/3] KVM: perf: a smart tool to analyse kvm events Xiao Guangrong
2012-02-07 13:07 ` [PATCH 1/3] KVM: x86: export svm/vmx exit-code definitions to userspace Xiao Guangrong
2012-02-07 13:08 ` [PATCH v3 2/3] KVM: x86: add tracepoints to trace mmio begin and complete Xiao Guangrong
2012-02-07 13:08 ` [PATCH v3 3/3] KVM: perf: kvm events analysis tool Xiao Guangrong
2012-02-07 17:55 ` David Ahern
2012-02-08 6:14 ` Xiao Guangrong
2012-02-08 14:26 ` David Ahern
2012-02-09 3:07 ` Xiao Guangrong
2012-02-09 3:36 ` David Ahern
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).