* [patch 0/2] replace kvmtrace with event traces @ 2009-06-15 18:31 Marcelo Tosatti 2009-06-15 18:31 ` [patch 1/2] KVM: convert custom marker based tracing to " Marcelo Tosatti 2009-06-15 18:31 ` Marcelo Tosatti 0 siblings, 2 replies; 21+ messages in thread From: Marcelo Tosatti @ 2009-06-15 18:31 UTC (permalink / raw) To: kvm; +Cc: rostedt -- ^ permalink raw reply [flat|nested] 21+ messages in thread
* [patch 1/2] KVM: convert custom marker based tracing to event traces 2009-06-15 18:31 [patch 0/2] replace kvmtrace with event traces Marcelo Tosatti @ 2009-06-15 18:31 ` Marcelo Tosatti 2009-06-15 20:03 ` Steven Rostedt 2009-06-15 18:31 ` Marcelo Tosatti 1 sibling, 1 reply; 21+ messages in thread From: Marcelo Tosatti @ 2009-06-15 18:31 UTC (permalink / raw) To: kvm; +Cc: rostedt, Marcelo Tosatti [-- Attachment #1: convert-to-event-trace --] [-- Type: text/plain, Size: 27131 bytes --] This allows use of the powerful ftrace infrastructure. See Documentation/trace/ for usage information. Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Index: kvm/arch/x86/kvm/lapic.c =================================================================== --- kvm.orig/arch/x86/kvm/lapic.c +++ kvm/arch/x86/kvm/lapic.c @@ -26,6 +26,7 @@ #include <linux/io.h> #include <linux/module.h> #include <linux/math64.h> +#include <trace/events/kvm/x86.h> #include <asm/processor.h> #include <asm/msr.h> #include <asm/page.h> @@ -515,8 +516,6 @@ static u32 __apic_read(struct kvm_lapic { u32 val = 0; - KVMTRACE_1D(APIC_ACCESS, apic->vcpu, (u32)offset, handler); - if (offset >= LAPIC_MMIO_LENGTH) return 0; @@ -562,6 +561,8 @@ static void apic_mmio_read(struct kvm_io } result = __apic_read(apic, offset & ~0xf); + trace_kvm_apic_read(offset, result); + switch (len) { case 1: case 2: @@ -657,7 +658,7 @@ static void apic_mmio_write(struct kvm_i offset &= 0xff0; - KVMTRACE_1D(APIC_ACCESS, apic->vcpu, (u32)offset, handler); + trace_kvm_apic_write(offset, val); switch (offset) { case APIC_ID: /* Local APIC ID */ Index: kvm/arch/x86/kvm/svm-trace.h =================================================================== --- /dev/null +++ kvm/arch/x86/kvm/svm-trace.h @@ -0,0 +1,51 @@ +#define exit_reasons svm_exit_reasons +#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_NPF, "npf"} Index: kvm/arch/x86/kvm/svm.c =================================================================== --- kvm.orig/arch/x86/kvm/svm.c +++ kvm/arch/x86/kvm/svm.c @@ -29,6 +29,9 @@ #include <asm/desc.h> #include <asm/virtext.h> +#include "svm-trace.h" +#define CREATE_TRACE_POINTS +#include <trace/events/kvm/x86-arch.h> #define __ex(x) __kvm_handle_fault_on_reboot(x) @@ -1113,7 +1116,6 @@ static unsigned long svm_get_dr(struct k val = 0; } - KVMTRACE_2D(DR_READ, vcpu, (u32)dr, (u32)val, handler); return val; } @@ -1122,8 +1124,6 @@ static void svm_set_dr(struct kvm_vcpu * { struct vcpu_svm *svm = to_svm(vcpu); - KVMTRACE_2D(DR_WRITE, vcpu, (u32)dr, (u32)value, handler); - *exception = 0; switch (dr) { @@ -1171,14 +1171,7 @@ static int pf_interception(struct vcpu_s fault_address = svm->vmcb->control.exit_info_2; error_code = svm->vmcb->control.exit_info_1; - if (!npt_enabled) - KVMTRACE_3D(PAGE_FAULT, &svm->vcpu, error_code, - (u32)fault_address, (u32)(fault_address >> 32), - handler); - else - KVMTRACE_3D(TDP_FAULT, &svm->vcpu, error_code, - (u32)fault_address, (u32)(fault_address >> 32), - handler); + trace_kvm_page_fault(fault_address, error_code); /* * FIXME: Tis shouldn't be necessary here, but there is a flush * missing in the MMU code. Until we find this bug, flush the @@ -1305,14 +1298,12 @@ static int io_interception(struct vcpu_s static int nmi_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run) { - KVMTRACE_0D(NMI, &svm->vcpu, handler); return 1; } static int intr_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run) { ++svm->vcpu.stat.irq_exits; - KVMTRACE_0D(INTR, &svm->vcpu, handler); return 1; } @@ -2079,8 +2070,7 @@ static int rdmsr_interception(struct vcp if (svm_get_msr(&svm->vcpu, ecx, &data)) kvm_inject_gp(&svm->vcpu, 0); else { - KVMTRACE_3D(MSR_READ, &svm->vcpu, ecx, (u32)data, - (u32)(data >> 32), handler); + trace_kvm_msr_read(ecx, data); svm->vcpu.arch.regs[VCPU_REGS_RAX] = data & 0xffffffff; svm->vcpu.arch.regs[VCPU_REGS_RDX] = data >> 32; @@ -2158,8 +2148,7 @@ static int wrmsr_interception(struct vcp u64 data = (svm->vcpu.arch.regs[VCPU_REGS_RAX] & -1u) | ((u64)(svm->vcpu.arch.regs[VCPU_REGS_RDX] & -1u) << 32); - KVMTRACE_3D(MSR_WRITE, &svm->vcpu, ecx, (u32)data, (u32)(data >> 32), - handler); + trace_kvm_msr_write(ecx, data); svm->next_rip = kvm_rip_read(&svm->vcpu) + 2; if (svm_set_msr(&svm->vcpu, ecx, data)) @@ -2180,8 +2169,6 @@ static int msr_interception(struct vcpu_ static int interrupt_window_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run) { - KVMTRACE_0D(PEND_INTR, &svm->vcpu, handler); - svm_clear_vintr(svm); svm->vmcb->control.int_ctl &= ~V_IRQ_MASK; /* @@ -2260,8 +2247,7 @@ static int handle_exit(struct kvm_run *k struct vcpu_svm *svm = to_svm(vcpu); u32 exit_code = svm->vmcb->control.exit_code; - KVMTRACE_3D(VMEXIT, vcpu, exit_code, (u32)svm->vmcb->save.rip, - (u32)((u64)svm->vmcb->save.rip >> 32), entryexit); + trace_kvm_exit(exit_code, svm->vmcb->save.rip); if (is_nested(svm)) { nsvm_printk("nested handle_exit: 0x%x | 0x%lx | 0x%lx | 0x%lx\n", @@ -2349,7 +2335,7 @@ static inline void svm_inject_irq(struct { struct vmcb_control_area *control; - KVMTRACE_1D(INJ_VIRQ, &svm->vcpu, (u32)irq, handler); + trace_kvm_inj_virq(irq); ++svm->vcpu.stat.irq_injections; control = &svm->vmcb->control; Index: kvm/arch/x86/kvm/vmx-trace.h =================================================================== --- /dev/null +++ kvm/arch/x86/kvm/vmx-trace.h @@ -0,0 +1,22 @@ +#define exit_reasons vmx_exit_reasons +#define vmx_exit_reasons \ + {EXIT_REASON_EXCEPTION_NMI, "exception"}, \ + {EXIT_REASON_EXTERNAL_INTERRUPT, "ext_irq"}, \ + {EXIT_REASON_TRIPLE_FAULT, "triple_fault"}, \ + {EXIT_REASON_NMI_WINDOW, "nmi_window"}, \ + {EXIT_REASON_IO_INSTRUCTION, "io_instruction"}, \ + {EXIT_REASON_CR_ACCESS, "cr_access"}, \ + {EXIT_REASON_DR_ACCESS, "dr_access"}, \ + {EXIT_REASON_CPUID, "cpuid"}, \ + {EXIT_REASON_MSR_READ, "rdmsr"}, \ + {EXIT_REASON_MSR_WRITE, "wrmsr"}, \ + {EXIT_REASON_PENDING_INTERRUPT, "interrupt_window"}, \ + {EXIT_REASON_HLT, "halt"}, \ + {EXIT_REASON_INVLPG, "invlpg"}, \ + {EXIT_REASON_VMCALL, "hypercall"}, \ + {EXIT_REASON_TPR_BELOW_THRESHOLD, "tpr_below_thres"}, \ + {EXIT_REASON_APIC_ACCESS, "apic_access"}, \ + {EXIT_REASON_WBINVD, "wbinvd"}, \ + {EXIT_REASON_TASK_SWITCH, "task_switch"}, \ + {EXIT_REASON_EPT_VIOLATION, "ept_violation"} + Index: kvm/arch/x86/kvm/vmx.c =================================================================== --- kvm.orig/arch/x86/kvm/vmx.c +++ kvm/arch/x86/kvm/vmx.c @@ -34,6 +34,10 @@ #include <asm/virtext.h> #include <asm/mce.h> +#include "vmx-trace.h" +#define CREATE_TRACE_POINTS +#include <trace/events/kvm/x86-arch.h> + #define __ex(x) __kvm_handle_fault_on_reboot(x) MODULE_AUTHOR("Qumranet"); @@ -2550,7 +2554,7 @@ static void vmx_inject_irq(struct kvm_vc uint32_t intr; int irq = vcpu->arch.interrupt.nr; - KVMTRACE_1D(INJ_VIRQ, vcpu, (u32)irq, handler); + trace_kvm_inj_virq(irq); ++vcpu->stat.irq_injections; if (vmx->rmode.vm86_active) { @@ -2751,8 +2755,8 @@ static int handle_exception(struct kvm_v if (enable_ept) BUG(); cr2 = vmcs_readl(EXIT_QUALIFICATION); - KVMTRACE_3D(PAGE_FAULT, vcpu, error_code, (u32)cr2, - (u32)((u64)cr2 >> 32), handler); + trace_kvm_page_fault(cr2, error_code); + if (kvm_event_needs_reinjection(vcpu)) kvm_mmu_unprotect_page_virt(vcpu, cr2); return kvm_mmu_page_fault(vcpu, cr2, error_code); @@ -2799,7 +2803,6 @@ static int handle_external_interrupt(str struct kvm_run *kvm_run) { ++vcpu->stat.irq_exits; - KVMTRACE_1D(INTR, vcpu, vmcs_read32(VM_EXIT_INTR_INFO), handler); return 1; } @@ -2847,7 +2850,7 @@ vmx_patch_hypercall(struct kvm_vcpu *vcp static int handle_cr(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) { - unsigned long exit_qualification; + unsigned long exit_qualification, val; int cr; int reg; @@ -2856,21 +2859,19 @@ static int handle_cr(struct kvm_vcpu *vc reg = (exit_qualification >> 8) & 15; switch ((exit_qualification >> 4) & 3) { case 0: /* mov to cr */ - KVMTRACE_3D(CR_WRITE, vcpu, (u32)cr, - (u32)kvm_register_read(vcpu, reg), - (u32)((u64)kvm_register_read(vcpu, reg) >> 32), - handler); + val = kvm_register_read(vcpu, reg); + trace_kvm_cr_write(cr, val); switch (cr) { case 0: - kvm_set_cr0(vcpu, kvm_register_read(vcpu, reg)); + kvm_set_cr0(vcpu, val); skip_emulated_instruction(vcpu); return 1; case 3: - kvm_set_cr3(vcpu, kvm_register_read(vcpu, reg)); + kvm_set_cr3(vcpu, val); skip_emulated_instruction(vcpu); return 1; case 4: - kvm_set_cr4(vcpu, kvm_register_read(vcpu, reg)); + kvm_set_cr4(vcpu, val); skip_emulated_instruction(vcpu); return 1; case 8: { @@ -2892,23 +2893,19 @@ static int handle_cr(struct kvm_vcpu *vc vcpu->arch.cr0 &= ~X86_CR0_TS; vmcs_writel(CR0_READ_SHADOW, vcpu->arch.cr0); vmx_fpu_activate(vcpu); - KVMTRACE_0D(CLTS, vcpu, handler); skip_emulated_instruction(vcpu); return 1; case 1: /*mov from cr*/ switch (cr) { case 3: kvm_register_write(vcpu, reg, vcpu->arch.cr3); - KVMTRACE_3D(CR_READ, vcpu, (u32)cr, - (u32)kvm_register_read(vcpu, reg), - (u32)((u64)kvm_register_read(vcpu, reg) >> 32), - handler); + trace_kvm_cr_read(cr, vcpu->arch.cr3); skip_emulated_instruction(vcpu); return 1; case 8: - kvm_register_write(vcpu, reg, kvm_get_cr8(vcpu)); - KVMTRACE_2D(CR_READ, vcpu, (u32)cr, - (u32)kvm_register_read(vcpu, reg), handler); + val = kvm_get_cr8(vcpu); + kvm_register_write(vcpu, cr, val); + trace_kvm_cr_read(cr, val); skip_emulated_instruction(vcpu); return 1; } @@ -2976,7 +2973,6 @@ static int handle_dr(struct kvm_vcpu *vc val = 0; } kvm_register_write(vcpu, reg, val); - KVMTRACE_2D(DR_READ, vcpu, (u32)dr, (u32)val, handler); } else { val = vcpu->arch.regs[reg]; switch (dr) { @@ -3009,7 +3005,6 @@ static int handle_dr(struct kvm_vcpu *vc } break; } - KVMTRACE_2D(DR_WRITE, vcpu, (u32)dr, (u32)val, handler); } skip_emulated_instruction(vcpu); return 1; @@ -3031,8 +3026,7 @@ static int handle_rdmsr(struct kvm_vcpu return 1; } - KVMTRACE_3D(MSR_READ, vcpu, ecx, (u32)data, (u32)(data >> 32), - handler); + trace_kvm_msr_read(ecx, data); /* FIXME: handling of bits 32:63 of rax, rdx */ vcpu->arch.regs[VCPU_REGS_RAX] = data & -1u; @@ -3047,8 +3041,7 @@ static int handle_wrmsr(struct kvm_vcpu u64 data = (vcpu->arch.regs[VCPU_REGS_RAX] & -1u) | ((u64)(vcpu->arch.regs[VCPU_REGS_RDX] & -1u) << 32); - KVMTRACE_3D(MSR_WRITE, vcpu, ecx, (u32)data, (u32)(data >> 32), - handler); + trace_kvm_msr_write(ecx, data); if (vmx_set_msr(vcpu, ecx, data) != 0) { kvm_inject_gp(vcpu, 0); @@ -3075,7 +3068,6 @@ static int handle_interrupt_window(struc cpu_based_vm_exec_control &= ~CPU_BASED_VIRTUAL_INTR_PENDING; vmcs_write32(CPU_BASED_VM_EXEC_CONTROL, cpu_based_vm_exec_control); - KVMTRACE_0D(PEND_INTR, vcpu, handler); ++vcpu->stat.irq_window_exits; /* @@ -3221,6 +3213,7 @@ static int handle_ept_violation(struct k } gpa = vmcs_read64(GUEST_PHYSICAL_ADDRESS); + trace_kvm_page_fault(gpa, exit_qualification); return kvm_mmu_page_fault(vcpu, gpa & PAGE_MASK, 0); } @@ -3395,8 +3388,7 @@ static int vmx_handle_exit(struct kvm_ru u32 exit_reason = vmx->exit_reason; u32 vectoring_info = vmx->idt_vectoring_info; - KVMTRACE_3D(VMEXIT, vcpu, exit_reason, (u32)kvm_rip_read(vcpu), - (u32)((u64)kvm_rip_read(vcpu) >> 32), entryexit); + trace_kvm_exit(exit_reason, kvm_rip_read(vcpu)); /* If we need to emulate an MMIO from handle_invalid_guest_state * we just return 0 */ @@ -3485,10 +3477,8 @@ static void vmx_complete_interrupts(stru /* We need to handle NMIs before interrupts are enabled */ if ((exit_intr_info & INTR_INFO_INTR_TYPE_MASK) == INTR_TYPE_NMI_INTR && - (exit_intr_info & INTR_INFO_VALID_MASK)) { - KVMTRACE_0D(NMI, &vmx->vcpu, handler); + (exit_intr_info & INTR_INFO_VALID_MASK)) asm("int $2"); - } idtv_info_valid = idt_vectoring_info & VECTORING_INFO_VALID_MASK; Index: kvm/arch/x86/kvm/x86.c =================================================================== --- kvm.orig/arch/x86/kvm/x86.c +++ kvm/arch/x86/kvm/x86.c @@ -37,6 +37,8 @@ #include <linux/iommu.h> #include <linux/intel-iommu.h> #include <linux/cpufreq.h> +#define CREATE_TRACE_POINTS +#include <trace/events/kvm/x86.h> #include <asm/uaccess.h> #include <asm/msr.h> @@ -347,9 +349,6 @@ EXPORT_SYMBOL_GPL(kvm_set_cr0); void kvm_lmsw(struct kvm_vcpu *vcpu, unsigned long msw) { kvm_set_cr0(vcpu, (vcpu->arch.cr0 & ~0x0ful) | (msw & 0x0f)); - KVMTRACE_1D(LMSW, vcpu, - (u32)((vcpu->arch.cr0 & ~0x0ful) | (msw & 0x0f)), - handler); } EXPORT_SYMBOL_GPL(kvm_lmsw); @@ -2531,7 +2530,6 @@ int emulate_invlpg(struct kvm_vcpu *vcpu int emulate_clts(struct kvm_vcpu *vcpu) { - KVMTRACE_0D(CLTS, vcpu, handler); kvm_x86_ops->set_cr0(vcpu, vcpu->arch.cr0 & ~X86_CR0_TS); return X86EMUL_CONTINUE; } @@ -2814,12 +2812,8 @@ int kvm_emulate_pio(struct kvm_vcpu *vcp vcpu->arch.pio.down = 0; vcpu->arch.pio.rep = 0; - if (vcpu->run->io.direction == KVM_EXIT_IO_IN) - KVMTRACE_2D(IO_READ, vcpu, vcpu->run->io.port, (u32)size, - handler); - else - KVMTRACE_2D(IO_WRITE, vcpu, vcpu->run->io.port, (u32)size, - handler); + trace_kvm_pio(vcpu->run->io.direction == KVM_EXIT_IO_OUT, port, + size, 1); val = kvm_register_read(vcpu, VCPU_REGS_RAX); memcpy(vcpu->arch.pio_data, &val, 4); @@ -2855,12 +2849,8 @@ int kvm_emulate_pio_string(struct kvm_vc vcpu->arch.pio.down = down; vcpu->arch.pio.rep = rep; - if (vcpu->run->io.direction == KVM_EXIT_IO_IN) - KVMTRACE_2D(IO_READ, vcpu, vcpu->run->io.port, (u32)size, - handler); - else - KVMTRACE_2D(IO_WRITE, vcpu, vcpu->run->io.port, (u32)size, - handler); + trace_kvm_pio(vcpu->run->io.direction == KVM_EXIT_IO_OUT, port, + size, count); if (!count) { kvm_x86_ops->skip_emulated_instruction(vcpu); @@ -3038,7 +3028,6 @@ void kvm_arch_exit(void) int kvm_emulate_halt(struct kvm_vcpu *vcpu) { ++vcpu->stat.halt_exits; - KVMTRACE_0D(HLT, vcpu, handler); if (irqchip_in_kernel(vcpu->kvm)) { vcpu->arch.mp_state = KVM_MP_STATE_HALTED; return 1; @@ -3069,7 +3058,7 @@ int kvm_emulate_hypercall(struct kvm_vcp a2 = kvm_register_read(vcpu, VCPU_REGS_RDX); a3 = kvm_register_read(vcpu, VCPU_REGS_RSI); - KVMTRACE_1D(VMMCALL, vcpu, (u32)nr, handler); + trace_kvm_hypercall(nr, a0, a1, a2, a3); if (!is_long_mode(vcpu)) { nr &= 0xFFFFFFFF; @@ -3169,8 +3158,6 @@ unsigned long realmode_get_cr(struct kvm vcpu_printf(vcpu, "%s: unexpected cr %u\n", __func__, cr); return 0; } - KVMTRACE_3D(CR_READ, vcpu, (u32)cr, (u32)value, - (u32)((u64)value >> 32), handler); return value; } @@ -3178,9 +3165,6 @@ unsigned long realmode_get_cr(struct kvm void realmode_set_cr(struct kvm_vcpu *vcpu, int cr, unsigned long val, unsigned long *rflags) { - KVMTRACE_3D(CR_WRITE, vcpu, (u32)cr, (u32)val, - (u32)((u64)val >> 32), handler); - switch (cr) { case 0: kvm_set_cr0(vcpu, mk_cr_64(vcpu->arch.cr0, val)); @@ -3290,11 +3274,11 @@ void kvm_emulate_cpuid(struct kvm_vcpu * kvm_register_write(vcpu, VCPU_REGS_RDX, best->edx); } kvm_x86_ops->skip_emulated_instruction(vcpu); - KVMTRACE_5D(CPUID, vcpu, function, - (u32)kvm_register_read(vcpu, VCPU_REGS_RAX), - (u32)kvm_register_read(vcpu, VCPU_REGS_RBX), - (u32)kvm_register_read(vcpu, VCPU_REGS_RCX), - (u32)kvm_register_read(vcpu, VCPU_REGS_RDX), handler); + trace_kvm_cpuid(function, + kvm_register_read(vcpu, VCPU_REGS_RAX), + kvm_register_read(vcpu, VCPU_REGS_RBX), + kvm_register_read(vcpu, VCPU_REGS_RCX), + kvm_register_read(vcpu, VCPU_REGS_RDX)); } EXPORT_SYMBOL_GPL(kvm_emulate_cpuid); @@ -3490,7 +3474,7 @@ static int vcpu_enter_guest(struct kvm_v set_debugreg(vcpu->arch.eff_db[3], 3); } - KVMTRACE_0D(VMENTRY, vcpu, entryexit); + trace_kvm_entry(vcpu->vcpu_id); kvm_x86_ops->run(vcpu, kvm_run); if (unlikely(vcpu->arch.switch_db_regs)) { Index: kvm/include/trace/events/kvm/x86-arch.h =================================================================== --- /dev/null +++ kvm/include/trace/events/kvm/x86-arch.h @@ -0,0 +1,128 @@ +#if !defined(_TRACE_KVM_ARCH_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_KVM_ARCH_H + +#include <linux/tracepoint.h> + +#undef TRACE_SYSTEM +#define TRACE_SYSTEM kvm +#define TRACE_INCLUDE_FILE kvm/x86-arch + +/* + * Tracepoint for kvm guest exit: + */ +TRACE_EVENT(kvm_exit, + TP_PROTO(unsigned int exit_reason, unsigned long guest_rip), + TP_ARGS(exit_reason, guest_rip), + + TP_STRUCT__entry( + __field( unsigned int, exit_reason ) + __field( unsigned long, guest_rip ) + ), + + TP_fast_assign( + __entry->exit_reason = exit_reason; + __entry->guest_rip = guest_rip; + ), + + TP_printk("reason %s rip 0x%lx", + __print_symbolic(__entry->exit_reason, exit_reasons), + __entry->guest_rip) +); + +/* + * Tracepoint for kvm interrupt injection: + */ +TRACE_EVENT(kvm_inj_virq, + TP_PROTO(unsigned int irq), + TP_ARGS(irq), + + TP_STRUCT__entry( + __field( unsigned int, irq ) + ), + + TP_fast_assign( + __entry->irq = irq; + ), + + TP_printk("irq %u", __entry->irq) +); + +/* + * Tracepoint for page fault. + */ +TRACE_EVENT(kvm_page_fault, + TP_PROTO(unsigned long fault_address, unsigned int error_code), + TP_ARGS(fault_address, error_code), + + TP_STRUCT__entry( + __field( unsigned long, fault_address ) + __field( unsigned int, error_code ) + ), + + TP_fast_assign( + __entry->fault_address = fault_address; + __entry->error_code = error_code; + ), + + TP_printk("address %lx error_code %x", + __entry->fault_address, __entry->error_code) +); + +/* + * Tracepoint for guest MSR access. + */ +TRACE_EVENT(kvm_msr, + TP_PROTO(unsigned int rw, unsigned int ecx, unsigned long data), + TP_ARGS(rw, ecx, data), + + TP_STRUCT__entry( + __field( unsigned int, rw ) + __field( unsigned int, ecx ) + __field( unsigned long, data ) + ), + + TP_fast_assign( + __entry->rw = rw; + __entry->ecx = ecx; + __entry->data = data; + ), + + TP_printk("msr_%s %x = 0x%lx", + __entry->rw ? "write" : "read", + __entry->ecx, __entry->data) +); + +#define trace_kvm_msr_read(ecx, data) trace_kvm_msr(0, ecx, data) +#define trace_kvm_msr_write(ecx, data) trace_kvm_msr(1, ecx, data) + +/* + * Tracepoint for guest CR access. + */ +TRACE_EVENT(kvm_cr, + TP_PROTO(unsigned int rw, unsigned int cr, unsigned long val), + TP_ARGS(rw, cr, val), + + TP_STRUCT__entry( + __field( unsigned int, rw ) + __field( unsigned int, cr ) + __field( unsigned long, val ) + ), + + TP_fast_assign( + __entry->rw = rw; + __entry->cr = cr; + __entry->val = val; + ), + + TP_printk("cr_%s %x = 0x%lx", + __entry->rw ? "write" : "read", + __entry->cr, __entry->val) +); + +#define trace_kvm_cr_read(cr, val) trace_kvm_cr(0, cr, val) +#define trace_kvm_cr_write(cr, val) trace_kvm_cr(1, cr, val) + +#endif /* _TRACE_KVM_ARCH_H */ + +/* This part must be outside protection */ +#include <trace/define_trace.h> Index: kvm/include/trace/events/kvm/x86.h =================================================================== --- /dev/null +++ kvm/include/trace/events/kvm/x86.h @@ -0,0 +1,143 @@ +#if !defined(_TRACE_KVM_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_KVM_H + +#include <linux/tracepoint.h> + +#undef TRACE_SYSTEM +#define TRACE_SYSTEM kvm +#define TRACE_INCLUDE_FILE kvm/x86 + +/* + * Tracepoint for guest mode entry. + */ +TRACE_EVENT(kvm_entry, + 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\n", __entry->vcpu_id) +); + +/* + * Tracepoint for hypercall. + */ +TRACE_EVENT(kvm_hypercall, + TP_PROTO(unsigned long nr, unsigned long a0, unsigned long a1, + unsigned long a2, unsigned long a3), + TP_ARGS(nr, a0, a1, a2, a3), + + TP_STRUCT__entry( + __field( unsigned long, nr ) + __field( unsigned long, a0 ) + __field( unsigned long, a1 ) + __field( unsigned long, a2 ) + __field( unsigned long, a3 ) + ), + + TP_fast_assign( + __entry->nr = nr; + __entry->a0 = a0; + __entry->a1 = a1; + __entry->a2 = a2; + __entry->a3 = a3; + ), + + TP_printk("nr 0x%lx a0 0x%lx a1 0x%lx a2 0x%lx a3 0x%lx", + __entry->nr, __entry->a0, __entry->a1, __entry->a2, + __entry->a3) +); + +/* + * Tracepoint for PIO. + */ +TRACE_EVENT(kvm_pio, + TP_PROTO(unsigned int rw, unsigned int port, unsigned int size, + unsigned int count), + TP_ARGS(rw, port, size, count), + + TP_STRUCT__entry( + __field( unsigned int, rw ) + __field( unsigned int, port ) + __field( unsigned int, size ) + __field( unsigned int, count ) + ), + + TP_fast_assign( + __entry->rw = rw; + __entry->port = port; + __entry->size = size; + __entry->count = count; + ), + + TP_printk("pio_%s at 0x%x size %d count %d", + __entry->rw ? "write" : "read", + __entry->port, __entry->size, __entry->count) +); + +/* + * Tracepoint for cpuid. + */ +TRACE_EVENT(kvm_cpuid, + TP_PROTO(unsigned int function, unsigned long rax, unsigned long rbx, + unsigned long rcx, unsigned long rdx), + TP_ARGS(function, rax, rbx, rcx, rdx), + + TP_STRUCT__entry( + __field( unsigned int, function ) + __field( unsigned long, rax ) + __field( unsigned long, rbx ) + __field( unsigned long, rcx ) + __field( unsigned long, rdx ) + ), + + TP_fast_assign( + __entry->function = function; + __entry->rax = rax; + __entry->rbx = rbx; + __entry->rcx = rcx; + __entry->rdx = rdx; + ), + + TP_printk("func %x rax %lx rbx %lx rcx %lx rdx %lx", + __entry->function, __entry->rax, + __entry->rbx, __entry->rcx, __entry->rdx) +); + +/* + * Tracepoint for apic access. + */ +TRACE_EVENT(kvm_apic, + TP_PROTO(unsigned int rw, unsigned int reg, unsigned int val), + TP_ARGS(rw, reg, val), + + TP_STRUCT__entry( + __field( unsigned int, rw ) + __field( unsigned int, reg ) + __field( unsigned int, val ) + ), + + TP_fast_assign( + __entry->rw = rw; + __entry->reg = reg; + __entry->val = val; + ), + + TP_printk("apic_%s 0x%x = 0x%x", + __entry->rw ? "write" : "read", + __entry->reg, __entry->val) +); + +#define trace_kvm_apic_read(reg, val) trace_kvm_apic(0, reg, val) +#define trace_kvm_apic_write(reg, val) trace_kvm_apic(1, reg, val) + +#endif /* _TRACE_KVM_H */ + +/* This part must be outside protection */ +#include <trace/define_trace.h> Index: kvm/include/trace/events/kvm/kvm.h =================================================================== --- /dev/null +++ kvm/include/trace/events/kvm/kvm.h @@ -0,0 +1,55 @@ +#if !defined(_TRACE_KVM_MAIN_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_KVM_MAIN_H + +#include <linux/tracepoint.h> + +#undef TRACE_SYSTEM +#define TRACE_SYSTEM kvm +#define TRACE_INCLUDE_FILE kvm/kvm + +TRACE_EVENT(kvm_set_irq, + TP_PROTO(unsigned int gsi), + TP_ARGS(gsi), + + TP_STRUCT__entry( + __field( unsigned int, gsi ) + ), + + TP_fast_assign( + __entry->gsi = gsi; + ), + + TP_printk("gsi %u", __entry->gsi) +); + + +#define kvm_irqchips \ + {KVM_IRQCHIP_PIC_MASTER, "PIC master"}, \ + {KVM_IRQCHIP_PIC_SLAVE, "PIC slave"}, \ + {KVM_IRQCHIP_IOAPIC, "IOAPIC"} + +TRACE_EVENT(kvm_ack_irq, + TP_PROTO(unsigned int irqchip, unsigned int pin), + TP_ARGS(irqchip, pin), + + TP_STRUCT__entry( + __field( unsigned int, irqchip ) + __field( unsigned int, pin ) + ), + + TP_fast_assign( + __entry->irqchip = irqchip; + __entry->pin = pin; + ), + + TP_printk("irqchip %s pin %u", + __print_symbolic(__entry->irqchip, kvm_irqchips), + __entry->pin) +); + + + +#endif /* _TRACE_KVM_MAIN_H */ + +/* This part must be outside protection */ +#include <trace/define_trace.h> Index: kvm/virt/kvm/irq_comm.c =================================================================== --- kvm.orig/virt/kvm/irq_comm.c +++ kvm/virt/kvm/irq_comm.c @@ -20,6 +20,7 @@ */ #include <linux/kvm_host.h> +#include <trace/events/kvm/kvm.h> #include <asm/msidef.h> #ifdef CONFIG_IA64 @@ -125,6 +126,8 @@ int kvm_set_irq(struct kvm *kvm, int irq unsigned long *irq_state, sig_level; int ret = -1; + trace_kvm_set_irq(irq); + WARN_ON(!mutex_is_locked(&kvm->irq_lock)); if (irq < KVM_IOAPIC_NUM_PINS) { @@ -161,6 +164,8 @@ void kvm_notify_acked_irq(struct kvm *kv struct hlist_node *n; unsigned gsi = pin; + trace_kvm_ack_irq(irqchip, pin); + list_for_each_entry(e, &kvm->irq_routing, link) if (e->irqchip.irqchip == irqchip && e->irqchip.pin == pin) { Index: kvm/virt/kvm/kvm_main.c =================================================================== --- kvm.orig/virt/kvm/kvm_main.c +++ kvm/virt/kvm/kvm_main.c @@ -59,6 +59,9 @@ #include "irq.h" #endif +#define CREATE_TRACE_POINTS +#include <trace/events/kvm/kvm.h> + MODULE_AUTHOR("Qumranet"); MODULE_LICENSE("GPL"); @@ -2715,6 +2718,7 @@ EXPORT_SYMBOL_GPL(kvm_init); void kvm_exit(void) { kvm_trace_cleanup(); + tracepoint_synchronize_unregister(); misc_deregister(&kvm_dev); kmem_cache_destroy(kvm_vcpu_cache); sysdev_unregister(&kvm_sysdev); -- ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [patch 1/2] KVM: convert custom marker based tracing to event traces 2009-06-15 18:31 ` [patch 1/2] KVM: convert custom marker based tracing to " Marcelo Tosatti @ 2009-06-15 20:03 ` Steven Rostedt 2009-06-16 12:44 ` Marcelo Tosatti 0 siblings, 1 reply; 21+ messages in thread From: Steven Rostedt @ 2009-06-15 20:03 UTC (permalink / raw) To: Marcelo Tosatti; +Cc: kvm On Mon, 15 Jun 2009, Marcelo Tosatti wrote: > This allows use of the powerful ftrace infrastructure. > > See Documentation/trace/ for usage information. > > Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> > > Index: kvm/arch/x86/kvm/svm.c > =================================================================== > --- kvm.orig/arch/x86/kvm/svm.c > +++ kvm/arch/x86/kvm/svm.c > @@ -29,6 +29,9 @@ > #include <asm/desc.h> > > #include <asm/virtext.h> > +#include "svm-trace.h" > +#define CREATE_TRACE_POINTS > +#include <trace/events/kvm/x86-arch.h> > > #define __ex(x) __kvm_handle_fault_on_reboot(x) > > Index: kvm/arch/x86/kvm/vmx.c > =================================================================== > --- kvm.orig/arch/x86/kvm/vmx.c > +++ kvm/arch/x86/kvm/vmx.c > @@ -34,6 +34,10 @@ > #include <asm/virtext.h> > #include <asm/mce.h> > > +#include "vmx-trace.h" > +#define CREATE_TRACE_POINTS > +#include <trace/events/kvm/x86-arch.h> > + > #define __ex(x) __kvm_handle_fault_on_reboot(x) > > MODULE_AUTHOR("Qumranet"); > Index: kvm/arch/x86/kvm/x86.c > =================================================================== > --- kvm.orig/arch/x86/kvm/x86.c > +++ kvm/arch/x86/kvm/x86.c > @@ -37,6 +37,8 @@ > #include <linux/iommu.h> > #include <linux/intel-iommu.h> > #include <linux/cpufreq.h> > +#define CREATE_TRACE_POINTS > +#include <trace/events/kvm/x86.h> > > #include <asm/uaccess.h> > #include <asm/msr.h> > @@ -347,9 +349,6 @@ EXPORT_SYMBOL_GPL(kvm_set_cr0); > Index: kvm/include/trace/events/kvm/x86-arch.h > =================================================================== > --- /dev/null > +++ kvm/include/trace/events/kvm/x86-arch.h One suggestion. Instead of putting in arch specific trace points into generic code, you can put these into arch/x86/kvm/trace.h ? Then you can in the Makefile add: CFLAGS_x86.o := -I. CFLAGS_svm.o := -I. CFLAGS_vmx.o := -I. Or better yet, have a single file called trace.c: in the Makefile: CFLAGS_trace.o := -I. obj-$(EVENT_TRACING) += trace.o in trace.c: #define CREATE_TRACE_POINTS #include "trace.h" #include "trace-arch.h" Then have the kvm/x86.h moved to trace.h and the kvm/arch-x86.h move to trace-arch.h Just change the "TRACE_INCLUDE_FILE" to include the proper name. -- Steve > @@ -0,0 +1,128 @@ > +#if !defined(_TRACE_KVM_ARCH_H) || defined(TRACE_HEADER_MULTI_READ) > +#define _TRACE_KVM_ARCH_H > + > +#include <linux/tracepoint.h> > + > +#undef TRACE_SYSTEM > +#define TRACE_SYSTEM kvm > +#define TRACE_INCLUDE_FILE kvm/x86-arch > + > +/* > + * Tracepoint for kvm guest exit: > + */ > +TRACE_EVENT(kvm_exit, > + TP_PROTO(unsigned int exit_reason, unsigned long guest_rip), > + TP_ARGS(exit_reason, guest_rip), > + > + TP_STRUCT__entry( > + __field( unsigned int, exit_reason ) > + __field( unsigned long, guest_rip ) > + ), > + > + TP_fast_assign( > + __entry->exit_reason = exit_reason; > + __entry->guest_rip = guest_rip; > + ), > + > + TP_printk("reason %s rip 0x%lx", > + __print_symbolic(__entry->exit_reason, exit_reasons), > + __entry->guest_rip) > +); > + > +/* > + * Tracepoint for kvm interrupt injection: > + */ > +TRACE_EVENT(kvm_inj_virq, > + TP_PROTO(unsigned int irq), > + TP_ARGS(irq), > + > + TP_STRUCT__entry( > + __field( unsigned int, irq ) > + ), > + > + TP_fast_assign( > + __entry->irq = irq; > + ), > + > + TP_printk("irq %u", __entry->irq) > +); > + > +/* > + * Tracepoint for page fault. > + */ > +TRACE_EVENT(kvm_page_fault, > + TP_PROTO(unsigned long fault_address, unsigned int error_code), > + TP_ARGS(fault_address, error_code), > + > + TP_STRUCT__entry( > + __field( unsigned long, fault_address ) > + __field( unsigned int, error_code ) > + ), > + > + TP_fast_assign( > + __entry->fault_address = fault_address; > + __entry->error_code = error_code; > + ), > + > + TP_printk("address %lx error_code %x", > + __entry->fault_address, __entry->error_code) > +); > + > +/* > + * Tracepoint for guest MSR access. > + */ > +TRACE_EVENT(kvm_msr, > + TP_PROTO(unsigned int rw, unsigned int ecx, unsigned long data), > + TP_ARGS(rw, ecx, data), > + > + TP_STRUCT__entry( > + __field( unsigned int, rw ) > + __field( unsigned int, ecx ) > + __field( unsigned long, data ) > + ), > + > + TP_fast_assign( > + __entry->rw = rw; > + __entry->ecx = ecx; > + __entry->data = data; > + ), > + > + TP_printk("msr_%s %x = 0x%lx", > + __entry->rw ? "write" : "read", > + __entry->ecx, __entry->data) > +); > + > +#define trace_kvm_msr_read(ecx, data) trace_kvm_msr(0, ecx, data) > +#define trace_kvm_msr_write(ecx, data) trace_kvm_msr(1, ecx, data) > + > +/* > + * Tracepoint for guest CR access. > + */ > +TRACE_EVENT(kvm_cr, > + TP_PROTO(unsigned int rw, unsigned int cr, unsigned long val), > + TP_ARGS(rw, cr, val), > + > + TP_STRUCT__entry( > + __field( unsigned int, rw ) > + __field( unsigned int, cr ) > + __field( unsigned long, val ) > + ), > + > + TP_fast_assign( > + __entry->rw = rw; > + __entry->cr = cr; > + __entry->val = val; > + ), > + > + TP_printk("cr_%s %x = 0x%lx", > + __entry->rw ? "write" : "read", > + __entry->cr, __entry->val) > +); > + > +#define trace_kvm_cr_read(cr, val) trace_kvm_cr(0, cr, val) > +#define trace_kvm_cr_write(cr, val) trace_kvm_cr(1, cr, val) > + > +#endif /* _TRACE_KVM_ARCH_H */ > + > +/* This part must be outside protection */ > +#include <trace/define_trace.h> > Index: kvm/include/trace/events/kvm/x86.h > =================================================================== > --- /dev/null > +++ kvm/include/trace/events/kvm/x86.h > @@ -0,0 +1,143 @@ > +#if !defined(_TRACE_KVM_H) || defined(TRACE_HEADER_MULTI_READ) > +#define _TRACE_KVM_H > + > +#include <linux/tracepoint.h> > + > +#undef TRACE_SYSTEM > +#define TRACE_SYSTEM kvm > +#define TRACE_INCLUDE_FILE kvm/x86 > + > +/* > + * Tracepoint for guest mode entry. > + */ > +TRACE_EVENT(kvm_entry, > + 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\n", __entry->vcpu_id) > +); > + > +/* > + * Tracepoint for hypercall. > + */ > +TRACE_EVENT(kvm_hypercall, > + TP_PROTO(unsigned long nr, unsigned long a0, unsigned long a1, > + unsigned long a2, unsigned long a3), > + TP_ARGS(nr, a0, a1, a2, a3), > + > + TP_STRUCT__entry( > + __field( unsigned long, nr ) > + __field( unsigned long, a0 ) > + __field( unsigned long, a1 ) > + __field( unsigned long, a2 ) > + __field( unsigned long, a3 ) > + ), > + > + TP_fast_assign( > + __entry->nr = nr; > + __entry->a0 = a0; > + __entry->a1 = a1; > + __entry->a2 = a2; > + __entry->a3 = a3; > + ), > + > + TP_printk("nr 0x%lx a0 0x%lx a1 0x%lx a2 0x%lx a3 0x%lx", > + __entry->nr, __entry->a0, __entry->a1, __entry->a2, > + __entry->a3) > +); > + > +/* > + * Tracepoint for PIO. > + */ > +TRACE_EVENT(kvm_pio, > + TP_PROTO(unsigned int rw, unsigned int port, unsigned int size, > + unsigned int count), > + TP_ARGS(rw, port, size, count), > + > + TP_STRUCT__entry( > + __field( unsigned int, rw ) > + __field( unsigned int, port ) > + __field( unsigned int, size ) > + __field( unsigned int, count ) > + ), > + > + TP_fast_assign( > + __entry->rw = rw; > + __entry->port = port; > + __entry->size = size; > + __entry->count = count; > + ), > + > + TP_printk("pio_%s at 0x%x size %d count %d", > + __entry->rw ? "write" : "read", > + __entry->port, __entry->size, __entry->count) > +); > + > +/* > + * Tracepoint for cpuid. > + */ > +TRACE_EVENT(kvm_cpuid, > + TP_PROTO(unsigned int function, unsigned long rax, unsigned long rbx, > + unsigned long rcx, unsigned long rdx), > + TP_ARGS(function, rax, rbx, rcx, rdx), > + > + TP_STRUCT__entry( > + __field( unsigned int, function ) > + __field( unsigned long, rax ) > + __field( unsigned long, rbx ) > + __field( unsigned long, rcx ) > + __field( unsigned long, rdx ) > + ), > + > + TP_fast_assign( > + __entry->function = function; > + __entry->rax = rax; > + __entry->rbx = rbx; > + __entry->rcx = rcx; > + __entry->rdx = rdx; > + ), > + > + TP_printk("func %x rax %lx rbx %lx rcx %lx rdx %lx", > + __entry->function, __entry->rax, > + __entry->rbx, __entry->rcx, __entry->rdx) > +); > + > +/* > + * Tracepoint for apic access. > + */ > +TRACE_EVENT(kvm_apic, > + TP_PROTO(unsigned int rw, unsigned int reg, unsigned int val), > + TP_ARGS(rw, reg, val), > + > + TP_STRUCT__entry( > + __field( unsigned int, rw ) > + __field( unsigned int, reg ) > + __field( unsigned int, val ) > + ), > + > + TP_fast_assign( > + __entry->rw = rw; > + __entry->reg = reg; > + __entry->val = val; > + ), > + > + TP_printk("apic_%s 0x%x = 0x%x", > + __entry->rw ? "write" : "read", > + __entry->reg, __entry->val) > +); > + > +#define trace_kvm_apic_read(reg, val) trace_kvm_apic(0, reg, val) > +#define trace_kvm_apic_write(reg, val) trace_kvm_apic(1, reg, val) > + > +#endif /* _TRACE_KVM_H */ > + > +/* This part must be outside protection */ > +#include <trace/define_trace.h> > Index: kvm/include/trace/events/kvm/kvm.h > =================================================================== > --- /dev/null > +++ kvm/include/trace/events/kvm/kvm.h > @@ -0,0 +1,55 @@ > +#if !defined(_TRACE_KVM_MAIN_H) || defined(TRACE_HEADER_MULTI_READ) > +#define _TRACE_KVM_MAIN_H > + > +#include <linux/tracepoint.h> > + > +#undef TRACE_SYSTEM > +#define TRACE_SYSTEM kvm > +#define TRACE_INCLUDE_FILE kvm/kvm > + > +TRACE_EVENT(kvm_set_irq, > + TP_PROTO(unsigned int gsi), > + TP_ARGS(gsi), > + > + TP_STRUCT__entry( > + __field( unsigned int, gsi ) > + ), > + > + TP_fast_assign( > + __entry->gsi = gsi; > + ), > + > + TP_printk("gsi %u", __entry->gsi) > +); > + > + > +#define kvm_irqchips \ > + {KVM_IRQCHIP_PIC_MASTER, "PIC master"}, \ > + {KVM_IRQCHIP_PIC_SLAVE, "PIC slave"}, \ > + {KVM_IRQCHIP_IOAPIC, "IOAPIC"} > + > +TRACE_EVENT(kvm_ack_irq, > + TP_PROTO(unsigned int irqchip, unsigned int pin), > + TP_ARGS(irqchip, pin), > + > + TP_STRUCT__entry( > + __field( unsigned int, irqchip ) > + __field( unsigned int, pin ) > + ), > + > + TP_fast_assign( > + __entry->irqchip = irqchip; > + __entry->pin = pin; > + ), > + > + TP_printk("irqchip %s pin %u", > + __print_symbolic(__entry->irqchip, kvm_irqchips), > + __entry->pin) > +); > + > + > + > +#endif /* _TRACE_KVM_MAIN_H */ > + > +/* This part must be outside protection */ > +#include <trace/define_trace.h> > Index: kvm/virt/kvm/irq_comm.c > =================================================================== > --- kvm.orig/virt/kvm/irq_comm.c > +++ kvm/virt/kvm/irq_comm.c > @@ -20,6 +20,7 @@ > */ > > #include <linux/kvm_host.h> > +#include <trace/events/kvm/kvm.h> > > #include <asm/msidef.h> > #ifdef CONFIG_IA64 > @@ -125,6 +126,8 @@ int kvm_set_irq(struct kvm *kvm, int irq > unsigned long *irq_state, sig_level; > int ret = -1; > > + trace_kvm_set_irq(irq); > + > WARN_ON(!mutex_is_locked(&kvm->irq_lock)); > > if (irq < KVM_IOAPIC_NUM_PINS) { > @@ -161,6 +164,8 @@ void kvm_notify_acked_irq(struct kvm *kv > struct hlist_node *n; > unsigned gsi = pin; > > + trace_kvm_ack_irq(irqchip, pin); > + > list_for_each_entry(e, &kvm->irq_routing, link) > if (e->irqchip.irqchip == irqchip && > e->irqchip.pin == pin) { > Index: kvm/virt/kvm/kvm_main.c > =================================================================== > --- kvm.orig/virt/kvm/kvm_main.c > +++ kvm/virt/kvm/kvm_main.c > @@ -59,6 +59,9 @@ > #include "irq.h" > #endif > > +#define CREATE_TRACE_POINTS > +#include <trace/events/kvm/kvm.h> > + > MODULE_AUTHOR("Qumranet"); > MODULE_LICENSE("GPL"); > > @@ -2715,6 +2718,7 @@ EXPORT_SYMBOL_GPL(kvm_init); > void kvm_exit(void) > { > kvm_trace_cleanup(); > + tracepoint_synchronize_unregister(); > misc_deregister(&kvm_dev); > kmem_cache_destroy(kvm_vcpu_cache); > sysdev_unregister(&kvm_sysdev); > > -- > > ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [patch 1/2] KVM: convert custom marker based tracing to event traces 2009-06-15 20:03 ` Steven Rostedt @ 2009-06-16 12:44 ` Marcelo Tosatti 2009-06-16 13:40 ` Steven Rostedt 0 siblings, 1 reply; 21+ messages in thread From: Marcelo Tosatti @ 2009-06-16 12:44 UTC (permalink / raw) To: Steven Rostedt; +Cc: kvm On Mon, Jun 15, 2009 at 04:03:10PM -0400, Steven Rostedt wrote: > > On Mon, 15 Jun 2009, Marcelo Tosatti wrote: > > > This allows use of the powerful ftrace infrastructure. > > > > See Documentation/trace/ for usage information. > > > > Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> > > > > Index: kvm/arch/x86/kvm/svm.c > > =================================================================== > > --- kvm.orig/arch/x86/kvm/svm.c > > +++ kvm/arch/x86/kvm/svm.c > > @@ -29,6 +29,9 @@ > > #include <asm/desc.h> > > > > #include <asm/virtext.h> > > +#include "svm-trace.h" > > +#define CREATE_TRACE_POINTS > > +#include <trace/events/kvm/x86-arch.h> > > > > #define __ex(x) __kvm_handle_fault_on_reboot(x) > > > > > > Index: kvm/arch/x86/kvm/vmx.c > > =================================================================== > > --- kvm.orig/arch/x86/kvm/vmx.c > > +++ kvm/arch/x86/kvm/vmx.c > > @@ -34,6 +34,10 @@ > > #include <asm/virtext.h> > > #include <asm/mce.h> > > > > +#include "vmx-trace.h" > > +#define CREATE_TRACE_POINTS > > +#include <trace/events/kvm/x86-arch.h> > > + > > #define __ex(x) __kvm_handle_fault_on_reboot(x) > > > > MODULE_AUTHOR("Qumranet"); > > > Index: kvm/arch/x86/kvm/x86.c > > =================================================================== > > --- kvm.orig/arch/x86/kvm/x86.c > > +++ kvm/arch/x86/kvm/x86.c > > @@ -37,6 +37,8 @@ > > #include <linux/iommu.h> > > #include <linux/intel-iommu.h> > > #include <linux/cpufreq.h> > > +#define CREATE_TRACE_POINTS > > +#include <trace/events/kvm/x86.h> > > > > #include <asm/uaccess.h> > > #include <asm/msr.h> > > @@ -347,9 +349,6 @@ EXPORT_SYMBOL_GPL(kvm_set_cr0); > > > > Index: kvm/include/trace/events/kvm/x86-arch.h > > =================================================================== > > --- /dev/null > > +++ kvm/include/trace/events/kvm/x86-arch.h > > > One suggestion. Instead of putting in arch specific trace points into > generic code, you can put these into arch/x86/kvm/trace.h ? > > Then you can in the Makefile add: > > CFLAGS_x86.o := -I. > CFLAGS_svm.o := -I. > CFLAGS_vmx.o := -I. > > Or better yet, have a single file called trace.c: > > in the Makefile: > CFLAGS_trace.o := -I. > obj-$(EVENT_TRACING) += trace.o > > in trace.c: > > #define CREATE_TRACE_POINTS > #include "trace.h" > #include "trace-arch.h" > > > Then have the kvm/x86.h moved to trace.h > and the kvm/arch-x86.h move to trace-arch.h > > Just change the "TRACE_INCLUDE_FILE" to include the proper name. > > -- Steve Similar to http://patchwork.kernel.org/patch/23829/, but moving the x86 tracepoint definitions to arch/x86/kvm/ ? I thought the point of include/trace/ was to have all tracepoints definitions in a single directory? ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [patch 1/2] KVM: convert custom marker based tracing to event traces 2009-06-16 12:44 ` Marcelo Tosatti @ 2009-06-16 13:40 ` Steven Rostedt 2009-06-16 22:13 ` [patch 0/2] replace kvmtrace with event traces v2 Marcelo Tosatti 0 siblings, 1 reply; 21+ messages in thread From: Steven Rostedt @ 2009-06-16 13:40 UTC (permalink / raw) To: Marcelo Tosatti; +Cc: kvm On Tue, 16 Jun 2009, Marcelo Tosatti wrote: > > > > > > One suggestion. Instead of putting in arch specific trace points into > > generic code, you can put these into arch/x86/kvm/trace.h ? > > > > Then you can in the Makefile add: > > > > CFLAGS_x86.o := -I. > > CFLAGS_svm.o := -I. > > CFLAGS_vmx.o := -I. > > > > Or better yet, have a single file called trace.c: > > > > in the Makefile: > > CFLAGS_trace.o := -I. > > obj-$(EVENT_TRACING) += trace.o > > > > in trace.c: > > > > #define CREATE_TRACE_POINTS > > #include "trace.h" > > #include "trace-arch.h" > > > > > > Then have the kvm/x86.h moved to trace.h > > and the kvm/arch-x86.h move to trace-arch.h > > > > Just change the "TRACE_INCLUDE_FILE" to include the proper name. > > > > -- Steve > > Similar to http://patchwork.kernel.org/patch/23829/, but moving the > x86 tracepoint definitions to arch/x86/kvm/ ? Yes, similar to what Christoph suggested. > > I thought the point of include/trace/ was to have all tracepoints > definitions in a single directory? > That's not what I heard ;-) It should only be for core kernel code. If you have trace points that are the same on most archs, then sure. But if it is specific to one arch, then we are going to end up with arch code scattered through out the kernel again. I thought the idea of moving include/asm-x86 into arch/x86/include/asm was to consolidate arch code to one location? Thus, if a trace point is made for one arch, then it should be located in that arch. -- Steve ^ permalink raw reply [flat|nested] 21+ messages in thread
* [patch 0/2] replace kvmtrace with event traces v2 2009-06-16 13:40 ` Steven Rostedt @ 2009-06-16 22:13 ` Marcelo Tosatti 2009-06-16 22:13 ` [patch 1/2] KVM: convert custom marker based tracing to event traces Marcelo Tosatti 2009-06-16 22:13 ` [patch 2/2] KVM: remove old KVMTRACE support code Marcelo Tosatti 0 siblings, 2 replies; 21+ messages in thread From: Marcelo Tosatti @ 2009-06-16 22:13 UTC (permalink / raw) To: kvm; +Cc: rostedt -- ^ permalink raw reply [flat|nested] 21+ messages in thread
* [patch 1/2] KVM: convert custom marker based tracing to event traces 2009-06-16 22:13 ` [patch 0/2] replace kvmtrace with event traces v2 Marcelo Tosatti @ 2009-06-16 22:13 ` Marcelo Tosatti 2009-06-17 11:52 ` Avi Kivity 2009-06-16 22:13 ` [patch 2/2] KVM: remove old KVMTRACE support code Marcelo Tosatti 1 sibling, 1 reply; 21+ messages in thread From: Marcelo Tosatti @ 2009-06-16 22:13 UTC (permalink / raw) To: kvm; +Cc: rostedt, Marcelo Tosatti [-- Attachment #1: convert-to-event-trace --] [-- Type: text/plain, Size: 27564 bytes --] This allows use of the powerful ftrace infrastructure. See Documentation/trace/ for usage information. Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Index: kvm/arch/x86/kvm/lapic.c =================================================================== --- kvm.orig/arch/x86/kvm/lapic.c +++ kvm/arch/x86/kvm/lapic.c @@ -34,6 +34,7 @@ #include <asm/atomic.h> #include "kvm_cache_regs.h" #include "irq.h" +#include "trace.h" #ifndef CONFIG_X86_64 #define mod_64(x, y) ((x) - (y) * div64_u64(x, y)) @@ -515,8 +516,6 @@ static u32 __apic_read(struct kvm_lapic { u32 val = 0; - KVMTRACE_1D(APIC_ACCESS, apic->vcpu, (u32)offset, handler); - if (offset >= LAPIC_MMIO_LENGTH) return 0; @@ -562,6 +561,8 @@ static void apic_mmio_read(struct kvm_io } result = __apic_read(apic, offset & ~0xf); + trace_kvm_apic_read(offset, result); + switch (len) { case 1: case 2: @@ -657,7 +658,7 @@ static void apic_mmio_write(struct kvm_i offset &= 0xff0; - KVMTRACE_1D(APIC_ACCESS, apic->vcpu, (u32)offset, handler); + trace_kvm_apic_write(offset, val); switch (offset) { case APIC_ID: /* Local APIC ID */ Index: kvm/arch/x86/kvm/svm-trace.h =================================================================== --- /dev/null +++ kvm/arch/x86/kvm/svm-trace.h @@ -0,0 +1,51 @@ +#define exit_reasons svm_exit_reasons +#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_NPF, "npf"} Index: kvm/arch/x86/kvm/svm.c =================================================================== --- kvm.orig/arch/x86/kvm/svm.c +++ kvm/arch/x86/kvm/svm.c @@ -29,6 +29,9 @@ #include <asm/desc.h> #include <asm/virtext.h> +#include "svm-trace.h" +#define CREATE_TRACE_POINTS +#include "trace-arch.h" #define __ex(x) __kvm_handle_fault_on_reboot(x) @@ -1099,7 +1102,6 @@ static unsigned long svm_get_dr(struct k val = 0; } - KVMTRACE_2D(DR_READ, vcpu, (u32)dr, (u32)val, handler); return val; } @@ -1108,8 +1110,6 @@ static void svm_set_dr(struct kvm_vcpu * { struct vcpu_svm *svm = to_svm(vcpu); - KVMTRACE_2D(DR_WRITE, vcpu, (u32)dr, (u32)value, handler); - *exception = 0; switch (dr) { @@ -1157,14 +1157,7 @@ static int pf_interception(struct vcpu_s fault_address = svm->vmcb->control.exit_info_2; error_code = svm->vmcb->control.exit_info_1; - if (!npt_enabled) - KVMTRACE_3D(PAGE_FAULT, &svm->vcpu, error_code, - (u32)fault_address, (u32)(fault_address >> 32), - handler); - else - KVMTRACE_3D(TDP_FAULT, &svm->vcpu, error_code, - (u32)fault_address, (u32)(fault_address >> 32), - handler); + trace_kvm_page_fault(fault_address, error_code); /* * FIXME: Tis shouldn't be necessary here, but there is a flush * missing in the MMU code. Until we find this bug, flush the @@ -1291,14 +1284,12 @@ static int io_interception(struct vcpu_s static int nmi_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run) { - KVMTRACE_0D(NMI, &svm->vcpu, handler); return 1; } static int intr_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run) { ++svm->vcpu.stat.irq_exits; - KVMTRACE_0D(INTR, &svm->vcpu, handler); return 1; } @@ -2080,8 +2071,7 @@ static int rdmsr_interception(struct vcp if (svm_get_msr(&svm->vcpu, ecx, &data)) kvm_inject_gp(&svm->vcpu, 0); else { - KVMTRACE_3D(MSR_READ, &svm->vcpu, ecx, (u32)data, - (u32)(data >> 32), handler); + trace_kvm_msr_read(ecx, data); svm->vcpu.arch.regs[VCPU_REGS_RAX] = data & 0xffffffff; svm->vcpu.arch.regs[VCPU_REGS_RDX] = data >> 32; @@ -2164,8 +2154,7 @@ static int wrmsr_interception(struct vcp u64 data = (svm->vcpu.arch.regs[VCPU_REGS_RAX] & -1u) | ((u64)(svm->vcpu.arch.regs[VCPU_REGS_RDX] & -1u) << 32); - KVMTRACE_3D(MSR_WRITE, &svm->vcpu, ecx, (u32)data, (u32)(data >> 32), - handler); + trace_kvm_msr_write(ecx, data); svm->next_rip = kvm_rip_read(&svm->vcpu) + 2; if (svm_set_msr(&svm->vcpu, ecx, data)) @@ -2186,8 +2175,6 @@ static int msr_interception(struct vcpu_ static int interrupt_window_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run) { - KVMTRACE_0D(PEND_INTR, &svm->vcpu, handler); - svm_clear_vintr(svm); svm->vmcb->control.int_ctl &= ~V_IRQ_MASK; /* @@ -2266,8 +2253,7 @@ static int handle_exit(struct kvm_run *k struct vcpu_svm *svm = to_svm(vcpu); u32 exit_code = svm->vmcb->control.exit_code; - KVMTRACE_3D(VMEXIT, vcpu, exit_code, (u32)svm->vmcb->save.rip, - (u32)((u64)svm->vmcb->save.rip >> 32), entryexit); + trace_kvm_exit(exit_code, svm->vmcb->save.rip); if (is_nested(svm)) { nsvm_printk("nested handle_exit: 0x%x | 0x%lx | 0x%lx | 0x%lx\n", @@ -2355,7 +2341,7 @@ static inline void svm_inject_irq(struct { struct vmcb_control_area *control; - KVMTRACE_1D(INJ_VIRQ, &svm->vcpu, (u32)irq, handler); + trace_kvm_inj_virq(irq); ++svm->vcpu.stat.irq_injections; control = &svm->vmcb->control; Index: kvm/arch/x86/kvm/vmx-trace.h =================================================================== --- /dev/null +++ kvm/arch/x86/kvm/vmx-trace.h @@ -0,0 +1,22 @@ +#define exit_reasons vmx_exit_reasons +#define vmx_exit_reasons \ + {EXIT_REASON_EXCEPTION_NMI, "exception"}, \ + {EXIT_REASON_EXTERNAL_INTERRUPT, "ext_irq"}, \ + {EXIT_REASON_TRIPLE_FAULT, "triple_fault"}, \ + {EXIT_REASON_NMI_WINDOW, "nmi_window"}, \ + {EXIT_REASON_IO_INSTRUCTION, "io_instruction"}, \ + {EXIT_REASON_CR_ACCESS, "cr_access"}, \ + {EXIT_REASON_DR_ACCESS, "dr_access"}, \ + {EXIT_REASON_CPUID, "cpuid"}, \ + {EXIT_REASON_MSR_READ, "rdmsr"}, \ + {EXIT_REASON_MSR_WRITE, "wrmsr"}, \ + {EXIT_REASON_PENDING_INTERRUPT, "interrupt_window"}, \ + {EXIT_REASON_HLT, "halt"}, \ + {EXIT_REASON_INVLPG, "invlpg"}, \ + {EXIT_REASON_VMCALL, "hypercall"}, \ + {EXIT_REASON_TPR_BELOW_THRESHOLD, "tpr_below_thres"}, \ + {EXIT_REASON_APIC_ACCESS, "apic_access"}, \ + {EXIT_REASON_WBINVD, "wbinvd"}, \ + {EXIT_REASON_TASK_SWITCH, "task_switch"}, \ + {EXIT_REASON_EPT_VIOLATION, "ept_violation"} + Index: kvm/arch/x86/kvm/vmx.c =================================================================== --- kvm.orig/arch/x86/kvm/vmx.c +++ kvm/arch/x86/kvm/vmx.c @@ -34,6 +34,10 @@ #include <asm/virtext.h> #include <asm/mce.h> +#include "vmx-trace.h" +#define CREATE_TRACE_POINTS +#include "trace-arch.h" + #define __ex(x) __kvm_handle_fault_on_reboot(x) MODULE_AUTHOR("Qumranet"); @@ -2550,7 +2554,7 @@ static void vmx_inject_irq(struct kvm_vc uint32_t intr; int irq = vcpu->arch.interrupt.nr; - KVMTRACE_1D(INJ_VIRQ, vcpu, (u32)irq, handler); + trace_kvm_inj_virq(irq); ++vcpu->stat.irq_injections; if (vmx->rmode.vm86_active) { @@ -2751,8 +2755,8 @@ static int handle_exception(struct kvm_v if (enable_ept) BUG(); cr2 = vmcs_readl(EXIT_QUALIFICATION); - KVMTRACE_3D(PAGE_FAULT, vcpu, error_code, (u32)cr2, - (u32)((u64)cr2 >> 32), handler); + trace_kvm_page_fault(cr2, error_code); + if (kvm_event_needs_reinjection(vcpu)) kvm_mmu_unprotect_page_virt(vcpu, cr2); return kvm_mmu_page_fault(vcpu, cr2, error_code); @@ -2799,7 +2803,6 @@ static int handle_external_interrupt(str struct kvm_run *kvm_run) { ++vcpu->stat.irq_exits; - KVMTRACE_1D(INTR, vcpu, vmcs_read32(VM_EXIT_INTR_INFO), handler); return 1; } @@ -2847,7 +2850,7 @@ vmx_patch_hypercall(struct kvm_vcpu *vcp static int handle_cr(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) { - unsigned long exit_qualification; + unsigned long exit_qualification, val; int cr; int reg; @@ -2856,21 +2859,19 @@ static int handle_cr(struct kvm_vcpu *vc reg = (exit_qualification >> 8) & 15; switch ((exit_qualification >> 4) & 3) { case 0: /* mov to cr */ - KVMTRACE_3D(CR_WRITE, vcpu, (u32)cr, - (u32)kvm_register_read(vcpu, reg), - (u32)((u64)kvm_register_read(vcpu, reg) >> 32), - handler); + val = kvm_register_read(vcpu, reg); + trace_kvm_cr_write(cr, val); switch (cr) { case 0: - kvm_set_cr0(vcpu, kvm_register_read(vcpu, reg)); + kvm_set_cr0(vcpu, val); skip_emulated_instruction(vcpu); return 1; case 3: - kvm_set_cr3(vcpu, kvm_register_read(vcpu, reg)); + kvm_set_cr3(vcpu, val); skip_emulated_instruction(vcpu); return 1; case 4: - kvm_set_cr4(vcpu, kvm_register_read(vcpu, reg)); + kvm_set_cr4(vcpu, val); skip_emulated_instruction(vcpu); return 1; case 8: { @@ -2892,23 +2893,19 @@ static int handle_cr(struct kvm_vcpu *vc vcpu->arch.cr0 &= ~X86_CR0_TS; vmcs_writel(CR0_READ_SHADOW, vcpu->arch.cr0); vmx_fpu_activate(vcpu); - KVMTRACE_0D(CLTS, vcpu, handler); skip_emulated_instruction(vcpu); return 1; case 1: /*mov from cr*/ switch (cr) { case 3: kvm_register_write(vcpu, reg, vcpu->arch.cr3); - KVMTRACE_3D(CR_READ, vcpu, (u32)cr, - (u32)kvm_register_read(vcpu, reg), - (u32)((u64)kvm_register_read(vcpu, reg) >> 32), - handler); + trace_kvm_cr_read(cr, vcpu->arch.cr3); skip_emulated_instruction(vcpu); return 1; case 8: - kvm_register_write(vcpu, reg, kvm_get_cr8(vcpu)); - KVMTRACE_2D(CR_READ, vcpu, (u32)cr, - (u32)kvm_register_read(vcpu, reg), handler); + val = kvm_get_cr8(vcpu); + kvm_register_write(vcpu, cr, val); + trace_kvm_cr_read(cr, val); skip_emulated_instruction(vcpu); return 1; } @@ -2976,7 +2973,6 @@ static int handle_dr(struct kvm_vcpu *vc val = 0; } kvm_register_write(vcpu, reg, val); - KVMTRACE_2D(DR_READ, vcpu, (u32)dr, (u32)val, handler); } else { val = vcpu->arch.regs[reg]; switch (dr) { @@ -3009,7 +3005,6 @@ static int handle_dr(struct kvm_vcpu *vc } break; } - KVMTRACE_2D(DR_WRITE, vcpu, (u32)dr, (u32)val, handler); } skip_emulated_instruction(vcpu); return 1; @@ -3031,8 +3026,7 @@ static int handle_rdmsr(struct kvm_vcpu return 1; } - KVMTRACE_3D(MSR_READ, vcpu, ecx, (u32)data, (u32)(data >> 32), - handler); + trace_kvm_msr_read(ecx, data); /* FIXME: handling of bits 32:63 of rax, rdx */ vcpu->arch.regs[VCPU_REGS_RAX] = data & -1u; @@ -3047,8 +3041,7 @@ static int handle_wrmsr(struct kvm_vcpu u64 data = (vcpu->arch.regs[VCPU_REGS_RAX] & -1u) | ((u64)(vcpu->arch.regs[VCPU_REGS_RDX] & -1u) << 32); - KVMTRACE_3D(MSR_WRITE, vcpu, ecx, (u32)data, (u32)(data >> 32), - handler); + trace_kvm_msr_write(ecx, data); if (vmx_set_msr(vcpu, ecx, data) != 0) { kvm_inject_gp(vcpu, 0); @@ -3075,7 +3068,6 @@ static int handle_interrupt_window(struc cpu_based_vm_exec_control &= ~CPU_BASED_VIRTUAL_INTR_PENDING; vmcs_write32(CPU_BASED_VM_EXEC_CONTROL, cpu_based_vm_exec_control); - KVMTRACE_0D(PEND_INTR, vcpu, handler); ++vcpu->stat.irq_window_exits; /* @@ -3227,6 +3219,7 @@ static int handle_ept_violation(struct k } gpa = vmcs_read64(GUEST_PHYSICAL_ADDRESS); + trace_kvm_page_fault(gpa, exit_qualification); return kvm_mmu_page_fault(vcpu, gpa & PAGE_MASK, 0); } @@ -3410,8 +3403,7 @@ static int vmx_handle_exit(struct kvm_ru u32 exit_reason = vmx->exit_reason; u32 vectoring_info = vmx->idt_vectoring_info; - KVMTRACE_3D(VMEXIT, vcpu, exit_reason, (u32)kvm_rip_read(vcpu), - (u32)((u64)kvm_rip_read(vcpu) >> 32), entryexit); + trace_kvm_exit(exit_reason, kvm_rip_read(vcpu)); /* If we need to emulate an MMIO from handle_invalid_guest_state * we just return 0 */ @@ -3500,10 +3492,8 @@ static void vmx_complete_interrupts(stru /* We need to handle NMIs before interrupts are enabled */ if ((exit_intr_info & INTR_INFO_INTR_TYPE_MASK) == INTR_TYPE_NMI_INTR && - (exit_intr_info & INTR_INFO_VALID_MASK)) { - KVMTRACE_0D(NMI, &vmx->vcpu, handler); + (exit_intr_info & INTR_INFO_VALID_MASK)) asm("int $2"); - } idtv_info_valid = idt_vectoring_info & VECTORING_INFO_VALID_MASK; Index: kvm/arch/x86/kvm/x86.c =================================================================== --- kvm.orig/arch/x86/kvm/x86.c +++ kvm/arch/x86/kvm/x86.c @@ -37,6 +37,8 @@ #include <linux/iommu.h> #include <linux/intel-iommu.h> #include <linux/cpufreq.h> +#define CREATE_TRACE_POINTS +#include "trace.h" #include <asm/uaccess.h> #include <asm/msr.h> @@ -347,9 +349,6 @@ EXPORT_SYMBOL_GPL(kvm_set_cr0); void kvm_lmsw(struct kvm_vcpu *vcpu, unsigned long msw) { kvm_set_cr0(vcpu, (vcpu->arch.cr0 & ~0x0ful) | (msw & 0x0f)); - KVMTRACE_1D(LMSW, vcpu, - (u32)((vcpu->arch.cr0 & ~0x0ful) | (msw & 0x0f)), - handler); } EXPORT_SYMBOL_GPL(kvm_lmsw); @@ -2532,7 +2531,6 @@ int emulate_invlpg(struct kvm_vcpu *vcpu int emulate_clts(struct kvm_vcpu *vcpu) { - KVMTRACE_0D(CLTS, vcpu, handler); kvm_x86_ops->set_cr0(vcpu, vcpu->arch.cr0 & ~X86_CR0_TS); return X86EMUL_CONTINUE; } @@ -2815,12 +2813,8 @@ int kvm_emulate_pio(struct kvm_vcpu *vcp vcpu->arch.pio.down = 0; vcpu->arch.pio.rep = 0; - if (vcpu->run->io.direction == KVM_EXIT_IO_IN) - KVMTRACE_2D(IO_READ, vcpu, vcpu->run->io.port, (u32)size, - handler); - else - KVMTRACE_2D(IO_WRITE, vcpu, vcpu->run->io.port, (u32)size, - handler); + trace_kvm_pio(vcpu->run->io.direction == KVM_EXIT_IO_OUT, port, + size, 1); val = kvm_register_read(vcpu, VCPU_REGS_RAX); memcpy(vcpu->arch.pio_data, &val, 4); @@ -2856,12 +2850,8 @@ int kvm_emulate_pio_string(struct kvm_vc vcpu->arch.pio.down = down; vcpu->arch.pio.rep = rep; - if (vcpu->run->io.direction == KVM_EXIT_IO_IN) - KVMTRACE_2D(IO_READ, vcpu, vcpu->run->io.port, (u32)size, - handler); - else - KVMTRACE_2D(IO_WRITE, vcpu, vcpu->run->io.port, (u32)size, - handler); + trace_kvm_pio(vcpu->run->io.direction == KVM_EXIT_IO_OUT, port, + size, count); if (!count) { kvm_x86_ops->skip_emulated_instruction(vcpu); @@ -3039,7 +3029,6 @@ void kvm_arch_exit(void) int kvm_emulate_halt(struct kvm_vcpu *vcpu) { ++vcpu->stat.halt_exits; - KVMTRACE_0D(HLT, vcpu, handler); if (irqchip_in_kernel(vcpu->kvm)) { vcpu->arch.mp_state = KVM_MP_STATE_HALTED; return 1; @@ -3070,7 +3059,7 @@ int kvm_emulate_hypercall(struct kvm_vcp a2 = kvm_register_read(vcpu, VCPU_REGS_RDX); a3 = kvm_register_read(vcpu, VCPU_REGS_RSI); - KVMTRACE_1D(VMMCALL, vcpu, (u32)nr, handler); + trace_kvm_hypercall(nr, a0, a1, a2, a3); if (!is_long_mode(vcpu)) { nr &= 0xFFFFFFFF; @@ -3170,8 +3159,6 @@ unsigned long realmode_get_cr(struct kvm vcpu_printf(vcpu, "%s: unexpected cr %u\n", __func__, cr); return 0; } - KVMTRACE_3D(CR_READ, vcpu, (u32)cr, (u32)value, - (u32)((u64)value >> 32), handler); return value; } @@ -3179,9 +3166,6 @@ unsigned long realmode_get_cr(struct kvm void realmode_set_cr(struct kvm_vcpu *vcpu, int cr, unsigned long val, unsigned long *rflags) { - KVMTRACE_3D(CR_WRITE, vcpu, (u32)cr, (u32)val, - (u32)((u64)val >> 32), handler); - switch (cr) { case 0: kvm_set_cr0(vcpu, mk_cr_64(vcpu->arch.cr0, val)); @@ -3291,11 +3275,11 @@ void kvm_emulate_cpuid(struct kvm_vcpu * kvm_register_write(vcpu, VCPU_REGS_RDX, best->edx); } kvm_x86_ops->skip_emulated_instruction(vcpu); - KVMTRACE_5D(CPUID, vcpu, function, - (u32)kvm_register_read(vcpu, VCPU_REGS_RAX), - (u32)kvm_register_read(vcpu, VCPU_REGS_RBX), - (u32)kvm_register_read(vcpu, VCPU_REGS_RCX), - (u32)kvm_register_read(vcpu, VCPU_REGS_RDX), handler); + trace_kvm_cpuid(function, + kvm_register_read(vcpu, VCPU_REGS_RAX), + kvm_register_read(vcpu, VCPU_REGS_RBX), + kvm_register_read(vcpu, VCPU_REGS_RCX), + kvm_register_read(vcpu, VCPU_REGS_RDX)); } EXPORT_SYMBOL_GPL(kvm_emulate_cpuid); @@ -3491,7 +3475,7 @@ static int vcpu_enter_guest(struct kvm_v set_debugreg(vcpu->arch.eff_db[3], 3); } - KVMTRACE_0D(VMENTRY, vcpu, entryexit); + trace_kvm_entry(vcpu->vcpu_id); kvm_x86_ops->run(vcpu, kvm_run); if (unlikely(vcpu->arch.switch_db_regs)) { Index: kvm/virt/kvm/irq_comm.c =================================================================== --- kvm.orig/virt/kvm/irq_comm.c +++ kvm/virt/kvm/irq_comm.c @@ -20,6 +20,7 @@ */ #include <linux/kvm_host.h> +#include <trace/events/kvm.h> #include <asm/msidef.h> #ifdef CONFIG_IA64 @@ -125,6 +126,8 @@ int kvm_set_irq(struct kvm *kvm, int irq unsigned long *irq_state, sig_level; int ret = -1; + trace_kvm_set_irq(irq); + WARN_ON(!mutex_is_locked(&kvm->irq_lock)); if (irq < KVM_IOAPIC_NUM_PINS) { @@ -161,6 +164,8 @@ void kvm_notify_acked_irq(struct kvm *kv struct hlist_node *n; unsigned gsi = pin; + trace_kvm_ack_irq(irqchip, pin); + list_for_each_entry(e, &kvm->irq_routing, link) if (e->irqchip.irqchip == irqchip && e->irqchip.pin == pin) { Index: kvm/virt/kvm/kvm_main.c =================================================================== --- kvm.orig/virt/kvm/kvm_main.c +++ kvm/virt/kvm/kvm_main.c @@ -59,6 +59,9 @@ #include "irq.h" #endif +#define CREATE_TRACE_POINTS +#include <trace/events/kvm.h> + MODULE_AUTHOR("Qumranet"); MODULE_LICENSE("GPL"); @@ -2715,6 +2718,7 @@ EXPORT_SYMBOL_GPL(kvm_init); void kvm_exit(void) { kvm_trace_cleanup(); + tracepoint_synchronize_unregister(); misc_deregister(&kvm_dev); kmem_cache_destroy(kvm_vcpu_cache); sysdev_unregister(&kvm_sysdev); Index: kvm/arch/x86/kvm/Makefile =================================================================== --- kvm.orig/arch/x86/kvm/Makefile +++ kvm/arch/x86/kvm/Makefile @@ -1,6 +1,10 @@ EXTRA_CFLAGS += -Ivirt/kvm -Iarch/x86/kvm +CFLAGS_x86.o := -I. +CFLAGS_svm.o := -I. +CFLAGS_vmx.o := -I. + kvm-y += $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \ coalesced_mmio.o irq_comm.o eventfd.o) kvm-$(CONFIG_KVM_TRACE) += $(addprefix ../../../virt/kvm/, kvm_trace.o) Index: kvm/arch/x86/kvm/trace-arch.h =================================================================== --- /dev/null +++ kvm/arch/x86/kvm/trace-arch.h @@ -0,0 +1,129 @@ +#if !defined(_TRACE_KVM_ARCH_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_KVM_ARCH_H + +#include <linux/tracepoint.h> + +#undef TRACE_SYSTEM +#define TRACE_SYSTEM kvm +#define TRACE_INCLUDE_PATH arch/x86/kvm +#define TRACE_INCLUDE_FILE trace-arch + +/* + * Tracepoint for kvm guest exit: + */ +TRACE_EVENT(kvm_exit, + TP_PROTO(unsigned int exit_reason, unsigned long guest_rip), + TP_ARGS(exit_reason, guest_rip), + + TP_STRUCT__entry( + __field( unsigned int, exit_reason ) + __field( unsigned long, guest_rip ) + ), + + TP_fast_assign( + __entry->exit_reason = exit_reason; + __entry->guest_rip = guest_rip; + ), + + TP_printk("reason %s rip 0x%lx", + __print_symbolic(__entry->exit_reason, exit_reasons), + __entry->guest_rip) +); + +/* + * Tracepoint for kvm interrupt injection: + */ +TRACE_EVENT(kvm_inj_virq, + TP_PROTO(unsigned int irq), + TP_ARGS(irq), + + TP_STRUCT__entry( + __field( unsigned int, irq ) + ), + + TP_fast_assign( + __entry->irq = irq; + ), + + TP_printk("irq %u", __entry->irq) +); + +/* + * Tracepoint for page fault. + */ +TRACE_EVENT(kvm_page_fault, + TP_PROTO(unsigned long fault_address, unsigned int error_code), + TP_ARGS(fault_address, error_code), + + TP_STRUCT__entry( + __field( unsigned long, fault_address ) + __field( unsigned int, error_code ) + ), + + TP_fast_assign( + __entry->fault_address = fault_address; + __entry->error_code = error_code; + ), + + TP_printk("address %lx error_code %x", + __entry->fault_address, __entry->error_code) +); + +/* + * Tracepoint for guest MSR access. + */ +TRACE_EVENT(kvm_msr, + TP_PROTO(unsigned int rw, unsigned int ecx, unsigned long data), + TP_ARGS(rw, ecx, data), + + TP_STRUCT__entry( + __field( unsigned int, rw ) + __field( unsigned int, ecx ) + __field( unsigned long, data ) + ), + + TP_fast_assign( + __entry->rw = rw; + __entry->ecx = ecx; + __entry->data = data; + ), + + TP_printk("msr_%s %x = 0x%lx", + __entry->rw ? "write" : "read", + __entry->ecx, __entry->data) +); + +#define trace_kvm_msr_read(ecx, data) trace_kvm_msr(0, ecx, data) +#define trace_kvm_msr_write(ecx, data) trace_kvm_msr(1, ecx, data) + +/* + * Tracepoint for guest CR access. + */ +TRACE_EVENT(kvm_cr, + TP_PROTO(unsigned int rw, unsigned int cr, unsigned long val), + TP_ARGS(rw, cr, val), + + TP_STRUCT__entry( + __field( unsigned int, rw ) + __field( unsigned int, cr ) + __field( unsigned long, val ) + ), + + TP_fast_assign( + __entry->rw = rw; + __entry->cr = cr; + __entry->val = val; + ), + + TP_printk("cr_%s %x = 0x%lx", + __entry->rw ? "write" : "read", + __entry->cr, __entry->val) +); + +#define trace_kvm_cr_read(cr, val) trace_kvm_cr(0, cr, val) +#define trace_kvm_cr_write(cr, val) trace_kvm_cr(1, cr, val) + +#endif /* _TRACE_KVM_ARCH_H */ + +/* This part must be outside protection */ +#include <trace/define_trace.h> Index: kvm/arch/x86/kvm/trace.h =================================================================== --- /dev/null +++ kvm/arch/x86/kvm/trace.h @@ -0,0 +1,144 @@ +#if !defined(_TRACE_KVM_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_KVM_H + +#include <linux/tracepoint.h> + +#undef TRACE_SYSTEM +#define TRACE_SYSTEM kvm +#define TRACE_INCLUDE_PATH arch/x86/kvm +#define TRACE_INCLUDE_FILE trace + +/* + * Tracepoint for guest mode entry. + */ +TRACE_EVENT(kvm_entry, + 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\n", __entry->vcpu_id) +); + +/* + * Tracepoint for hypercall. + */ +TRACE_EVENT(kvm_hypercall, + TP_PROTO(unsigned long nr, unsigned long a0, unsigned long a1, + unsigned long a2, unsigned long a3), + TP_ARGS(nr, a0, a1, a2, a3), + + TP_STRUCT__entry( + __field( unsigned long, nr ) + __field( unsigned long, a0 ) + __field( unsigned long, a1 ) + __field( unsigned long, a2 ) + __field( unsigned long, a3 ) + ), + + TP_fast_assign( + __entry->nr = nr; + __entry->a0 = a0; + __entry->a1 = a1; + __entry->a2 = a2; + __entry->a3 = a3; + ), + + TP_printk("nr 0x%lx a0 0x%lx a1 0x%lx a2 0x%lx a3 0x%lx", + __entry->nr, __entry->a0, __entry->a1, __entry->a2, + __entry->a3) +); + +/* + * Tracepoint for PIO. + */ +TRACE_EVENT(kvm_pio, + TP_PROTO(unsigned int rw, unsigned int port, unsigned int size, + unsigned int count), + TP_ARGS(rw, port, size, count), + + TP_STRUCT__entry( + __field( unsigned int, rw ) + __field( unsigned int, port ) + __field( unsigned int, size ) + __field( unsigned int, count ) + ), + + TP_fast_assign( + __entry->rw = rw; + __entry->port = port; + __entry->size = size; + __entry->count = count; + ), + + TP_printk("pio_%s at 0x%x size %d count %d", + __entry->rw ? "write" : "read", + __entry->port, __entry->size, __entry->count) +); + +/* + * Tracepoint for cpuid. + */ +TRACE_EVENT(kvm_cpuid, + TP_PROTO(unsigned int function, unsigned long rax, unsigned long rbx, + unsigned long rcx, unsigned long rdx), + TP_ARGS(function, rax, rbx, rcx, rdx), + + TP_STRUCT__entry( + __field( unsigned int, function ) + __field( unsigned long, rax ) + __field( unsigned long, rbx ) + __field( unsigned long, rcx ) + __field( unsigned long, rdx ) + ), + + TP_fast_assign( + __entry->function = function; + __entry->rax = rax; + __entry->rbx = rbx; + __entry->rcx = rcx; + __entry->rdx = rdx; + ), + + TP_printk("func %x rax %lx rbx %lx rcx %lx rdx %lx", + __entry->function, __entry->rax, + __entry->rbx, __entry->rcx, __entry->rdx) +); + +/* + * Tracepoint for apic access. + */ +TRACE_EVENT(kvm_apic, + TP_PROTO(unsigned int rw, unsigned int reg, unsigned int val), + TP_ARGS(rw, reg, val), + + TP_STRUCT__entry( + __field( unsigned int, rw ) + __field( unsigned int, reg ) + __field( unsigned int, val ) + ), + + TP_fast_assign( + __entry->rw = rw; + __entry->reg = reg; + __entry->val = val; + ), + + TP_printk("apic_%s 0x%x = 0x%x", + __entry->rw ? "write" : "read", + __entry->reg, __entry->val) +); + +#define trace_kvm_apic_read(reg, val) trace_kvm_apic(0, reg, val) +#define trace_kvm_apic_write(reg, val) trace_kvm_apic(1, reg, val) + +#endif /* _TRACE_KVM_H */ + +/* This part must be outside protection */ +#include <trace/define_trace.h> Index: kvm/include/trace/events/kvm.h =================================================================== --- /dev/null +++ kvm/include/trace/events/kvm.h @@ -0,0 +1,55 @@ +#if !defined(_TRACE_KVM_MAIN_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_KVM_MAIN_H + +#include <linux/tracepoint.h> + +#undef TRACE_SYSTEM +#define TRACE_SYSTEM kvm +#define TRACE_INCLUDE_FILE kvm + +TRACE_EVENT(kvm_set_irq, + TP_PROTO(unsigned int gsi), + TP_ARGS(gsi), + + TP_STRUCT__entry( + __field( unsigned int, gsi ) + ), + + TP_fast_assign( + __entry->gsi = gsi; + ), + + TP_printk("gsi %u", __entry->gsi) +); + + +#define kvm_irqchips \ + {KVM_IRQCHIP_PIC_MASTER, "PIC master"}, \ + {KVM_IRQCHIP_PIC_SLAVE, "PIC slave"}, \ + {KVM_IRQCHIP_IOAPIC, "IOAPIC"} + +TRACE_EVENT(kvm_ack_irq, + TP_PROTO(unsigned int irqchip, unsigned int pin), + TP_ARGS(irqchip, pin), + + TP_STRUCT__entry( + __field( unsigned int, irqchip ) + __field( unsigned int, pin ) + ), + + TP_fast_assign( + __entry->irqchip = irqchip; + __entry->pin = pin; + ), + + TP_printk("irqchip %s pin %u", + __print_symbolic(__entry->irqchip, kvm_irqchips), + __entry->pin) +); + + + +#endif /* _TRACE_KVM_MAIN_H */ + +/* This part must be outside protection */ +#include <trace/define_trace.h> -- ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [patch 1/2] KVM: convert custom marker based tracing to event traces 2009-06-16 22:13 ` [patch 1/2] KVM: convert custom marker based tracing to event traces Marcelo Tosatti @ 2009-06-17 11:52 ` Avi Kivity 2009-06-17 12:22 ` [patch 0/2] replace kvmtrace with event traces rebased Marcelo Tosatti 0 siblings, 1 reply; 21+ messages in thread From: Avi Kivity @ 2009-06-17 11:52 UTC (permalink / raw) To: Marcelo Tosatti; +Cc: kvm, rostedt On 06/17/2009 01:13 AM, Marcelo Tosatti wrote: > This allows use of the powerful ftrace infrastructure. > > See Documentation/trace/ for usage information. > > This only applied with -C0, so I'm worried something's broken. Please regenerate. -- Do not meddle in the internals of kernels, for they are subtle and quick to panic. ^ permalink raw reply [flat|nested] 21+ messages in thread
* [patch 0/2] replace kvmtrace with event traces rebased 2009-06-17 11:52 ` Avi Kivity @ 2009-06-17 12:22 ` Marcelo Tosatti 2009-06-17 12:22 ` [patch 1/2] KVM: convert custom marker based tracing to event traces Marcelo Tosatti ` (2 more replies) 0 siblings, 3 replies; 21+ messages in thread From: Marcelo Tosatti @ 2009-06-17 12:22 UTC (permalink / raw) To: avi; +Cc: kvm -- ^ permalink raw reply [flat|nested] 21+ messages in thread
* [patch 1/2] KVM: convert custom marker based tracing to event traces 2009-06-17 12:22 ` [patch 0/2] replace kvmtrace with event traces rebased Marcelo Tosatti @ 2009-06-17 12:22 ` Marcelo Tosatti 2009-06-17 12:22 ` [patch 2/2] KVM: remove old KVMTRACE support code Marcelo Tosatti 2009-06-17 12:35 ` [patch 0/2] replace kvmtrace with event traces rebased Avi Kivity 2 siblings, 0 replies; 21+ messages in thread From: Marcelo Tosatti @ 2009-06-17 12:22 UTC (permalink / raw) To: avi; +Cc: kvm, Marcelo Tosatti [-- Attachment #1: convert-to-event-trace --] [-- Type: text/plain, Size: 27791 bytes --] This allows use of the powerful ftrace infrastructure. See Documentation/trace/ for usage information. Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Index: kvm/arch/x86/kvm/lapic.c =================================================================== --- kvm.orig/arch/x86/kvm/lapic.c +++ kvm/arch/x86/kvm/lapic.c @@ -34,6 +34,7 @@ #include <asm/atomic.h> #include "kvm_cache_regs.h" #include "irq.h" +#include "trace.h" #ifndef CONFIG_X86_64 #define mod_64(x, y) ((x) - (y) * div64_u64(x, y)) @@ -515,8 +516,6 @@ static u32 __apic_read(struct kvm_lapic { u32 val = 0; - KVMTRACE_1D(APIC_ACCESS, apic->vcpu, (u32)offset, handler); - if (offset >= LAPIC_MMIO_LENGTH) return 0; @@ -562,6 +561,8 @@ static void apic_mmio_read(struct kvm_io } result = __apic_read(apic, offset & ~0xf); + trace_kvm_apic_read(offset, result); + switch (len) { case 1: case 2: @@ -657,7 +658,7 @@ static void apic_mmio_write(struct kvm_i offset &= 0xff0; - KVMTRACE_1D(APIC_ACCESS, apic->vcpu, (u32)offset, handler); + trace_kvm_apic_write(offset, val); switch (offset) { case APIC_ID: /* Local APIC ID */ Index: kvm/arch/x86/kvm/svm-trace.h =================================================================== --- /dev/null +++ kvm/arch/x86/kvm/svm-trace.h @@ -0,0 +1,51 @@ +#define exit_reasons svm_exit_reasons +#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_NPF, "npf"} Index: kvm/arch/x86/kvm/svm.c =================================================================== --- kvm.orig/arch/x86/kvm/svm.c +++ kvm/arch/x86/kvm/svm.c @@ -29,6 +29,9 @@ #include <asm/desc.h> #include <asm/virtext.h> +#include "svm-trace.h" +#define CREATE_TRACE_POINTS +#include "trace-arch.h" #define __ex(x) __kvm_handle_fault_on_reboot(x) @@ -1099,7 +1102,6 @@ static unsigned long svm_get_dr(struct k val = 0; } - KVMTRACE_2D(DR_READ, vcpu, (u32)dr, (u32)val, handler); return val; } @@ -1108,8 +1110,6 @@ static void svm_set_dr(struct kvm_vcpu * { struct vcpu_svm *svm = to_svm(vcpu); - KVMTRACE_2D(DR_WRITE, vcpu, (u32)dr, (u32)value, handler); - *exception = 0; switch (dr) { @@ -1157,14 +1157,7 @@ static int pf_interception(struct vcpu_s fault_address = svm->vmcb->control.exit_info_2; error_code = svm->vmcb->control.exit_info_1; - if (!npt_enabled) - KVMTRACE_3D(PAGE_FAULT, &svm->vcpu, error_code, - (u32)fault_address, (u32)(fault_address >> 32), - handler); - else - KVMTRACE_3D(TDP_FAULT, &svm->vcpu, error_code, - (u32)fault_address, (u32)(fault_address >> 32), - handler); + trace_kvm_page_fault(fault_address, error_code); /* * FIXME: Tis shouldn't be necessary here, but there is a flush * missing in the MMU code. Until we find this bug, flush the @@ -1291,14 +1284,12 @@ static int io_interception(struct vcpu_s static int nmi_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run) { - KVMTRACE_0D(NMI, &svm->vcpu, handler); return 1; } static int intr_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run) { ++svm->vcpu.stat.irq_exits; - KVMTRACE_0D(INTR, &svm->vcpu, handler); return 1; } @@ -2080,8 +2071,7 @@ static int rdmsr_interception(struct vcp if (svm_get_msr(&svm->vcpu, ecx, &data)) kvm_inject_gp(&svm->vcpu, 0); else { - KVMTRACE_3D(MSR_READ, &svm->vcpu, ecx, (u32)data, - (u32)(data >> 32), handler); + trace_kvm_msr_read(ecx, data); svm->vcpu.arch.regs[VCPU_REGS_RAX] = data & 0xffffffff; svm->vcpu.arch.regs[VCPU_REGS_RDX] = data >> 32; @@ -2149,7 +2139,6 @@ static int svm_set_msr(struct kvm_vcpu * break; case MSR_VM_CR: case MSR_VM_IGNNE: - case MSR_K8_HWCR: pr_unimpl(vcpu, "unimplemented wrmsr: 0x%x data 0x%llx\n", ecx, data); break; default: @@ -2164,8 +2153,7 @@ static int wrmsr_interception(struct vcp u64 data = (svm->vcpu.arch.regs[VCPU_REGS_RAX] & -1u) | ((u64)(svm->vcpu.arch.regs[VCPU_REGS_RDX] & -1u) << 32); - KVMTRACE_3D(MSR_WRITE, &svm->vcpu, ecx, (u32)data, (u32)(data >> 32), - handler); + trace_kvm_msr_write(ecx, data); svm->next_rip = kvm_rip_read(&svm->vcpu) + 2; if (svm_set_msr(&svm->vcpu, ecx, data)) @@ -2186,8 +2174,6 @@ static int msr_interception(struct vcpu_ static int interrupt_window_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run) { - KVMTRACE_0D(PEND_INTR, &svm->vcpu, handler); - svm_clear_vintr(svm); svm->vmcb->control.int_ctl &= ~V_IRQ_MASK; /* @@ -2266,8 +2252,7 @@ static int handle_exit(struct kvm_run *k struct vcpu_svm *svm = to_svm(vcpu); u32 exit_code = svm->vmcb->control.exit_code; - KVMTRACE_3D(VMEXIT, vcpu, exit_code, (u32)svm->vmcb->save.rip, - (u32)((u64)svm->vmcb->save.rip >> 32), entryexit); + trace_kvm_exit(exit_code, svm->vmcb->save.rip); if (is_nested(svm)) { nsvm_printk("nested handle_exit: 0x%x | 0x%lx | 0x%lx | 0x%lx\n", @@ -2355,7 +2340,7 @@ static inline void svm_inject_irq(struct { struct vmcb_control_area *control; - KVMTRACE_1D(INJ_VIRQ, &svm->vcpu, (u32)irq, handler); + trace_kvm_inj_virq(irq); ++svm->vcpu.stat.irq_injections; control = &svm->vmcb->control; Index: kvm/arch/x86/kvm/vmx-trace.h =================================================================== --- /dev/null +++ kvm/arch/x86/kvm/vmx-trace.h @@ -0,0 +1,22 @@ +#define exit_reasons vmx_exit_reasons +#define vmx_exit_reasons \ + {EXIT_REASON_EXCEPTION_NMI, "exception"}, \ + {EXIT_REASON_EXTERNAL_INTERRUPT, "ext_irq"}, \ + {EXIT_REASON_TRIPLE_FAULT, "triple_fault"}, \ + {EXIT_REASON_NMI_WINDOW, "nmi_window"}, \ + {EXIT_REASON_IO_INSTRUCTION, "io_instruction"}, \ + {EXIT_REASON_CR_ACCESS, "cr_access"}, \ + {EXIT_REASON_DR_ACCESS, "dr_access"}, \ + {EXIT_REASON_CPUID, "cpuid"}, \ + {EXIT_REASON_MSR_READ, "rdmsr"}, \ + {EXIT_REASON_MSR_WRITE, "wrmsr"}, \ + {EXIT_REASON_PENDING_INTERRUPT, "interrupt_window"}, \ + {EXIT_REASON_HLT, "halt"}, \ + {EXIT_REASON_INVLPG, "invlpg"}, \ + {EXIT_REASON_VMCALL, "hypercall"}, \ + {EXIT_REASON_TPR_BELOW_THRESHOLD, "tpr_below_thres"}, \ + {EXIT_REASON_APIC_ACCESS, "apic_access"}, \ + {EXIT_REASON_WBINVD, "wbinvd"}, \ + {EXIT_REASON_TASK_SWITCH, "task_switch"}, \ + {EXIT_REASON_EPT_VIOLATION, "ept_violation"} + Index: kvm/arch/x86/kvm/vmx.c =================================================================== --- kvm.orig/arch/x86/kvm/vmx.c +++ kvm/arch/x86/kvm/vmx.c @@ -34,6 +34,10 @@ #include <asm/virtext.h> #include <asm/mce.h> +#include "vmx-trace.h" +#define CREATE_TRACE_POINTS +#include "trace-arch.h" + #define __ex(x) __kvm_handle_fault_on_reboot(x) MODULE_AUTHOR("Qumranet"); @@ -2550,7 +2554,7 @@ static void vmx_inject_irq(struct kvm_vc uint32_t intr; int irq = vcpu->arch.interrupt.nr; - KVMTRACE_1D(INJ_VIRQ, vcpu, (u32)irq, handler); + trace_kvm_inj_virq(irq); ++vcpu->stat.irq_injections; if (vmx->rmode.vm86_active) { @@ -2751,8 +2755,8 @@ static int handle_exception(struct kvm_v if (enable_ept) BUG(); cr2 = vmcs_readl(EXIT_QUALIFICATION); - KVMTRACE_3D(PAGE_FAULT, vcpu, error_code, (u32)cr2, - (u32)((u64)cr2 >> 32), handler); + trace_kvm_page_fault(cr2, error_code); + if (kvm_event_needs_reinjection(vcpu)) kvm_mmu_unprotect_page_virt(vcpu, cr2); return kvm_mmu_page_fault(vcpu, cr2, error_code); @@ -2799,7 +2803,6 @@ static int handle_external_interrupt(str struct kvm_run *kvm_run) { ++vcpu->stat.irq_exits; - KVMTRACE_1D(INTR, vcpu, vmcs_read32(VM_EXIT_INTR_INFO), handler); return 1; } @@ -2847,7 +2850,7 @@ vmx_patch_hypercall(struct kvm_vcpu *vcp static int handle_cr(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) { - unsigned long exit_qualification; + unsigned long exit_qualification, val; int cr; int reg; @@ -2856,21 +2859,19 @@ static int handle_cr(struct kvm_vcpu *vc reg = (exit_qualification >> 8) & 15; switch ((exit_qualification >> 4) & 3) { case 0: /* mov to cr */ - KVMTRACE_3D(CR_WRITE, vcpu, (u32)cr, - (u32)kvm_register_read(vcpu, reg), - (u32)((u64)kvm_register_read(vcpu, reg) >> 32), - handler); + val = kvm_register_read(vcpu, reg); + trace_kvm_cr_write(cr, val); switch (cr) { case 0: - kvm_set_cr0(vcpu, kvm_register_read(vcpu, reg)); + kvm_set_cr0(vcpu, val); skip_emulated_instruction(vcpu); return 1; case 3: - kvm_set_cr3(vcpu, kvm_register_read(vcpu, reg)); + kvm_set_cr3(vcpu, val); skip_emulated_instruction(vcpu); return 1; case 4: - kvm_set_cr4(vcpu, kvm_register_read(vcpu, reg)); + kvm_set_cr4(vcpu, val); skip_emulated_instruction(vcpu); return 1; case 8: { @@ -2892,23 +2893,19 @@ static int handle_cr(struct kvm_vcpu *vc vcpu->arch.cr0 &= ~X86_CR0_TS; vmcs_writel(CR0_READ_SHADOW, vcpu->arch.cr0); vmx_fpu_activate(vcpu); - KVMTRACE_0D(CLTS, vcpu, handler); skip_emulated_instruction(vcpu); return 1; case 1: /*mov from cr*/ switch (cr) { case 3: kvm_register_write(vcpu, reg, vcpu->arch.cr3); - KVMTRACE_3D(CR_READ, vcpu, (u32)cr, - (u32)kvm_register_read(vcpu, reg), - (u32)((u64)kvm_register_read(vcpu, reg) >> 32), - handler); + trace_kvm_cr_read(cr, vcpu->arch.cr3); skip_emulated_instruction(vcpu); return 1; case 8: - kvm_register_write(vcpu, reg, kvm_get_cr8(vcpu)); - KVMTRACE_2D(CR_READ, vcpu, (u32)cr, - (u32)kvm_register_read(vcpu, reg), handler); + val = kvm_get_cr8(vcpu); + kvm_register_write(vcpu, cr, val); + trace_kvm_cr_read(cr, val); skip_emulated_instruction(vcpu); return 1; } @@ -2976,7 +2973,6 @@ static int handle_dr(struct kvm_vcpu *vc val = 0; } kvm_register_write(vcpu, reg, val); - KVMTRACE_2D(DR_READ, vcpu, (u32)dr, (u32)val, handler); } else { val = vcpu->arch.regs[reg]; switch (dr) { @@ -3009,7 +3005,6 @@ static int handle_dr(struct kvm_vcpu *vc } break; } - KVMTRACE_2D(DR_WRITE, vcpu, (u32)dr, (u32)val, handler); } skip_emulated_instruction(vcpu); return 1; @@ -3031,8 +3026,7 @@ static int handle_rdmsr(struct kvm_vcpu return 1; } - KVMTRACE_3D(MSR_READ, vcpu, ecx, (u32)data, (u32)(data >> 32), - handler); + trace_kvm_msr_read(ecx, data); /* FIXME: handling of bits 32:63 of rax, rdx */ vcpu->arch.regs[VCPU_REGS_RAX] = data & -1u; @@ -3047,8 +3041,7 @@ static int handle_wrmsr(struct kvm_vcpu u64 data = (vcpu->arch.regs[VCPU_REGS_RAX] & -1u) | ((u64)(vcpu->arch.regs[VCPU_REGS_RDX] & -1u) << 32); - KVMTRACE_3D(MSR_WRITE, vcpu, ecx, (u32)data, (u32)(data >> 32), - handler); + trace_kvm_msr_write(ecx, data); if (vmx_set_msr(vcpu, ecx, data) != 0) { kvm_inject_gp(vcpu, 0); @@ -3075,7 +3068,6 @@ static int handle_interrupt_window(struc cpu_based_vm_exec_control &= ~CPU_BASED_VIRTUAL_INTR_PENDING; vmcs_write32(CPU_BASED_VM_EXEC_CONTROL, cpu_based_vm_exec_control); - KVMTRACE_0D(PEND_INTR, vcpu, handler); ++vcpu->stat.irq_window_exits; /* @@ -3227,6 +3219,7 @@ static int handle_ept_violation(struct k } gpa = vmcs_read64(GUEST_PHYSICAL_ADDRESS); + trace_kvm_page_fault(gpa, exit_qualification); return kvm_mmu_page_fault(vcpu, gpa & PAGE_MASK, 0); } @@ -3410,8 +3403,7 @@ static int vmx_handle_exit(struct kvm_ru u32 exit_reason = vmx->exit_reason; u32 vectoring_info = vmx->idt_vectoring_info; - KVMTRACE_3D(VMEXIT, vcpu, exit_reason, (u32)kvm_rip_read(vcpu), - (u32)((u64)kvm_rip_read(vcpu) >> 32), entryexit); + trace_kvm_exit(exit_reason, kvm_rip_read(vcpu)); /* If we need to emulate an MMIO from handle_invalid_guest_state * we just return 0 */ @@ -3500,10 +3492,8 @@ static void vmx_complete_interrupts(stru /* We need to handle NMIs before interrupts are enabled */ if ((exit_intr_info & INTR_INFO_INTR_TYPE_MASK) == INTR_TYPE_NMI_INTR && - (exit_intr_info & INTR_INFO_VALID_MASK)) { - KVMTRACE_0D(NMI, &vmx->vcpu, handler); + (exit_intr_info & INTR_INFO_VALID_MASK)) asm("int $2"); - } idtv_info_valid = idt_vectoring_info & VECTORING_INFO_VALID_MASK; Index: kvm/arch/x86/kvm/x86.c =================================================================== --- kvm.orig/arch/x86/kvm/x86.c +++ kvm/arch/x86/kvm/x86.c @@ -37,6 +37,8 @@ #include <linux/iommu.h> #include <linux/intel-iommu.h> #include <linux/cpufreq.h> +#define CREATE_TRACE_POINTS +#include "trace.h" #include <asm/uaccess.h> #include <asm/msr.h> @@ -347,9 +349,6 @@ EXPORT_SYMBOL_GPL(kvm_set_cr0); void kvm_lmsw(struct kvm_vcpu *vcpu, unsigned long msw) { kvm_set_cr0(vcpu, (vcpu->arch.cr0 & ~0x0ful) | (msw & 0x0f)); - KVMTRACE_1D(LMSW, vcpu, - (u32)((vcpu->arch.cr0 & ~0x0ful) | (msw & 0x0f)), - handler); } EXPORT_SYMBOL_GPL(kvm_lmsw); @@ -2532,7 +2531,6 @@ int emulate_invlpg(struct kvm_vcpu *vcpu int emulate_clts(struct kvm_vcpu *vcpu) { - KVMTRACE_0D(CLTS, vcpu, handler); kvm_x86_ops->set_cr0(vcpu, vcpu->arch.cr0 & ~X86_CR0_TS); return X86EMUL_CONTINUE; } @@ -2815,12 +2813,8 @@ int kvm_emulate_pio(struct kvm_vcpu *vcp vcpu->arch.pio.down = 0; vcpu->arch.pio.rep = 0; - if (vcpu->run->io.direction == KVM_EXIT_IO_IN) - KVMTRACE_2D(IO_READ, vcpu, vcpu->run->io.port, (u32)size, - handler); - else - KVMTRACE_2D(IO_WRITE, vcpu, vcpu->run->io.port, (u32)size, - handler); + trace_kvm_pio(vcpu->run->io.direction == KVM_EXIT_IO_OUT, port, + size, 1); val = kvm_register_read(vcpu, VCPU_REGS_RAX); memcpy(vcpu->arch.pio_data, &val, 4); @@ -2856,12 +2850,8 @@ int kvm_emulate_pio_string(struct kvm_vc vcpu->arch.pio.down = down; vcpu->arch.pio.rep = rep; - if (vcpu->run->io.direction == KVM_EXIT_IO_IN) - KVMTRACE_2D(IO_READ, vcpu, vcpu->run->io.port, (u32)size, - handler); - else - KVMTRACE_2D(IO_WRITE, vcpu, vcpu->run->io.port, (u32)size, - handler); + trace_kvm_pio(vcpu->run->io.direction == KVM_EXIT_IO_OUT, port, + size, count); if (!count) { kvm_x86_ops->skip_emulated_instruction(vcpu); @@ -3039,7 +3029,6 @@ void kvm_arch_exit(void) int kvm_emulate_halt(struct kvm_vcpu *vcpu) { ++vcpu->stat.halt_exits; - KVMTRACE_0D(HLT, vcpu, handler); if (irqchip_in_kernel(vcpu->kvm)) { vcpu->arch.mp_state = KVM_MP_STATE_HALTED; return 1; @@ -3070,7 +3059,7 @@ int kvm_emulate_hypercall(struct kvm_vcp a2 = kvm_register_read(vcpu, VCPU_REGS_RDX); a3 = kvm_register_read(vcpu, VCPU_REGS_RSI); - KVMTRACE_1D(VMMCALL, vcpu, (u32)nr, handler); + trace_kvm_hypercall(nr, a0, a1, a2, a3); if (!is_long_mode(vcpu)) { nr &= 0xFFFFFFFF; @@ -3170,8 +3159,6 @@ unsigned long realmode_get_cr(struct kvm vcpu_printf(vcpu, "%s: unexpected cr %u\n", __func__, cr); return 0; } - KVMTRACE_3D(CR_READ, vcpu, (u32)cr, (u32)value, - (u32)((u64)value >> 32), handler); return value; } @@ -3179,9 +3166,6 @@ unsigned long realmode_get_cr(struct kvm void realmode_set_cr(struct kvm_vcpu *vcpu, int cr, unsigned long val, unsigned long *rflags) { - KVMTRACE_3D(CR_WRITE, vcpu, (u32)cr, (u32)val, - (u32)((u64)val >> 32), handler); - switch (cr) { case 0: kvm_set_cr0(vcpu, mk_cr_64(vcpu->arch.cr0, val)); @@ -3291,11 +3275,11 @@ void kvm_emulate_cpuid(struct kvm_vcpu * kvm_register_write(vcpu, VCPU_REGS_RDX, best->edx); } kvm_x86_ops->skip_emulated_instruction(vcpu); - KVMTRACE_5D(CPUID, vcpu, function, - (u32)kvm_register_read(vcpu, VCPU_REGS_RAX), - (u32)kvm_register_read(vcpu, VCPU_REGS_RBX), - (u32)kvm_register_read(vcpu, VCPU_REGS_RCX), - (u32)kvm_register_read(vcpu, VCPU_REGS_RDX), handler); + trace_kvm_cpuid(function, + kvm_register_read(vcpu, VCPU_REGS_RAX), + kvm_register_read(vcpu, VCPU_REGS_RBX), + kvm_register_read(vcpu, VCPU_REGS_RCX), + kvm_register_read(vcpu, VCPU_REGS_RDX)); } EXPORT_SYMBOL_GPL(kvm_emulate_cpuid); @@ -3491,7 +3475,7 @@ static int vcpu_enter_guest(struct kvm_v set_debugreg(vcpu->arch.eff_db[3], 3); } - KVMTRACE_0D(VMENTRY, vcpu, entryexit); + trace_kvm_entry(vcpu->vcpu_id); kvm_x86_ops->run(vcpu, kvm_run); if (unlikely(vcpu->arch.switch_db_regs)) { Index: kvm/virt/kvm/irq_comm.c =================================================================== --- kvm.orig/virt/kvm/irq_comm.c +++ kvm/virt/kvm/irq_comm.c @@ -20,6 +20,7 @@ */ #include <linux/kvm_host.h> +#include <trace/events/kvm.h> #include <asm/msidef.h> #ifdef CONFIG_IA64 @@ -125,6 +126,8 @@ int kvm_set_irq(struct kvm *kvm, int irq unsigned long *irq_state, sig_level; int ret = -1; + trace_kvm_set_irq(irq); + WARN_ON(!mutex_is_locked(&kvm->irq_lock)); if (irq < KVM_IOAPIC_NUM_PINS) { @@ -161,6 +164,8 @@ void kvm_notify_acked_irq(struct kvm *kv struct hlist_node *n; unsigned gsi = pin; + trace_kvm_ack_irq(irqchip, pin); + list_for_each_entry(e, &kvm->irq_routing, link) if (e->irqchip.irqchip == irqchip && e->irqchip.pin == pin) { Index: kvm/virt/kvm/kvm_main.c =================================================================== --- kvm.orig/virt/kvm/kvm_main.c +++ kvm/virt/kvm/kvm_main.c @@ -59,6 +59,9 @@ #include "irq.h" #endif +#define CREATE_TRACE_POINTS +#include <trace/events/kvm.h> + MODULE_AUTHOR("Qumranet"); MODULE_LICENSE("GPL"); @@ -2715,6 +2718,7 @@ EXPORT_SYMBOL_GPL(kvm_init); void kvm_exit(void) { kvm_trace_cleanup(); + tracepoint_synchronize_unregister(); misc_deregister(&kvm_dev); kmem_cache_destroy(kvm_vcpu_cache); sysdev_unregister(&kvm_sysdev); Index: kvm/arch/x86/kvm/Makefile =================================================================== --- kvm.orig/arch/x86/kvm/Makefile +++ kvm/arch/x86/kvm/Makefile @@ -1,6 +1,10 @@ EXTRA_CFLAGS += -Ivirt/kvm -Iarch/x86/kvm +CFLAGS_x86.o := -I. +CFLAGS_svm.o := -I. +CFLAGS_vmx.o := -I. + kvm-y += $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \ coalesced_mmio.o irq_comm.o eventfd.o) kvm-$(CONFIG_KVM_TRACE) += $(addprefix ../../../virt/kvm/, kvm_trace.o) Index: kvm/arch/x86/kvm/trace-arch.h =================================================================== --- /dev/null +++ kvm/arch/x86/kvm/trace-arch.h @@ -0,0 +1,129 @@ +#if !defined(_TRACE_KVM_ARCH_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_KVM_ARCH_H + +#include <linux/tracepoint.h> + +#undef TRACE_SYSTEM +#define TRACE_SYSTEM kvm +#define TRACE_INCLUDE_PATH arch/x86/kvm +#define TRACE_INCLUDE_FILE trace-arch + +/* + * Tracepoint for kvm guest exit: + */ +TRACE_EVENT(kvm_exit, + TP_PROTO(unsigned int exit_reason, unsigned long guest_rip), + TP_ARGS(exit_reason, guest_rip), + + TP_STRUCT__entry( + __field( unsigned int, exit_reason ) + __field( unsigned long, guest_rip ) + ), + + TP_fast_assign( + __entry->exit_reason = exit_reason; + __entry->guest_rip = guest_rip; + ), + + TP_printk("reason %s rip 0x%lx", + __print_symbolic(__entry->exit_reason, exit_reasons), + __entry->guest_rip) +); + +/* + * Tracepoint for kvm interrupt injection: + */ +TRACE_EVENT(kvm_inj_virq, + TP_PROTO(unsigned int irq), + TP_ARGS(irq), + + TP_STRUCT__entry( + __field( unsigned int, irq ) + ), + + TP_fast_assign( + __entry->irq = irq; + ), + + TP_printk("irq %u", __entry->irq) +); + +/* + * Tracepoint for page fault. + */ +TRACE_EVENT(kvm_page_fault, + TP_PROTO(unsigned long fault_address, unsigned int error_code), + TP_ARGS(fault_address, error_code), + + TP_STRUCT__entry( + __field( unsigned long, fault_address ) + __field( unsigned int, error_code ) + ), + + TP_fast_assign( + __entry->fault_address = fault_address; + __entry->error_code = error_code; + ), + + TP_printk("address %lx error_code %x", + __entry->fault_address, __entry->error_code) +); + +/* + * Tracepoint for guest MSR access. + */ +TRACE_EVENT(kvm_msr, + TP_PROTO(unsigned int rw, unsigned int ecx, unsigned long data), + TP_ARGS(rw, ecx, data), + + TP_STRUCT__entry( + __field( unsigned int, rw ) + __field( unsigned int, ecx ) + __field( unsigned long, data ) + ), + + TP_fast_assign( + __entry->rw = rw; + __entry->ecx = ecx; + __entry->data = data; + ), + + TP_printk("msr_%s %x = 0x%lx", + __entry->rw ? "write" : "read", + __entry->ecx, __entry->data) +); + +#define trace_kvm_msr_read(ecx, data) trace_kvm_msr(0, ecx, data) +#define trace_kvm_msr_write(ecx, data) trace_kvm_msr(1, ecx, data) + +/* + * Tracepoint for guest CR access. + */ +TRACE_EVENT(kvm_cr, + TP_PROTO(unsigned int rw, unsigned int cr, unsigned long val), + TP_ARGS(rw, cr, val), + + TP_STRUCT__entry( + __field( unsigned int, rw ) + __field( unsigned int, cr ) + __field( unsigned long, val ) + ), + + TP_fast_assign( + __entry->rw = rw; + __entry->cr = cr; + __entry->val = val; + ), + + TP_printk("cr_%s %x = 0x%lx", + __entry->rw ? "write" : "read", + __entry->cr, __entry->val) +); + +#define trace_kvm_cr_read(cr, val) trace_kvm_cr(0, cr, val) +#define trace_kvm_cr_write(cr, val) trace_kvm_cr(1, cr, val) + +#endif /* _TRACE_KVM_ARCH_H */ + +/* This part must be outside protection */ +#include <trace/define_trace.h> Index: kvm/arch/x86/kvm/trace.h =================================================================== --- /dev/null +++ kvm/arch/x86/kvm/trace.h @@ -0,0 +1,144 @@ +#if !defined(_TRACE_KVM_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_KVM_H + +#include <linux/tracepoint.h> + +#undef TRACE_SYSTEM +#define TRACE_SYSTEM kvm +#define TRACE_INCLUDE_PATH arch/x86/kvm +#define TRACE_INCLUDE_FILE trace + +/* + * Tracepoint for guest mode entry. + */ +TRACE_EVENT(kvm_entry, + 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\n", __entry->vcpu_id) +); + +/* + * Tracepoint for hypercall. + */ +TRACE_EVENT(kvm_hypercall, + TP_PROTO(unsigned long nr, unsigned long a0, unsigned long a1, + unsigned long a2, unsigned long a3), + TP_ARGS(nr, a0, a1, a2, a3), + + TP_STRUCT__entry( + __field( unsigned long, nr ) + __field( unsigned long, a0 ) + __field( unsigned long, a1 ) + __field( unsigned long, a2 ) + __field( unsigned long, a3 ) + ), + + TP_fast_assign( + __entry->nr = nr; + __entry->a0 = a0; + __entry->a1 = a1; + __entry->a2 = a2; + __entry->a3 = a3; + ), + + TP_printk("nr 0x%lx a0 0x%lx a1 0x%lx a2 0x%lx a3 0x%lx", + __entry->nr, __entry->a0, __entry->a1, __entry->a2, + __entry->a3) +); + +/* + * Tracepoint for PIO. + */ +TRACE_EVENT(kvm_pio, + TP_PROTO(unsigned int rw, unsigned int port, unsigned int size, + unsigned int count), + TP_ARGS(rw, port, size, count), + + TP_STRUCT__entry( + __field( unsigned int, rw ) + __field( unsigned int, port ) + __field( unsigned int, size ) + __field( unsigned int, count ) + ), + + TP_fast_assign( + __entry->rw = rw; + __entry->port = port; + __entry->size = size; + __entry->count = count; + ), + + TP_printk("pio_%s at 0x%x size %d count %d", + __entry->rw ? "write" : "read", + __entry->port, __entry->size, __entry->count) +); + +/* + * Tracepoint for cpuid. + */ +TRACE_EVENT(kvm_cpuid, + TP_PROTO(unsigned int function, unsigned long rax, unsigned long rbx, + unsigned long rcx, unsigned long rdx), + TP_ARGS(function, rax, rbx, rcx, rdx), + + TP_STRUCT__entry( + __field( unsigned int, function ) + __field( unsigned long, rax ) + __field( unsigned long, rbx ) + __field( unsigned long, rcx ) + __field( unsigned long, rdx ) + ), + + TP_fast_assign( + __entry->function = function; + __entry->rax = rax; + __entry->rbx = rbx; + __entry->rcx = rcx; + __entry->rdx = rdx; + ), + + TP_printk("func %x rax %lx rbx %lx rcx %lx rdx %lx", + __entry->function, __entry->rax, + __entry->rbx, __entry->rcx, __entry->rdx) +); + +/* + * Tracepoint for apic access. + */ +TRACE_EVENT(kvm_apic, + TP_PROTO(unsigned int rw, unsigned int reg, unsigned int val), + TP_ARGS(rw, reg, val), + + TP_STRUCT__entry( + __field( unsigned int, rw ) + __field( unsigned int, reg ) + __field( unsigned int, val ) + ), + + TP_fast_assign( + __entry->rw = rw; + __entry->reg = reg; + __entry->val = val; + ), + + TP_printk("apic_%s 0x%x = 0x%x", + __entry->rw ? "write" : "read", + __entry->reg, __entry->val) +); + +#define trace_kvm_apic_read(reg, val) trace_kvm_apic(0, reg, val) +#define trace_kvm_apic_write(reg, val) trace_kvm_apic(1, reg, val) + +#endif /* _TRACE_KVM_H */ + +/* This part must be outside protection */ +#include <trace/define_trace.h> Index: kvm/include/trace/events/kvm.h =================================================================== --- /dev/null +++ kvm/include/trace/events/kvm.h @@ -0,0 +1,55 @@ +#if !defined(_TRACE_KVM_MAIN_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_KVM_MAIN_H + +#include <linux/tracepoint.h> + +#undef TRACE_SYSTEM +#define TRACE_SYSTEM kvm +#define TRACE_INCLUDE_FILE kvm + +TRACE_EVENT(kvm_set_irq, + TP_PROTO(unsigned int gsi), + TP_ARGS(gsi), + + TP_STRUCT__entry( + __field( unsigned int, gsi ) + ), + + TP_fast_assign( + __entry->gsi = gsi; + ), + + TP_printk("gsi %u", __entry->gsi) +); + + +#define kvm_irqchips \ + {KVM_IRQCHIP_PIC_MASTER, "PIC master"}, \ + {KVM_IRQCHIP_PIC_SLAVE, "PIC slave"}, \ + {KVM_IRQCHIP_IOAPIC, "IOAPIC"} + +TRACE_EVENT(kvm_ack_irq, + TP_PROTO(unsigned int irqchip, unsigned int pin), + TP_ARGS(irqchip, pin), + + TP_STRUCT__entry( + __field( unsigned int, irqchip ) + __field( unsigned int, pin ) + ), + + TP_fast_assign( + __entry->irqchip = irqchip; + __entry->pin = pin; + ), + + TP_printk("irqchip %s pin %u", + __print_symbolic(__entry->irqchip, kvm_irqchips), + __entry->pin) +); + + + +#endif /* _TRACE_KVM_MAIN_H */ + +/* This part must be outside protection */ +#include <trace/define_trace.h> -- ^ permalink raw reply [flat|nested] 21+ messages in thread
* [patch 2/2] KVM: remove old KVMTRACE support code 2009-06-17 12:22 ` [patch 0/2] replace kvmtrace with event traces rebased Marcelo Tosatti 2009-06-17 12:22 ` [patch 1/2] KVM: convert custom marker based tracing to event traces Marcelo Tosatti @ 2009-06-17 12:22 ` Marcelo Tosatti 2009-06-17 13:33 ` Avi Kivity 2009-06-17 12:35 ` [patch 0/2] replace kvmtrace with event traces rebased Avi Kivity 2 siblings, 1 reply; 21+ messages in thread From: Marcelo Tosatti @ 2009-06-17 12:22 UTC (permalink / raw) To: avi; +Cc: kvm, Marcelo Tosatti [-- Attachment #1: remove-old-kvmtrace --] [-- Type: text/plain, Size: 11822 bytes --] Return EOPNOTSUPP for KVM_TRACE_ENABLE/PAUSE/DISABLE ioctls. Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Index: kvm/virt/kvm/kvm_main.c =================================================================== --- kvm.orig/virt/kvm/kvm_main.c +++ kvm/virt/kvm/kvm_main.c @@ -2367,7 +2367,7 @@ static long kvm_dev_ioctl(struct file *f case KVM_TRACE_ENABLE: case KVM_TRACE_PAUSE: case KVM_TRACE_DISABLE: - r = kvm_trace_ioctl(ioctl, arg); + r = -EOPNOTSUPP; break; default: return kvm_arch_dev_ioctl(filp, ioctl, arg); @@ -2717,7 +2717,6 @@ EXPORT_SYMBOL_GPL(kvm_init); void kvm_exit(void) { - kvm_trace_cleanup(); tracepoint_synchronize_unregister(); misc_deregister(&kvm_dev); kmem_cache_destroy(kvm_vcpu_cache); Index: kvm/include/linux/kvm_host.h =================================================================== --- kvm.orig/include/linux/kvm_host.h +++ kvm/include/linux/kvm_host.h @@ -482,37 +482,6 @@ struct kvm_stats_debugfs_item { extern struct kvm_stats_debugfs_item debugfs_entries[]; extern struct dentry *kvm_debugfs_dir; -#define KVMTRACE_5D(evt, vcpu, d1, d2, d3, d4, d5, name) \ - trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \ - vcpu, 5, d1, d2, d3, d4, d5) -#define KVMTRACE_4D(evt, vcpu, d1, d2, d3, d4, name) \ - trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \ - vcpu, 4, d1, d2, d3, d4, 0) -#define KVMTRACE_3D(evt, vcpu, d1, d2, d3, name) \ - trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \ - vcpu, 3, d1, d2, d3, 0, 0) -#define KVMTRACE_2D(evt, vcpu, d1, d2, name) \ - trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \ - vcpu, 2, d1, d2, 0, 0, 0) -#define KVMTRACE_1D(evt, vcpu, d1, name) \ - trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \ - vcpu, 1, d1, 0, 0, 0, 0) -#define KVMTRACE_0D(evt, vcpu, name) \ - trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \ - vcpu, 0, 0, 0, 0, 0, 0) - -#ifdef CONFIG_KVM_TRACE -int kvm_trace_ioctl(unsigned int ioctl, unsigned long arg); -void kvm_trace_cleanup(void); -#else -static inline -int kvm_trace_ioctl(unsigned int ioctl, unsigned long arg) -{ - return -EINVAL; -} -#define kvm_trace_cleanup() ((void)0) -#endif - #ifdef KVM_ARCH_WANT_MMU_NOTIFIER static inline int mmu_notifier_retry(struct kvm_vcpu *vcpu, unsigned long mmu_seq) { Index: kvm/virt/kvm/kvm_trace.c =================================================================== --- kvm.orig/virt/kvm/kvm_trace.c +++ /dev/null @@ -1,285 +0,0 @@ -/* - * kvm trace - * - * It is designed to allow debugging traces of kvm to be generated - * on UP / SMP machines. Each trace entry can be timestamped so that - * it's possible to reconstruct a chronological record of trace events. - * The implementation refers to blktrace kernel support. - * - * Copyright (c) 2008 Intel Corporation - * Copyright (C) 2006 Jens Axboe <axboe@kernel.dk> - * - * Authors: Feng(Eric) Liu, eric.e.liu@intel.com - * - * Date: Feb 2008 - */ - -#include <linux/module.h> -#include <linux/relay.h> -#include <linux/debugfs.h> -#include <linux/ktime.h> - -#include <linux/kvm_host.h> - -#define KVM_TRACE_STATE_RUNNING (1 << 0) -#define KVM_TRACE_STATE_PAUSE (1 << 1) -#define KVM_TRACE_STATE_CLEARUP (1 << 2) - -struct kvm_trace { - int trace_state; - struct rchan *rchan; - struct dentry *lost_file; - atomic_t lost_records; -}; -static struct kvm_trace *kvm_trace; - -struct kvm_trace_probe { - const char *name; - const char *format; - u32 timestamp_in; - marker_probe_func *probe_func; -}; - -static inline int calc_rec_size(int timestamp, int extra) -{ - int rec_size = KVM_TRC_HEAD_SIZE; - - rec_size += extra; - return timestamp ? rec_size += KVM_TRC_CYCLE_SIZE : rec_size; -} - -static void kvm_add_trace(void *probe_private, void *call_data, - const char *format, va_list *args) -{ - struct kvm_trace_probe *p = probe_private; - struct kvm_trace *kt = kvm_trace; - struct kvm_trace_rec rec; - struct kvm_vcpu *vcpu; - int i, size; - u32 extra; - - if (unlikely(kt->trace_state != KVM_TRACE_STATE_RUNNING)) - return; - - rec.rec_val = TRACE_REC_EVENT_ID(va_arg(*args, u32)); - vcpu = va_arg(*args, struct kvm_vcpu *); - rec.pid = current->tgid; - rec.vcpu_id = vcpu->vcpu_id; - - extra = va_arg(*args, u32); - WARN_ON(!(extra <= KVM_TRC_EXTRA_MAX)); - extra = min_t(u32, extra, KVM_TRC_EXTRA_MAX); - - rec.rec_val |= TRACE_REC_TCS(p->timestamp_in) - | TRACE_REC_NUM_DATA_ARGS(extra); - - if (p->timestamp_in) { - rec.u.timestamp.timestamp = ktime_to_ns(ktime_get()); - - for (i = 0; i < extra; i++) - rec.u.timestamp.extra_u32[i] = va_arg(*args, u32); - } else { - for (i = 0; i < extra; i++) - rec.u.notimestamp.extra_u32[i] = va_arg(*args, u32); - } - - size = calc_rec_size(p->timestamp_in, extra * sizeof(u32)); - relay_write(kt->rchan, &rec, size); -} - -static struct kvm_trace_probe kvm_trace_probes[] = { - { "kvm_trace_entryexit", "%u %p %u %u %u %u %u %u", 1, kvm_add_trace }, - { "kvm_trace_handler", "%u %p %u %u %u %u %u %u", 0, kvm_add_trace }, -}; - -static int lost_records_get(void *data, u64 *val) -{ - struct kvm_trace *kt = data; - - *val = atomic_read(&kt->lost_records); - return 0; -} - -DEFINE_SIMPLE_ATTRIBUTE(kvm_trace_lost_ops, lost_records_get, NULL, "%llu\n"); - -/* - * The relay channel is used in "no-overwrite" mode, it keeps trace of how - * many times we encountered a full subbuffer, to tell user space app the - * lost records there were. - */ -static int kvm_subbuf_start_callback(struct rchan_buf *buf, void *subbuf, - void *prev_subbuf, size_t prev_padding) -{ - struct kvm_trace *kt; - - if (!relay_buf_full(buf)) { - if (!prev_subbuf) { - /* - * executed only once when the channel is opened - * save metadata as first record - */ - subbuf_start_reserve(buf, sizeof(u32)); - *(u32 *)subbuf = 0x12345678; - } - - return 1; - } - - kt = buf->chan->private_data; - atomic_inc(&kt->lost_records); - - return 0; -} - -static struct dentry *kvm_create_buf_file_callack(const char *filename, - struct dentry *parent, - int mode, - struct rchan_buf *buf, - int *is_global) -{ - return debugfs_create_file(filename, mode, parent, buf, - &relay_file_operations); -} - -static int kvm_remove_buf_file_callback(struct dentry *dentry) -{ - debugfs_remove(dentry); - return 0; -} - -static struct rchan_callbacks kvm_relay_callbacks = { - .subbuf_start = kvm_subbuf_start_callback, - .create_buf_file = kvm_create_buf_file_callack, - .remove_buf_file = kvm_remove_buf_file_callback, -}; - -static int do_kvm_trace_enable(struct kvm_user_trace_setup *kuts) -{ - struct kvm_trace *kt; - int i, r = -ENOMEM; - - if (!kuts->buf_size || !kuts->buf_nr) - return -EINVAL; - - kt = kzalloc(sizeof(*kt), GFP_KERNEL); - if (!kt) - goto err; - - r = -EIO; - atomic_set(&kt->lost_records, 0); - kt->lost_file = debugfs_create_file("lost_records", 0444, kvm_debugfs_dir, - kt, &kvm_trace_lost_ops); - if (!kt->lost_file) - goto err; - - kt->rchan = relay_open("trace", kvm_debugfs_dir, kuts->buf_size, - kuts->buf_nr, &kvm_relay_callbacks, kt); - if (!kt->rchan) - goto err; - - kvm_trace = kt; - - for (i = 0; i < ARRAY_SIZE(kvm_trace_probes); i++) { - struct kvm_trace_probe *p = &kvm_trace_probes[i]; - - r = marker_probe_register(p->name, p->format, p->probe_func, p); - if (r) - printk(KERN_INFO "Unable to register probe %s\n", - p->name); - } - - kvm_trace->trace_state = KVM_TRACE_STATE_RUNNING; - - return 0; -err: - if (kt) { - if (kt->lost_file) - debugfs_remove(kt->lost_file); - if (kt->rchan) - relay_close(kt->rchan); - kfree(kt); - } - return r; -} - -static int kvm_trace_enable(char __user *arg) -{ - struct kvm_user_trace_setup kuts; - int ret; - - ret = copy_from_user(&kuts, arg, sizeof(kuts)); - if (ret) - return -EFAULT; - - ret = do_kvm_trace_enable(&kuts); - if (ret) - return ret; - - return 0; -} - -static int kvm_trace_pause(void) -{ - struct kvm_trace *kt = kvm_trace; - int r = -EINVAL; - - if (kt == NULL) - return r; - - if (kt->trace_state == KVM_TRACE_STATE_RUNNING) { - kt->trace_state = KVM_TRACE_STATE_PAUSE; - relay_flush(kt->rchan); - r = 0; - } - - return r; -} - -void kvm_trace_cleanup(void) -{ - struct kvm_trace *kt = kvm_trace; - int i; - - if (kt == NULL) - return; - - if (kt->trace_state == KVM_TRACE_STATE_RUNNING || - kt->trace_state == KVM_TRACE_STATE_PAUSE) { - - kt->trace_state = KVM_TRACE_STATE_CLEARUP; - - for (i = 0; i < ARRAY_SIZE(kvm_trace_probes); i++) { - struct kvm_trace_probe *p = &kvm_trace_probes[i]; - marker_probe_unregister(p->name, p->probe_func, p); - } - marker_synchronize_unregister(); - - relay_close(kt->rchan); - debugfs_remove(kt->lost_file); - kfree(kt); - } -} - -int kvm_trace_ioctl(unsigned int ioctl, unsigned long arg) -{ - void __user *argp = (void __user *)arg; - long r = -EINVAL; - - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; - - switch (ioctl) { - case KVM_TRACE_ENABLE: - r = kvm_trace_enable(argp); - break; - case KVM_TRACE_PAUSE: - r = kvm_trace_pause(); - break; - case KVM_TRACE_DISABLE: - r = 0; - kvm_trace_cleanup(); - break; - } - - return r; -} Index: kvm/arch/x86/kvm/Makefile =================================================================== --- kvm.orig/arch/x86/kvm/Makefile +++ kvm/arch/x86/kvm/Makefile @@ -7,7 +7,6 @@ CFLAGS_vmx.o := -I. kvm-y += $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \ coalesced_mmio.o irq_comm.o eventfd.o) -kvm-$(CONFIG_KVM_TRACE) += $(addprefix ../../../virt/kvm/, kvm_trace.o) kvm-$(CONFIG_IOMMU_API) += $(addprefix ../../../virt/kvm/, iommu.o) kvm-y += x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o \ Index: kvm/include/linux/kvm.h =================================================================== --- kvm.orig/include/linux/kvm.h +++ kvm/include/linux/kvm.h @@ -14,7 +14,7 @@ #define KVM_API_VERSION 12 -/* for KVM_TRACE_ENABLE */ +/* for KVM_TRACE_ENABLE, deprecated */ struct kvm_user_trace_setup { __u32 buf_size; /* sub_buffer size of each per-cpu */ __u32 buf_nr; /* the number of sub_buffers of each per-cpu */ @@ -325,35 +325,6 @@ struct kvm_guest_debug { #define KVM_TRC_CYCLE_SIZE 8 #define KVM_TRC_EXTRA_MAX 7 -/* This structure represents a single trace buffer record. */ -struct kvm_trace_rec { - /* variable rec_val - * is split into: - * bits 0 - 27 -> event id - * bits 28 -30 -> number of extra data args of size u32 - * bits 31 -> binary indicator for if tsc is in record - */ - __u32 rec_val; - __u32 pid; - __u32 vcpu_id; - union { - struct { - __u64 timestamp; - __u32 extra_u32[KVM_TRC_EXTRA_MAX]; - } __attribute__((packed)) timestamp; - struct { - __u32 extra_u32[KVM_TRC_EXTRA_MAX]; - } notimestamp; - } u; -}; - -#define TRACE_REC_EVENT_ID(val) \ - (0x0fffffff & (val)) -#define TRACE_REC_NUM_DATA_ARGS(val) \ - (0x70000000 & ((val) << 28)) -#define TRACE_REC_TCS(val) \ - (0x80000000 & ((val) << 31)) - #define KVMIO 0xAE /* Index: kvm/arch/x86/kvm/Kconfig =================================================================== --- kvm.orig/arch/x86/kvm/Kconfig +++ kvm/arch/x86/kvm/Kconfig @@ -62,18 +62,6 @@ config KVM_AMD To compile this as a module, choose M here: the module will be called kvm-amd. -config KVM_TRACE - bool "KVM trace support" - depends on KVM && SYSFS - select MARKERS - select RELAY - select DEBUG_FS - default n - ---help--- - This option allows reading a trace of kvm-related events through - relayfs. Note the ABI is not considered stable and will be - modified in future updates. - # OK, it's a little counter-intuitive to do this, but it puts it neatly under # the virtualization menu. source drivers/lguest/Kconfig -- ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [patch 2/2] KVM: remove old KVMTRACE support code 2009-06-17 12:22 ` [patch 2/2] KVM: remove old KVMTRACE support code Marcelo Tosatti @ 2009-06-17 13:33 ` Avi Kivity 2009-06-18 14:47 ` [patch 0/3] " Marcelo Tosatti 0 siblings, 1 reply; 21+ messages in thread From: Avi Kivity @ 2009-06-17 13:33 UTC (permalink / raw) To: Marcelo Tosatti; +Cc: kvm, Hollis Blanchard On 06/17/2009 03:22 PM, Marcelo Tosatti wrote: > Return EOPNOTSUPP for KVM_TRACE_ENABLE/PAUSE/DISABLE ioctls. > > I dropped this patch, breaks the powerpc build. I guess it should be simple to convert powerpc? -- Do not meddle in the internals of kernels, for they are subtle and quick to panic. ^ permalink raw reply [flat|nested] 21+ messages in thread
* [patch 0/3] remove old KVMTRACE support code 2009-06-17 13:33 ` Avi Kivity @ 2009-06-18 14:47 ` Marcelo Tosatti 2009-06-18 14:47 ` [patch 1/3] KVM: PPC: convert marker probes to event trace Marcelo Tosatti ` (3 more replies) 0 siblings, 4 replies; 21+ messages in thread From: Marcelo Tosatti @ 2009-06-18 14:47 UTC (permalink / raw) To: avi; +Cc: kvm -- ^ permalink raw reply [flat|nested] 21+ messages in thread
* [patch 1/3] KVM: PPC: convert marker probes to event trace 2009-06-18 14:47 ` [patch 0/3] " Marcelo Tosatti @ 2009-06-18 14:47 ` Marcelo Tosatti 2009-06-18 14:47 ` [patch 2/3] KVM: remove old KVMTRACE support code Marcelo Tosatti ` (2 subsequent siblings) 3 siblings, 0 replies; 21+ messages in thread From: Marcelo Tosatti @ 2009-06-18 14:47 UTC (permalink / raw) To: avi; +Cc: kvm, Hollis Blanchard, Marcelo Tosatti [-- Attachment #1: convert-ppc-to-eventtrace --] [-- Type: text/plain, Size: 7895 bytes --] CC: Hollis Blanchard <hollisb@us.ibm.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Index: kvm/arch/powerpc/kvm/44x_tlb.c =================================================================== --- kvm.orig/arch/powerpc/kvm/44x_tlb.c +++ kvm/arch/powerpc/kvm/44x_tlb.c @@ -31,6 +31,9 @@ #include "44x_tlb.h" +#define CREATE_TRACE_POINTS +#include "trace-arch.h" + #ifndef PPC44x_TLBE_SIZE #define PPC44x_TLBE_SIZE PPC44x_TLB_4K #endif @@ -263,7 +266,7 @@ static void kvmppc_44x_shadow_release(st /* XXX set tlb_44x_index to stlb_index? */ - KVMTRACE_1D(STLB_INVAL, &vcpu_44x->vcpu, stlb_index, handler); + trace_kvm_stlb_inval(stlb_index); } void kvmppc_mmu_destroy(struct kvm_vcpu *vcpu) @@ -365,8 +368,8 @@ void kvmppc_mmu_map(struct kvm_vcpu *vcp /* Insert shadow mapping into hardware TLB. */ kvmppc_44x_tlbe_set_modified(vcpu_44x, victim); kvmppc_44x_tlbwe(victim, &stlbe); - KVMTRACE_5D(STLB_WRITE, vcpu, victim, stlbe.tid, stlbe.word0, stlbe.word1, - stlbe.word2, handler); + trace_kvm_stlb_write(victim, stlbe.tid, stlbe.word0, stlbe.word1, + stlbe.word2); } /* For a particular guest TLB entry, invalidate the corresponding host TLB @@ -485,8 +488,8 @@ int kvmppc_44x_emul_tlbwe(struct kvm_vcp kvmppc_mmu_map(vcpu, eaddr, gpaddr, gtlb_index); } - KVMTRACE_5D(GTLB_WRITE, vcpu, gtlb_index, tlbe->tid, tlbe->word0, - tlbe->word1, tlbe->word2, handler); + trace_kvm_gtlb_write(gtlb_index, tlbe->tid, tlbe->word0, tlbe->word1, + tlbe->word2); kvmppc_set_exit_type(vcpu, EMULATED_TLBWE_EXITS); return EMULATE_DONE; Index: kvm/arch/powerpc/kvm/trace-arch.h =================================================================== --- /dev/null +++ kvm/arch/powerpc/kvm/trace-arch.h @@ -0,0 +1,84 @@ +#if !defined(_TRACE_KVM_ARCH_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_KVM_ARCH_H + +#include <linux/tracepoint.h> + +#undef TRACE_SYSTEM +#define TRACE_SYSTEM kvm +#define TRACE_INCLUDE_PATH arch/powerpc/kvm +#define TRACE_INCLUDE_FILE trace-arch + +/* + * Tracepoint for kvm guest exit: + */ +TRACE_EVENT(kvm_stlb_inval, + TP_PROTO(unsigned int stlb_index), + TP_ARGS(stlb_index), + + TP_STRUCT__entry( + __field( unsigned int, stlb_index ) + ), + + TP_fast_assign( + __entry->stlb_index = stlb_index; + ), + + TP_printk("stlb_index %u", __entry->stlb_index) +); + +TRACE_EVENT(kvm_stlb_write, + TP_PROTO(unsigned int victim, unsigned int tid, unsigned int word0, + unsigned int word1, unsigned int word2), + TP_ARGS(victim, tid, word0, word1, word2), + + TP_STRUCT__entry( + __field( unsigned int, victim ) + __field( unsigned int, tid ) + __field( unsigned int, word0 ) + __field( unsigned int, word1 ) + __field( unsigned int, word2 ) + ), + + TP_fast_assign( + __entry->victim = victim; + __entry->tid = tid; + __entry->word0 = word0; + __entry->word1 = word1; + __entry->word2 = word2; + ), + + TP_printk("victim %u tid %u w0 %u w1 %u w2 %u", + __entry->victim, __entry->tid, __entry->word0, + __entry->word1, __entry->word2) +); + +TRACE_EVENT(kvm_gtlb_write, + TP_PROTO(unsigned int gtlb_index, unsigned int tid, unsigned int word0, + unsigned int word1, unsigned int word2), + TP_ARGS(gtlb_index, tid, word0, word1, word2), + + TP_STRUCT__entry( + __field( unsigned int, gtlb_index ) + __field( unsigned int, tid ) + __field( unsigned int, word0 ) + __field( unsigned int, word1 ) + __field( unsigned int, word2 ) + ), + + TP_fast_assign( + __entry->gtlb_index = gtlb_index; + __entry->tid = tid; + __entry->word0 = word0; + __entry->word1 = word1; + __entry->word2 = word2; + ), + + TP_printk("gtlb_index %u tid %u w0 %u w1 %u w2 %u", + __entry->gtlb_index, __entry->tid, __entry->word0, + __entry->word1, __entry->word2) +); + +#endif /* _TRACE_KVM_ARCH */ + +/* This part must be outside protection */ +#include <trace/define_trace.h> Index: kvm/arch/powerpc/kvm/Makefile =================================================================== --- kvm.orig/arch/powerpc/kvm/Makefile +++ kvm/arch/powerpc/kvm/Makefile @@ -8,6 +8,10 @@ common-objs-y = $(addprefix ../../../vir common-objs-$(CONFIG_KVM_TRACE) += $(addprefix ../../../virt/kvm/, kvm_trace.o) +CFLAGS_44x_tlb.o := -I. +CFLAGS_e500_tlb.o := -I. +CFLAGS_emulate.o := -I. + kvm-objs := $(common-objs-y) powerpc.o emulate.o obj-$(CONFIG_KVM_EXIT_TIMING) += timing.o obj-$(CONFIG_KVM) += kvm.o Index: kvm/arch/powerpc/kvm/e500_tlb.c =================================================================== --- kvm.orig/arch/powerpc/kvm/e500_tlb.c +++ kvm/arch/powerpc/kvm/e500_tlb.c @@ -23,6 +23,9 @@ #include "../mm/mmu_decl.h" #include "e500_tlb.h" +#define CREATE_TRACE_POINTS +#include "trace-arch.h" + #define to_htlb1_esel(esel) (tlb1_entry_num - (esel) - 1) static unsigned int tlb1_entry_num; @@ -224,9 +227,8 @@ static void kvmppc_e500_stlbe_invalidate kvmppc_e500_shadow_release(vcpu_e500, tlbsel, esel); stlbe->mas1 = 0; - KVMTRACE_5D(STLB_INVAL, &vcpu_e500->vcpu, index_of(tlbsel, esel), - stlbe->mas1, stlbe->mas2, stlbe->mas3, stlbe->mas7, - handler); + trace_kvm_stlb_inval(index_of(tlbsel, esel), stlbe->mas1, stlbe->mas2, + stlbe->mas3, stlbe->mas7); } static void kvmppc_e500_tlb1_invalidate(struct kvmppc_vcpu_e500 *vcpu_e500, @@ -319,9 +321,8 @@ static inline void kvmppc_e500_shadow_ma vcpu_e500->vcpu.arch.msr & MSR_PR); stlbe->mas7 = (hpaddr >> 32) & MAS7_RPN; - KVMTRACE_5D(STLB_WRITE, &vcpu_e500->vcpu, index_of(tlbsel, esel), - stlbe->mas1, stlbe->mas2, stlbe->mas3, stlbe->mas7, - handler); + trace_kvm_stlb_write(index_of(tlbsel, esel), stlbe->mas1, stlbe->mas2, + stlbe->mas3, stlbe->mas7); } /* XXX only map the one-one case, for now use TLB0 */ @@ -535,9 +536,8 @@ int kvmppc_e500_emul_tlbwe(struct kvm_vc gtlbe->mas3 = vcpu_e500->mas3; gtlbe->mas7 = vcpu_e500->mas7; - KVMTRACE_5D(GTLB_WRITE, vcpu, vcpu_e500->mas0, - gtlbe->mas1, gtlbe->mas2, gtlbe->mas3, gtlbe->mas7, - handler); + trace_kvm_gtlb_write(vcpu_e500->mas0, gtlbe->mas1, gtlbe->mas2, + gtlbe->mas3, gtlbe->mas7); /* Invalidate shadow mappings for the about-to-be-clobbered TLBE. */ if (tlbe_is_host_safe(vcpu, gtlbe)) { Index: kvm/arch/powerpc/kvm/emulate.c =================================================================== --- kvm.orig/arch/powerpc/kvm/emulate.c +++ kvm/arch/powerpc/kvm/emulate.c @@ -30,6 +30,9 @@ #include <asm/disassemble.h> #include "timing.h" +#define CREATE_TRACE_POINTS +#include "trace.h" + #define OP_TRAP 3 #define OP_31_XOP_LWZX 23 @@ -419,7 +422,7 @@ int kvmppc_emulate_instruction(struct kv } } - KVMTRACE_3D(PPC_INSTR, vcpu, inst, (int)vcpu->arch.pc, emulated, entryexit); + trace_kvm_ppc_instr(inst, vcpu->arch.pc, emulated); if (advance) vcpu->arch.pc += 4; /* Advance past emulated instruction. */ Index: kvm/arch/powerpc/kvm/trace.h =================================================================== --- /dev/null +++ kvm/arch/powerpc/kvm/trace.h @@ -0,0 +1,37 @@ +#if !defined(_TRACE_KVM_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_KVM_H + +#include <linux/tracepoint.h> + +#undef TRACE_SYSTEM +#define TRACE_SYSTEM kvm +#define TRACE_INCLUDE_PATH arch/powerpc/kvm +#define TRACE_INCLUDE_FILE trace + +/* + * Tracepoint for guest mode entry. + */ +TRACE_EVENT(kvm_ppc_instr + TP_PROTO(unsigned int inst, unsigned long pc, unsigned int emulate), + TP_ARGS(inst, pc, emulate), + + TP_STRUCT__entry( + __field( unsigned int, inst ) + __field( unsigned long, pc ) + __field( unsigned int, emulate ) + ), + + TP_fast_assign( + __entry->inst = inst; + __entry->pc = pc; + __entry->emulate = emulate; + ), + + TP_printk("inst %u pc 0x%lx emulate %u\n", + __entry->inst, __entry->pc, __entry->emulate); +); + +#endif /* _TRACE_KVM_H */ + +/* This part must be outside protection */ +#include <trace/define_trace.h> -- ^ permalink raw reply [flat|nested] 21+ messages in thread
* [patch 2/3] KVM: remove old KVMTRACE support code 2009-06-18 14:47 ` [patch 0/3] " Marcelo Tosatti 2009-06-18 14:47 ` [patch 1/3] KVM: PPC: convert marker probes to event trace Marcelo Tosatti @ 2009-06-18 14:47 ` Marcelo Tosatti 2009-06-18 14:47 ` [patch 3/3] kvm-kmod: dummy event trace hooks Marcelo Tosatti 2009-06-28 15:57 ` [patch 0/3] remove old KVMTRACE support code Avi Kivity 3 siblings, 0 replies; 21+ messages in thread From: Marcelo Tosatti @ 2009-06-18 14:47 UTC (permalink / raw) To: avi; +Cc: kvm, Marcelo Tosatti [-- Attachment #1: remove-old-kvmtrace --] [-- Type: text/plain, Size: 13675 bytes --] Return EOPNOTSUPP for KVM_TRACE_ENABLE/PAUSE/DISABLE ioctls. Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Index: kvm/virt/kvm/kvm_main.c =================================================================== --- kvm.orig/virt/kvm/kvm_main.c +++ kvm/virt/kvm/kvm_main.c @@ -2367,7 +2367,7 @@ static long kvm_dev_ioctl(struct file *f case KVM_TRACE_ENABLE: case KVM_TRACE_PAUSE: case KVM_TRACE_DISABLE: - r = kvm_trace_ioctl(ioctl, arg); + r = -EOPNOTSUPP; break; default: return kvm_arch_dev_ioctl(filp, ioctl, arg); @@ -2717,7 +2717,6 @@ EXPORT_SYMBOL_GPL(kvm_init); void kvm_exit(void) { - kvm_trace_cleanup(); tracepoint_synchronize_unregister(); misc_deregister(&kvm_dev); kmem_cache_destroy(kvm_vcpu_cache); Index: kvm/include/linux/kvm_host.h =================================================================== --- kvm.orig/include/linux/kvm_host.h +++ kvm/include/linux/kvm_host.h @@ -482,37 +482,6 @@ struct kvm_stats_debugfs_item { extern struct kvm_stats_debugfs_item debugfs_entries[]; extern struct dentry *kvm_debugfs_dir; -#define KVMTRACE_5D(evt, vcpu, d1, d2, d3, d4, d5, name) \ - trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \ - vcpu, 5, d1, d2, d3, d4, d5) -#define KVMTRACE_4D(evt, vcpu, d1, d2, d3, d4, name) \ - trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \ - vcpu, 4, d1, d2, d3, d4, 0) -#define KVMTRACE_3D(evt, vcpu, d1, d2, d3, name) \ - trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \ - vcpu, 3, d1, d2, d3, 0, 0) -#define KVMTRACE_2D(evt, vcpu, d1, d2, name) \ - trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \ - vcpu, 2, d1, d2, 0, 0, 0) -#define KVMTRACE_1D(evt, vcpu, d1, name) \ - trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \ - vcpu, 1, d1, 0, 0, 0, 0) -#define KVMTRACE_0D(evt, vcpu, name) \ - trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \ - vcpu, 0, 0, 0, 0, 0, 0) - -#ifdef CONFIG_KVM_TRACE -int kvm_trace_ioctl(unsigned int ioctl, unsigned long arg); -void kvm_trace_cleanup(void); -#else -static inline -int kvm_trace_ioctl(unsigned int ioctl, unsigned long arg) -{ - return -EINVAL; -} -#define kvm_trace_cleanup() ((void)0) -#endif - #ifdef KVM_ARCH_WANT_MMU_NOTIFIER static inline int mmu_notifier_retry(struct kvm_vcpu *vcpu, unsigned long mmu_seq) { Index: kvm/virt/kvm/kvm_trace.c =================================================================== --- kvm.orig/virt/kvm/kvm_trace.c +++ /dev/null @@ -1,285 +0,0 @@ -/* - * kvm trace - * - * It is designed to allow debugging traces of kvm to be generated - * on UP / SMP machines. Each trace entry can be timestamped so that - * it's possible to reconstruct a chronological record of trace events. - * The implementation refers to blktrace kernel support. - * - * Copyright (c) 2008 Intel Corporation - * Copyright (C) 2006 Jens Axboe <axboe@kernel.dk> - * - * Authors: Feng(Eric) Liu, eric.e.liu@intel.com - * - * Date: Feb 2008 - */ - -#include <linux/module.h> -#include <linux/relay.h> -#include <linux/debugfs.h> -#include <linux/ktime.h> - -#include <linux/kvm_host.h> - -#define KVM_TRACE_STATE_RUNNING (1 << 0) -#define KVM_TRACE_STATE_PAUSE (1 << 1) -#define KVM_TRACE_STATE_CLEARUP (1 << 2) - -struct kvm_trace { - int trace_state; - struct rchan *rchan; - struct dentry *lost_file; - atomic_t lost_records; -}; -static struct kvm_trace *kvm_trace; - -struct kvm_trace_probe { - const char *name; - const char *format; - u32 timestamp_in; - marker_probe_func *probe_func; -}; - -static inline int calc_rec_size(int timestamp, int extra) -{ - int rec_size = KVM_TRC_HEAD_SIZE; - - rec_size += extra; - return timestamp ? rec_size += KVM_TRC_CYCLE_SIZE : rec_size; -} - -static void kvm_add_trace(void *probe_private, void *call_data, - const char *format, va_list *args) -{ - struct kvm_trace_probe *p = probe_private; - struct kvm_trace *kt = kvm_trace; - struct kvm_trace_rec rec; - struct kvm_vcpu *vcpu; - int i, size; - u32 extra; - - if (unlikely(kt->trace_state != KVM_TRACE_STATE_RUNNING)) - return; - - rec.rec_val = TRACE_REC_EVENT_ID(va_arg(*args, u32)); - vcpu = va_arg(*args, struct kvm_vcpu *); - rec.pid = current->tgid; - rec.vcpu_id = vcpu->vcpu_id; - - extra = va_arg(*args, u32); - WARN_ON(!(extra <= KVM_TRC_EXTRA_MAX)); - extra = min_t(u32, extra, KVM_TRC_EXTRA_MAX); - - rec.rec_val |= TRACE_REC_TCS(p->timestamp_in) - | TRACE_REC_NUM_DATA_ARGS(extra); - - if (p->timestamp_in) { - rec.u.timestamp.timestamp = ktime_to_ns(ktime_get()); - - for (i = 0; i < extra; i++) - rec.u.timestamp.extra_u32[i] = va_arg(*args, u32); - } else { - for (i = 0; i < extra; i++) - rec.u.notimestamp.extra_u32[i] = va_arg(*args, u32); - } - - size = calc_rec_size(p->timestamp_in, extra * sizeof(u32)); - relay_write(kt->rchan, &rec, size); -} - -static struct kvm_trace_probe kvm_trace_probes[] = { - { "kvm_trace_entryexit", "%u %p %u %u %u %u %u %u", 1, kvm_add_trace }, - { "kvm_trace_handler", "%u %p %u %u %u %u %u %u", 0, kvm_add_trace }, -}; - -static int lost_records_get(void *data, u64 *val) -{ - struct kvm_trace *kt = data; - - *val = atomic_read(&kt->lost_records); - return 0; -} - -DEFINE_SIMPLE_ATTRIBUTE(kvm_trace_lost_ops, lost_records_get, NULL, "%llu\n"); - -/* - * The relay channel is used in "no-overwrite" mode, it keeps trace of how - * many times we encountered a full subbuffer, to tell user space app the - * lost records there were. - */ -static int kvm_subbuf_start_callback(struct rchan_buf *buf, void *subbuf, - void *prev_subbuf, size_t prev_padding) -{ - struct kvm_trace *kt; - - if (!relay_buf_full(buf)) { - if (!prev_subbuf) { - /* - * executed only once when the channel is opened - * save metadata as first record - */ - subbuf_start_reserve(buf, sizeof(u32)); - *(u32 *)subbuf = 0x12345678; - } - - return 1; - } - - kt = buf->chan->private_data; - atomic_inc(&kt->lost_records); - - return 0; -} - -static struct dentry *kvm_create_buf_file_callack(const char *filename, - struct dentry *parent, - int mode, - struct rchan_buf *buf, - int *is_global) -{ - return debugfs_create_file(filename, mode, parent, buf, - &relay_file_operations); -} - -static int kvm_remove_buf_file_callback(struct dentry *dentry) -{ - debugfs_remove(dentry); - return 0; -} - -static struct rchan_callbacks kvm_relay_callbacks = { - .subbuf_start = kvm_subbuf_start_callback, - .create_buf_file = kvm_create_buf_file_callack, - .remove_buf_file = kvm_remove_buf_file_callback, -}; - -static int do_kvm_trace_enable(struct kvm_user_trace_setup *kuts) -{ - struct kvm_trace *kt; - int i, r = -ENOMEM; - - if (!kuts->buf_size || !kuts->buf_nr) - return -EINVAL; - - kt = kzalloc(sizeof(*kt), GFP_KERNEL); - if (!kt) - goto err; - - r = -EIO; - atomic_set(&kt->lost_records, 0); - kt->lost_file = debugfs_create_file("lost_records", 0444, kvm_debugfs_dir, - kt, &kvm_trace_lost_ops); - if (!kt->lost_file) - goto err; - - kt->rchan = relay_open("trace", kvm_debugfs_dir, kuts->buf_size, - kuts->buf_nr, &kvm_relay_callbacks, kt); - if (!kt->rchan) - goto err; - - kvm_trace = kt; - - for (i = 0; i < ARRAY_SIZE(kvm_trace_probes); i++) { - struct kvm_trace_probe *p = &kvm_trace_probes[i]; - - r = marker_probe_register(p->name, p->format, p->probe_func, p); - if (r) - printk(KERN_INFO "Unable to register probe %s\n", - p->name); - } - - kvm_trace->trace_state = KVM_TRACE_STATE_RUNNING; - - return 0; -err: - if (kt) { - if (kt->lost_file) - debugfs_remove(kt->lost_file); - if (kt->rchan) - relay_close(kt->rchan); - kfree(kt); - } - return r; -} - -static int kvm_trace_enable(char __user *arg) -{ - struct kvm_user_trace_setup kuts; - int ret; - - ret = copy_from_user(&kuts, arg, sizeof(kuts)); - if (ret) - return -EFAULT; - - ret = do_kvm_trace_enable(&kuts); - if (ret) - return ret; - - return 0; -} - -static int kvm_trace_pause(void) -{ - struct kvm_trace *kt = kvm_trace; - int r = -EINVAL; - - if (kt == NULL) - return r; - - if (kt->trace_state == KVM_TRACE_STATE_RUNNING) { - kt->trace_state = KVM_TRACE_STATE_PAUSE; - relay_flush(kt->rchan); - r = 0; - } - - return r; -} - -void kvm_trace_cleanup(void) -{ - struct kvm_trace *kt = kvm_trace; - int i; - - if (kt == NULL) - return; - - if (kt->trace_state == KVM_TRACE_STATE_RUNNING || - kt->trace_state == KVM_TRACE_STATE_PAUSE) { - - kt->trace_state = KVM_TRACE_STATE_CLEARUP; - - for (i = 0; i < ARRAY_SIZE(kvm_trace_probes); i++) { - struct kvm_trace_probe *p = &kvm_trace_probes[i]; - marker_probe_unregister(p->name, p->probe_func, p); - } - marker_synchronize_unregister(); - - relay_close(kt->rchan); - debugfs_remove(kt->lost_file); - kfree(kt); - } -} - -int kvm_trace_ioctl(unsigned int ioctl, unsigned long arg) -{ - void __user *argp = (void __user *)arg; - long r = -EINVAL; - - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; - - switch (ioctl) { - case KVM_TRACE_ENABLE: - r = kvm_trace_enable(argp); - break; - case KVM_TRACE_PAUSE: - r = kvm_trace_pause(); - break; - case KVM_TRACE_DISABLE: - r = 0; - kvm_trace_cleanup(); - break; - } - - return r; -} Index: kvm/arch/x86/kvm/Makefile =================================================================== --- kvm.orig/arch/x86/kvm/Makefile +++ kvm/arch/x86/kvm/Makefile @@ -7,7 +7,6 @@ CFLAGS_vmx.o := -I. kvm-y += $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \ coalesced_mmio.o irq_comm.o eventfd.o) -kvm-$(CONFIG_KVM_TRACE) += $(addprefix ../../../virt/kvm/, kvm_trace.o) kvm-$(CONFIG_IOMMU_API) += $(addprefix ../../../virt/kvm/, iommu.o) kvm-y += x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o \ Index: kvm/include/linux/kvm.h =================================================================== --- kvm.orig/include/linux/kvm.h +++ kvm/include/linux/kvm.h @@ -14,7 +14,7 @@ #define KVM_API_VERSION 12 -/* for KVM_TRACE_ENABLE */ +/* for KVM_TRACE_ENABLE, deprecated */ struct kvm_user_trace_setup { __u32 buf_size; /* sub_buffer size of each per-cpu */ __u32 buf_nr; /* the number of sub_buffers of each per-cpu */ @@ -325,35 +325,6 @@ struct kvm_guest_debug { #define KVM_TRC_CYCLE_SIZE 8 #define KVM_TRC_EXTRA_MAX 7 -/* This structure represents a single trace buffer record. */ -struct kvm_trace_rec { - /* variable rec_val - * is split into: - * bits 0 - 27 -> event id - * bits 28 -30 -> number of extra data args of size u32 - * bits 31 -> binary indicator for if tsc is in record - */ - __u32 rec_val; - __u32 pid; - __u32 vcpu_id; - union { - struct { - __u64 timestamp; - __u32 extra_u32[KVM_TRC_EXTRA_MAX]; - } __attribute__((packed)) timestamp; - struct { - __u32 extra_u32[KVM_TRC_EXTRA_MAX]; - } notimestamp; - } u; -}; - -#define TRACE_REC_EVENT_ID(val) \ - (0x0fffffff & (val)) -#define TRACE_REC_NUM_DATA_ARGS(val) \ - (0x70000000 & ((val) << 28)) -#define TRACE_REC_TCS(val) \ - (0x80000000 & ((val) << 31)) - #define KVMIO 0xAE /* Index: kvm/arch/x86/kvm/Kconfig =================================================================== --- kvm.orig/arch/x86/kvm/Kconfig +++ kvm/arch/x86/kvm/Kconfig @@ -62,18 +62,6 @@ config KVM_AMD To compile this as a module, choose M here: the module will be called kvm-amd. -config KVM_TRACE - bool "KVM trace support" - depends on KVM && SYSFS - select MARKERS - select RELAY - select DEBUG_FS - default n - ---help--- - This option allows reading a trace of kvm-related events through - relayfs. Note the ABI is not considered stable and will be - modified in future updates. - # OK, it's a little counter-intuitive to do this, but it puts it neatly under # the virtualization menu. source drivers/lguest/Kconfig Index: kvm/arch/ia64/kvm/Kconfig =================================================================== --- kvm.orig/arch/ia64/kvm/Kconfig +++ kvm/arch/ia64/kvm/Kconfig @@ -47,9 +47,6 @@ config KVM_INTEL Provides support for KVM on Itanium 2 processors equipped with the VT extensions. -config KVM_TRACE - bool - source drivers/virtio/Kconfig endif # VIRTUALIZATION Index: kvm/arch/powerpc/kvm/Kconfig =================================================================== --- kvm.orig/arch/powerpc/kvm/Kconfig +++ kvm/arch/powerpc/kvm/Kconfig @@ -58,17 +58,6 @@ config KVM_E500 If unsure, say N. -config KVM_TRACE - bool "KVM trace support" - depends on KVM && MARKERS && SYSFS - select RELAY - select DEBUG_FS - default n - ---help--- - This option allows reading a trace of kvm-related events through - relayfs. Note the ABI is not considered stable and will be - modified in future updates. - source drivers/virtio/Kconfig endif # VIRTUALIZATION Index: kvm/arch/powerpc/kvm/Makefile =================================================================== --- kvm.orig/arch/powerpc/kvm/Makefile +++ kvm/arch/powerpc/kvm/Makefile @@ -6,8 +6,6 @@ EXTRA_CFLAGS += -Ivirt/kvm -Iarch/powerp common-objs-y = $(addprefix ../../../virt/kvm/, kvm_main.o coalesced_mmio.o) -common-objs-$(CONFIG_KVM_TRACE) += $(addprefix ../../../virt/kvm/, kvm_trace.o) - CFLAGS_44x_tlb.o := -I. CFLAGS_e500_tlb.o := -I. CFLAGS_emulate.o := -I. Index: kvm/arch/s390/kvm/Kconfig =================================================================== --- kvm.orig/arch/s390/kvm/Kconfig +++ kvm/arch/s390/kvm/Kconfig @@ -34,9 +34,6 @@ config KVM If unsure, say N. -config KVM_TRACE - bool - # OK, it's a little counter-intuitive to do this, but it puts it neatly under # the virtualization menu. source drivers/virtio/Kconfig -- ^ permalink raw reply [flat|nested] 21+ messages in thread
* [patch 3/3] kvm-kmod: dummy event trace hooks 2009-06-18 14:47 ` [patch 0/3] " Marcelo Tosatti 2009-06-18 14:47 ` [patch 1/3] KVM: PPC: convert marker probes to event trace Marcelo Tosatti 2009-06-18 14:47 ` [patch 2/3] KVM: remove old KVMTRACE support code Marcelo Tosatti @ 2009-06-18 14:47 ` Marcelo Tosatti 2009-06-28 15:57 ` [patch 0/3] remove old KVMTRACE support code Avi Kivity 3 siblings, 0 replies; 21+ messages in thread From: Marcelo Tosatti @ 2009-06-18 14:47 UTC (permalink / raw) To: avi; +Cc: kvm, Marcelo Tosatti [-- Attachment #1: compat-trace-event --] [-- Type: text/plain, Size: 1975 bytes --] And don't stop if kvm_trace.c is gone. Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Index: kvm-kmod/external-module-compat-comm.h =================================================================== --- kvm-kmod.orig/external-module-compat-comm.h +++ kvm-kmod/external-module-compat-comm.h @@ -762,6 +762,18 @@ static inline bool zalloc_cpumask_var(cp #endif +/* event traces added in 2.6.31 */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) + +#define TP_PROTO(args...) args + +#define TRACE_EVENT(name, proto, args, entry, fa, printk) \ + static inline void trace_##name(proto) { } + +static inline void tracepoint_synchronize_unregister(void) { } + +#endif + /* Macro introduced only on newer kernels: */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) Index: kvm-kmod/sync =================================================================== --- kvm-kmod.orig/sync +++ kvm-kmod/sync @@ -171,6 +171,10 @@ def header_sync(arch): % { 'T': T, 'name': os.path.basename(file) }) cp(file, out) unifdef(out) + for file in glob('%(linux)s/include/trace/events/kvm.h' % { 'linux': linux }): + out = ('%(T)s/include/trace/events/%(name)s' + % { 'T': T, 'name': os.path.basename(file) }) + cp(file, out) arch_headers = ( [x for dir in ['%(linux)s/arch/%(arch)s/include/asm/./kvm*.h', @@ -207,7 +211,13 @@ def source_sync(arch): unifdef(i) for i in hack_files[arch]: - hack(T, arch, i) + try: + os.stat(T + "/" + i ) + except OSError: + if i != "kvm_trace.c": + raise + else: + hack(T, arch, i) copy_if_changed(T, arch) rmtree(T) Index: kvm-kmod/include-compat/trace/define_trace.h =================================================================== --- /dev/null +++ kvm-kmod/include-compat/trace/define_trace.h @@ -0,0 +1 @@ +/* Dummy file */ -- ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [patch 0/3] remove old KVMTRACE support code 2009-06-18 14:47 ` [patch 0/3] " Marcelo Tosatti ` (2 preceding siblings ...) 2009-06-18 14:47 ` [patch 3/3] kvm-kmod: dummy event trace hooks Marcelo Tosatti @ 2009-06-28 15:57 ` Avi Kivity 3 siblings, 0 replies; 21+ messages in thread From: Avi Kivity @ 2009-06-28 15:57 UTC (permalink / raw) To: Marcelo Tosatti; +Cc: kvm, Hollis Blanchard On 06/18/2009 05:47 PM, Marcelo Tosatti wrote: Applied 1 and 2. I folded trace-arch.h into trace.h because trace-arch.h gave me grief on x86. Patch 3 likely will not apply since there were many changes in that area; I'll hack it enough so it builds. We could probably remove arch/powerpc/kvm/timing.h. I'd also like to kill kvm_stat (and implement it on top of markers), but I'd like some hack so it can work on older kernels. -- error compiling committee.c: too many arguments to function ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [patch 0/2] replace kvmtrace with event traces rebased 2009-06-17 12:22 ` [patch 0/2] replace kvmtrace with event traces rebased Marcelo Tosatti 2009-06-17 12:22 ` [patch 1/2] KVM: convert custom marker based tracing to event traces Marcelo Tosatti 2009-06-17 12:22 ` [patch 2/2] KVM: remove old KVMTRACE support code Marcelo Tosatti @ 2009-06-17 12:35 ` Avi Kivity 2 siblings, 0 replies; 21+ messages in thread From: Avi Kivity @ 2009-06-17 12:35 UTC (permalink / raw) To: Marcelo Tosatti; +Cc: kvm On 06/17/2009 03:22 PM, Marcelo Tosatti wrote: Applied, thanks. -- Do not meddle in the internals of kernels, for they are subtle and quick to panic. ^ permalink raw reply [flat|nested] 21+ messages in thread
* [patch 2/2] KVM: remove old KVMTRACE support code 2009-06-16 22:13 ` [patch 0/2] replace kvmtrace with event traces v2 Marcelo Tosatti 2009-06-16 22:13 ` [patch 1/2] KVM: convert custom marker based tracing to event traces Marcelo Tosatti @ 2009-06-16 22:13 ` Marcelo Tosatti 2009-06-17 11:53 ` Avi Kivity 1 sibling, 1 reply; 21+ messages in thread From: Marcelo Tosatti @ 2009-06-16 22:13 UTC (permalink / raw) To: kvm; +Cc: rostedt, Marcelo Tosatti [-- Attachment #1: remove-old-kvmtrace --] [-- Type: text/plain, Size: 11822 bytes --] Return EOPNOTSUPP for KVM_TRACE_ENABLE/PAUSE/DISABLE ioctls. Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Index: kvm/virt/kvm/kvm_main.c =================================================================== --- kvm.orig/virt/kvm/kvm_main.c +++ kvm/virt/kvm/kvm_main.c @@ -2367,7 +2367,7 @@ static long kvm_dev_ioctl(struct file *f case KVM_TRACE_ENABLE: case KVM_TRACE_PAUSE: case KVM_TRACE_DISABLE: - r = kvm_trace_ioctl(ioctl, arg); + r = -EOPNOTSUPP; break; default: return kvm_arch_dev_ioctl(filp, ioctl, arg); @@ -2717,7 +2717,6 @@ EXPORT_SYMBOL_GPL(kvm_init); void kvm_exit(void) { - kvm_trace_cleanup(); tracepoint_synchronize_unregister(); misc_deregister(&kvm_dev); kmem_cache_destroy(kvm_vcpu_cache); Index: kvm/include/linux/kvm_host.h =================================================================== --- kvm.orig/include/linux/kvm_host.h +++ kvm/include/linux/kvm_host.h @@ -482,37 +482,6 @@ struct kvm_stats_debugfs_item { extern struct kvm_stats_debugfs_item debugfs_entries[]; extern struct dentry *kvm_debugfs_dir; -#define KVMTRACE_5D(evt, vcpu, d1, d2, d3, d4, d5, name) \ - trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \ - vcpu, 5, d1, d2, d3, d4, d5) -#define KVMTRACE_4D(evt, vcpu, d1, d2, d3, d4, name) \ - trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \ - vcpu, 4, d1, d2, d3, d4, 0) -#define KVMTRACE_3D(evt, vcpu, d1, d2, d3, name) \ - trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \ - vcpu, 3, d1, d2, d3, 0, 0) -#define KVMTRACE_2D(evt, vcpu, d1, d2, name) \ - trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \ - vcpu, 2, d1, d2, 0, 0, 0) -#define KVMTRACE_1D(evt, vcpu, d1, name) \ - trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \ - vcpu, 1, d1, 0, 0, 0, 0) -#define KVMTRACE_0D(evt, vcpu, name) \ - trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \ - vcpu, 0, 0, 0, 0, 0, 0) - -#ifdef CONFIG_KVM_TRACE -int kvm_trace_ioctl(unsigned int ioctl, unsigned long arg); -void kvm_trace_cleanup(void); -#else -static inline -int kvm_trace_ioctl(unsigned int ioctl, unsigned long arg) -{ - return -EINVAL; -} -#define kvm_trace_cleanup() ((void)0) -#endif - #ifdef KVM_ARCH_WANT_MMU_NOTIFIER static inline int mmu_notifier_retry(struct kvm_vcpu *vcpu, unsigned long mmu_seq) { Index: kvm/virt/kvm/kvm_trace.c =================================================================== --- kvm.orig/virt/kvm/kvm_trace.c +++ /dev/null @@ -1,285 +0,0 @@ -/* - * kvm trace - * - * It is designed to allow debugging traces of kvm to be generated - * on UP / SMP machines. Each trace entry can be timestamped so that - * it's possible to reconstruct a chronological record of trace events. - * The implementation refers to blktrace kernel support. - * - * Copyright (c) 2008 Intel Corporation - * Copyright (C) 2006 Jens Axboe <axboe@kernel.dk> - * - * Authors: Feng(Eric) Liu, eric.e.liu@intel.com - * - * Date: Feb 2008 - */ - -#include <linux/module.h> -#include <linux/relay.h> -#include <linux/debugfs.h> -#include <linux/ktime.h> - -#include <linux/kvm_host.h> - -#define KVM_TRACE_STATE_RUNNING (1 << 0) -#define KVM_TRACE_STATE_PAUSE (1 << 1) -#define KVM_TRACE_STATE_CLEARUP (1 << 2) - -struct kvm_trace { - int trace_state; - struct rchan *rchan; - struct dentry *lost_file; - atomic_t lost_records; -}; -static struct kvm_trace *kvm_trace; - -struct kvm_trace_probe { - const char *name; - const char *format; - u32 timestamp_in; - marker_probe_func *probe_func; -}; - -static inline int calc_rec_size(int timestamp, int extra) -{ - int rec_size = KVM_TRC_HEAD_SIZE; - - rec_size += extra; - return timestamp ? rec_size += KVM_TRC_CYCLE_SIZE : rec_size; -} - -static void kvm_add_trace(void *probe_private, void *call_data, - const char *format, va_list *args) -{ - struct kvm_trace_probe *p = probe_private; - struct kvm_trace *kt = kvm_trace; - struct kvm_trace_rec rec; - struct kvm_vcpu *vcpu; - int i, size; - u32 extra; - - if (unlikely(kt->trace_state != KVM_TRACE_STATE_RUNNING)) - return; - - rec.rec_val = TRACE_REC_EVENT_ID(va_arg(*args, u32)); - vcpu = va_arg(*args, struct kvm_vcpu *); - rec.pid = current->tgid; - rec.vcpu_id = vcpu->vcpu_id; - - extra = va_arg(*args, u32); - WARN_ON(!(extra <= KVM_TRC_EXTRA_MAX)); - extra = min_t(u32, extra, KVM_TRC_EXTRA_MAX); - - rec.rec_val |= TRACE_REC_TCS(p->timestamp_in) - | TRACE_REC_NUM_DATA_ARGS(extra); - - if (p->timestamp_in) { - rec.u.timestamp.timestamp = ktime_to_ns(ktime_get()); - - for (i = 0; i < extra; i++) - rec.u.timestamp.extra_u32[i] = va_arg(*args, u32); - } else { - for (i = 0; i < extra; i++) - rec.u.notimestamp.extra_u32[i] = va_arg(*args, u32); - } - - size = calc_rec_size(p->timestamp_in, extra * sizeof(u32)); - relay_write(kt->rchan, &rec, size); -} - -static struct kvm_trace_probe kvm_trace_probes[] = { - { "kvm_trace_entryexit", "%u %p %u %u %u %u %u %u", 1, kvm_add_trace }, - { "kvm_trace_handler", "%u %p %u %u %u %u %u %u", 0, kvm_add_trace }, -}; - -static int lost_records_get(void *data, u64 *val) -{ - struct kvm_trace *kt = data; - - *val = atomic_read(&kt->lost_records); - return 0; -} - -DEFINE_SIMPLE_ATTRIBUTE(kvm_trace_lost_ops, lost_records_get, NULL, "%llu\n"); - -/* - * The relay channel is used in "no-overwrite" mode, it keeps trace of how - * many times we encountered a full subbuffer, to tell user space app the - * lost records there were. - */ -static int kvm_subbuf_start_callback(struct rchan_buf *buf, void *subbuf, - void *prev_subbuf, size_t prev_padding) -{ - struct kvm_trace *kt; - - if (!relay_buf_full(buf)) { - if (!prev_subbuf) { - /* - * executed only once when the channel is opened - * save metadata as first record - */ - subbuf_start_reserve(buf, sizeof(u32)); - *(u32 *)subbuf = 0x12345678; - } - - return 1; - } - - kt = buf->chan->private_data; - atomic_inc(&kt->lost_records); - - return 0; -} - -static struct dentry *kvm_create_buf_file_callack(const char *filename, - struct dentry *parent, - int mode, - struct rchan_buf *buf, - int *is_global) -{ - return debugfs_create_file(filename, mode, parent, buf, - &relay_file_operations); -} - -static int kvm_remove_buf_file_callback(struct dentry *dentry) -{ - debugfs_remove(dentry); - return 0; -} - -static struct rchan_callbacks kvm_relay_callbacks = { - .subbuf_start = kvm_subbuf_start_callback, - .create_buf_file = kvm_create_buf_file_callack, - .remove_buf_file = kvm_remove_buf_file_callback, -}; - -static int do_kvm_trace_enable(struct kvm_user_trace_setup *kuts) -{ - struct kvm_trace *kt; - int i, r = -ENOMEM; - - if (!kuts->buf_size || !kuts->buf_nr) - return -EINVAL; - - kt = kzalloc(sizeof(*kt), GFP_KERNEL); - if (!kt) - goto err; - - r = -EIO; - atomic_set(&kt->lost_records, 0); - kt->lost_file = debugfs_create_file("lost_records", 0444, kvm_debugfs_dir, - kt, &kvm_trace_lost_ops); - if (!kt->lost_file) - goto err; - - kt->rchan = relay_open("trace", kvm_debugfs_dir, kuts->buf_size, - kuts->buf_nr, &kvm_relay_callbacks, kt); - if (!kt->rchan) - goto err; - - kvm_trace = kt; - - for (i = 0; i < ARRAY_SIZE(kvm_trace_probes); i++) { - struct kvm_trace_probe *p = &kvm_trace_probes[i]; - - r = marker_probe_register(p->name, p->format, p->probe_func, p); - if (r) - printk(KERN_INFO "Unable to register probe %s\n", - p->name); - } - - kvm_trace->trace_state = KVM_TRACE_STATE_RUNNING; - - return 0; -err: - if (kt) { - if (kt->lost_file) - debugfs_remove(kt->lost_file); - if (kt->rchan) - relay_close(kt->rchan); - kfree(kt); - } - return r; -} - -static int kvm_trace_enable(char __user *arg) -{ - struct kvm_user_trace_setup kuts; - int ret; - - ret = copy_from_user(&kuts, arg, sizeof(kuts)); - if (ret) - return -EFAULT; - - ret = do_kvm_trace_enable(&kuts); - if (ret) - return ret; - - return 0; -} - -static int kvm_trace_pause(void) -{ - struct kvm_trace *kt = kvm_trace; - int r = -EINVAL; - - if (kt == NULL) - return r; - - if (kt->trace_state == KVM_TRACE_STATE_RUNNING) { - kt->trace_state = KVM_TRACE_STATE_PAUSE; - relay_flush(kt->rchan); - r = 0; - } - - return r; -} - -void kvm_trace_cleanup(void) -{ - struct kvm_trace *kt = kvm_trace; - int i; - - if (kt == NULL) - return; - - if (kt->trace_state == KVM_TRACE_STATE_RUNNING || - kt->trace_state == KVM_TRACE_STATE_PAUSE) { - - kt->trace_state = KVM_TRACE_STATE_CLEARUP; - - for (i = 0; i < ARRAY_SIZE(kvm_trace_probes); i++) { - struct kvm_trace_probe *p = &kvm_trace_probes[i]; - marker_probe_unregister(p->name, p->probe_func, p); - } - marker_synchronize_unregister(); - - relay_close(kt->rchan); - debugfs_remove(kt->lost_file); - kfree(kt); - } -} - -int kvm_trace_ioctl(unsigned int ioctl, unsigned long arg) -{ - void __user *argp = (void __user *)arg; - long r = -EINVAL; - - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; - - switch (ioctl) { - case KVM_TRACE_ENABLE: - r = kvm_trace_enable(argp); - break; - case KVM_TRACE_PAUSE: - r = kvm_trace_pause(); - break; - case KVM_TRACE_DISABLE: - r = 0; - kvm_trace_cleanup(); - break; - } - - return r; -} Index: kvm/arch/x86/kvm/Makefile =================================================================== --- kvm.orig/arch/x86/kvm/Makefile +++ kvm/arch/x86/kvm/Makefile @@ -7,7 +7,6 @@ CFLAGS_vmx.o := -I. kvm-y += $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \ coalesced_mmio.o irq_comm.o eventfd.o) -kvm-$(CONFIG_KVM_TRACE) += $(addprefix ../../../virt/kvm/, kvm_trace.o) kvm-$(CONFIG_IOMMU_API) += $(addprefix ../../../virt/kvm/, iommu.o) kvm-y += x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o \ Index: kvm/include/linux/kvm.h =================================================================== --- kvm.orig/include/linux/kvm.h +++ kvm/include/linux/kvm.h @@ -14,7 +14,7 @@ #define KVM_API_VERSION 12 -/* for KVM_TRACE_ENABLE */ +/* for KVM_TRACE_ENABLE, deprecated */ struct kvm_user_trace_setup { __u32 buf_size; /* sub_buffer size of each per-cpu */ __u32 buf_nr; /* the number of sub_buffers of each per-cpu */ @@ -325,35 +325,6 @@ struct kvm_guest_debug { #define KVM_TRC_CYCLE_SIZE 8 #define KVM_TRC_EXTRA_MAX 7 -/* This structure represents a single trace buffer record. */ -struct kvm_trace_rec { - /* variable rec_val - * is split into: - * bits 0 - 27 -> event id - * bits 28 -30 -> number of extra data args of size u32 - * bits 31 -> binary indicator for if tsc is in record - */ - __u32 rec_val; - __u32 pid; - __u32 vcpu_id; - union { - struct { - __u64 timestamp; - __u32 extra_u32[KVM_TRC_EXTRA_MAX]; - } __attribute__((packed)) timestamp; - struct { - __u32 extra_u32[KVM_TRC_EXTRA_MAX]; - } notimestamp; - } u; -}; - -#define TRACE_REC_EVENT_ID(val) \ - (0x0fffffff & (val)) -#define TRACE_REC_NUM_DATA_ARGS(val) \ - (0x70000000 & ((val) << 28)) -#define TRACE_REC_TCS(val) \ - (0x80000000 & ((val) << 31)) - #define KVMIO 0xAE /* Index: kvm/arch/x86/kvm/Kconfig =================================================================== --- kvm.orig/arch/x86/kvm/Kconfig +++ kvm/arch/x86/kvm/Kconfig @@ -62,18 +62,6 @@ config KVM_AMD To compile this as a module, choose M here: the module will be called kvm-amd. -config KVM_TRACE - bool "KVM trace support" - depends on KVM && SYSFS - select MARKERS - select RELAY - select DEBUG_FS - default n - ---help--- - This option allows reading a trace of kvm-related events through - relayfs. Note the ABI is not considered stable and will be - modified in future updates. - # OK, it's a little counter-intuitive to do this, but it puts it neatly under # the virtualization menu. source drivers/lguest/Kconfig -- ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [patch 2/2] KVM: remove old KVMTRACE support code 2009-06-16 22:13 ` [patch 2/2] KVM: remove old KVMTRACE support code Marcelo Tosatti @ 2009-06-17 11:53 ` Avi Kivity 0 siblings, 0 replies; 21+ messages in thread From: Avi Kivity @ 2009-06-17 11:53 UTC (permalink / raw) To: Marcelo Tosatti; +Cc: kvm, rostedt On 06/17/2009 01:13 AM, Marcelo Tosatti wrote: > Return EOPNOTSUPP for KVM_TRACE_ENABLE/PAUSE/DISABLE ioctls. > > The first feature we remove, we don't have a KVM_CAP for. -- Do not meddle in the internals of kernels, for they are subtle and quick to panic. ^ permalink raw reply [flat|nested] 21+ messages in thread
* [patch 2/2] KVM: remove old KVMTRACE support code 2009-06-15 18:31 [patch 0/2] replace kvmtrace with event traces Marcelo Tosatti 2009-06-15 18:31 ` [patch 1/2] KVM: convert custom marker based tracing to " Marcelo Tosatti @ 2009-06-15 18:31 ` Marcelo Tosatti 1 sibling, 0 replies; 21+ messages in thread From: Marcelo Tosatti @ 2009-06-15 18:31 UTC (permalink / raw) To: kvm; +Cc: rostedt, Marcelo Tosatti [-- Attachment #1: remove-old-kvmtrace --] [-- Type: text/plain, Size: 11843 bytes --] Return EOPNOTSUPP for KVM_TRACE_ENABLE/PAUSE/DISABLE ioctls. Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Index: kvm/virt/kvm/kvm_main.c =================================================================== --- kvm.orig/virt/kvm/kvm_main.c +++ kvm/virt/kvm/kvm_main.c @@ -2367,7 +2367,7 @@ static long kvm_dev_ioctl(struct file *f case KVM_TRACE_ENABLE: case KVM_TRACE_PAUSE: case KVM_TRACE_DISABLE: - r = kvm_trace_ioctl(ioctl, arg); + r = -EOPNOTSUPP; break; default: return kvm_arch_dev_ioctl(filp, ioctl, arg); @@ -2717,7 +2717,6 @@ EXPORT_SYMBOL_GPL(kvm_init); void kvm_exit(void) { - kvm_trace_cleanup(); tracepoint_synchronize_unregister(); misc_deregister(&kvm_dev); kmem_cache_destroy(kvm_vcpu_cache); Index: kvm/include/linux/kvm_host.h =================================================================== --- kvm.orig/include/linux/kvm_host.h +++ kvm/include/linux/kvm_host.h @@ -482,37 +482,6 @@ struct kvm_stats_debugfs_item { extern struct kvm_stats_debugfs_item debugfs_entries[]; extern struct dentry *kvm_debugfs_dir; -#define KVMTRACE_5D(evt, vcpu, d1, d2, d3, d4, d5, name) \ - trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \ - vcpu, 5, d1, d2, d3, d4, d5) -#define KVMTRACE_4D(evt, vcpu, d1, d2, d3, d4, name) \ - trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \ - vcpu, 4, d1, d2, d3, d4, 0) -#define KVMTRACE_3D(evt, vcpu, d1, d2, d3, name) \ - trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \ - vcpu, 3, d1, d2, d3, 0, 0) -#define KVMTRACE_2D(evt, vcpu, d1, d2, name) \ - trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \ - vcpu, 2, d1, d2, 0, 0, 0) -#define KVMTRACE_1D(evt, vcpu, d1, name) \ - trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \ - vcpu, 1, d1, 0, 0, 0, 0) -#define KVMTRACE_0D(evt, vcpu, name) \ - trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \ - vcpu, 0, 0, 0, 0, 0, 0) - -#ifdef CONFIG_KVM_TRACE -int kvm_trace_ioctl(unsigned int ioctl, unsigned long arg); -void kvm_trace_cleanup(void); -#else -static inline -int kvm_trace_ioctl(unsigned int ioctl, unsigned long arg) -{ - return -EINVAL; -} -#define kvm_trace_cleanup() ((void)0) -#endif - #ifdef KVM_ARCH_WANT_MMU_NOTIFIER static inline int mmu_notifier_retry(struct kvm_vcpu *vcpu, unsigned long mmu_seq) { Index: kvm/virt/kvm/kvm_trace.c =================================================================== --- kvm.orig/virt/kvm/kvm_trace.c +++ /dev/null @@ -1,285 +0,0 @@ -/* - * kvm trace - * - * It is designed to allow debugging traces of kvm to be generated - * on UP / SMP machines. Each trace entry can be timestamped so that - * it's possible to reconstruct a chronological record of trace events. - * The implementation refers to blktrace kernel support. - * - * Copyright (c) 2008 Intel Corporation - * Copyright (C) 2006 Jens Axboe <axboe@kernel.dk> - * - * Authors: Feng(Eric) Liu, eric.e.liu@intel.com - * - * Date: Feb 2008 - */ - -#include <linux/module.h> -#include <linux/relay.h> -#include <linux/debugfs.h> -#include <linux/ktime.h> - -#include <linux/kvm_host.h> - -#define KVM_TRACE_STATE_RUNNING (1 << 0) -#define KVM_TRACE_STATE_PAUSE (1 << 1) -#define KVM_TRACE_STATE_CLEARUP (1 << 2) - -struct kvm_trace { - int trace_state; - struct rchan *rchan; - struct dentry *lost_file; - atomic_t lost_records; -}; -static struct kvm_trace *kvm_trace; - -struct kvm_trace_probe { - const char *name; - const char *format; - u32 timestamp_in; - marker_probe_func *probe_func; -}; - -static inline int calc_rec_size(int timestamp, int extra) -{ - int rec_size = KVM_TRC_HEAD_SIZE; - - rec_size += extra; - return timestamp ? rec_size += KVM_TRC_CYCLE_SIZE : rec_size; -} - -static void kvm_add_trace(void *probe_private, void *call_data, - const char *format, va_list *args) -{ - struct kvm_trace_probe *p = probe_private; - struct kvm_trace *kt = kvm_trace; - struct kvm_trace_rec rec; - struct kvm_vcpu *vcpu; - int i, size; - u32 extra; - - if (unlikely(kt->trace_state != KVM_TRACE_STATE_RUNNING)) - return; - - rec.rec_val = TRACE_REC_EVENT_ID(va_arg(*args, u32)); - vcpu = va_arg(*args, struct kvm_vcpu *); - rec.pid = current->tgid; - rec.vcpu_id = vcpu->vcpu_id; - - extra = va_arg(*args, u32); - WARN_ON(!(extra <= KVM_TRC_EXTRA_MAX)); - extra = min_t(u32, extra, KVM_TRC_EXTRA_MAX); - - rec.rec_val |= TRACE_REC_TCS(p->timestamp_in) - | TRACE_REC_NUM_DATA_ARGS(extra); - - if (p->timestamp_in) { - rec.u.timestamp.timestamp = ktime_to_ns(ktime_get()); - - for (i = 0; i < extra; i++) - rec.u.timestamp.extra_u32[i] = va_arg(*args, u32); - } else { - for (i = 0; i < extra; i++) - rec.u.notimestamp.extra_u32[i] = va_arg(*args, u32); - } - - size = calc_rec_size(p->timestamp_in, extra * sizeof(u32)); - relay_write(kt->rchan, &rec, size); -} - -static struct kvm_trace_probe kvm_trace_probes[] = { - { "kvm_trace_entryexit", "%u %p %u %u %u %u %u %u", 1, kvm_add_trace }, - { "kvm_trace_handler", "%u %p %u %u %u %u %u %u", 0, kvm_add_trace }, -}; - -static int lost_records_get(void *data, u64 *val) -{ - struct kvm_trace *kt = data; - - *val = atomic_read(&kt->lost_records); - return 0; -} - -DEFINE_SIMPLE_ATTRIBUTE(kvm_trace_lost_ops, lost_records_get, NULL, "%llu\n"); - -/* - * The relay channel is used in "no-overwrite" mode, it keeps trace of how - * many times we encountered a full subbuffer, to tell user space app the - * lost records there were. - */ -static int kvm_subbuf_start_callback(struct rchan_buf *buf, void *subbuf, - void *prev_subbuf, size_t prev_padding) -{ - struct kvm_trace *kt; - - if (!relay_buf_full(buf)) { - if (!prev_subbuf) { - /* - * executed only once when the channel is opened - * save metadata as first record - */ - subbuf_start_reserve(buf, sizeof(u32)); - *(u32 *)subbuf = 0x12345678; - } - - return 1; - } - - kt = buf->chan->private_data; - atomic_inc(&kt->lost_records); - - return 0; -} - -static struct dentry *kvm_create_buf_file_callack(const char *filename, - struct dentry *parent, - int mode, - struct rchan_buf *buf, - int *is_global) -{ - return debugfs_create_file(filename, mode, parent, buf, - &relay_file_operations); -} - -static int kvm_remove_buf_file_callback(struct dentry *dentry) -{ - debugfs_remove(dentry); - return 0; -} - -static struct rchan_callbacks kvm_relay_callbacks = { - .subbuf_start = kvm_subbuf_start_callback, - .create_buf_file = kvm_create_buf_file_callack, - .remove_buf_file = kvm_remove_buf_file_callback, -}; - -static int do_kvm_trace_enable(struct kvm_user_trace_setup *kuts) -{ - struct kvm_trace *kt; - int i, r = -ENOMEM; - - if (!kuts->buf_size || !kuts->buf_nr) - return -EINVAL; - - kt = kzalloc(sizeof(*kt), GFP_KERNEL); - if (!kt) - goto err; - - r = -EIO; - atomic_set(&kt->lost_records, 0); - kt->lost_file = debugfs_create_file("lost_records", 0444, kvm_debugfs_dir, - kt, &kvm_trace_lost_ops); - if (!kt->lost_file) - goto err; - - kt->rchan = relay_open("trace", kvm_debugfs_dir, kuts->buf_size, - kuts->buf_nr, &kvm_relay_callbacks, kt); - if (!kt->rchan) - goto err; - - kvm_trace = kt; - - for (i = 0; i < ARRAY_SIZE(kvm_trace_probes); i++) { - struct kvm_trace_probe *p = &kvm_trace_probes[i]; - - r = marker_probe_register(p->name, p->format, p->probe_func, p); - if (r) - printk(KERN_INFO "Unable to register probe %s\n", - p->name); - } - - kvm_trace->trace_state = KVM_TRACE_STATE_RUNNING; - - return 0; -err: - if (kt) { - if (kt->lost_file) - debugfs_remove(kt->lost_file); - if (kt->rchan) - relay_close(kt->rchan); - kfree(kt); - } - return r; -} - -static int kvm_trace_enable(char __user *arg) -{ - struct kvm_user_trace_setup kuts; - int ret; - - ret = copy_from_user(&kuts, arg, sizeof(kuts)); - if (ret) - return -EFAULT; - - ret = do_kvm_trace_enable(&kuts); - if (ret) - return ret; - - return 0; -} - -static int kvm_trace_pause(void) -{ - struct kvm_trace *kt = kvm_trace; - int r = -EINVAL; - - if (kt == NULL) - return r; - - if (kt->trace_state == KVM_TRACE_STATE_RUNNING) { - kt->trace_state = KVM_TRACE_STATE_PAUSE; - relay_flush(kt->rchan); - r = 0; - } - - return r; -} - -void kvm_trace_cleanup(void) -{ - struct kvm_trace *kt = kvm_trace; - int i; - - if (kt == NULL) - return; - - if (kt->trace_state == KVM_TRACE_STATE_RUNNING || - kt->trace_state == KVM_TRACE_STATE_PAUSE) { - - kt->trace_state = KVM_TRACE_STATE_CLEARUP; - - for (i = 0; i < ARRAY_SIZE(kvm_trace_probes); i++) { - struct kvm_trace_probe *p = &kvm_trace_probes[i]; - marker_probe_unregister(p->name, p->probe_func, p); - } - marker_synchronize_unregister(); - - relay_close(kt->rchan); - debugfs_remove(kt->lost_file); - kfree(kt); - } -} - -int kvm_trace_ioctl(unsigned int ioctl, unsigned long arg) -{ - void __user *argp = (void __user *)arg; - long r = -EINVAL; - - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; - - switch (ioctl) { - case KVM_TRACE_ENABLE: - r = kvm_trace_enable(argp); - break; - case KVM_TRACE_PAUSE: - r = kvm_trace_pause(); - break; - case KVM_TRACE_DISABLE: - r = 0; - kvm_trace_cleanup(); - break; - } - - return r; -} Index: kvm/arch/x86/kvm/Makefile =================================================================== --- kvm.orig/arch/x86/kvm/Makefile +++ kvm/arch/x86/kvm/Makefile @@ -3,7 +3,6 @@ EXTRA_CFLAGS += -Ivirt/kvm -Iarch/x86/kv kvm-y += $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \ coalesced_mmio.o irq_comm.o eventfd.o) -kvm-$(CONFIG_KVM_TRACE) += $(addprefix ../../../virt/kvm/, kvm_trace.o) kvm-$(CONFIG_IOMMU_API) += $(addprefix ../../../virt/kvm/, iommu.o) kvm-y += x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o \ Index: kvm/include/linux/kvm.h =================================================================== --- kvm.orig/include/linux/kvm.h +++ kvm/include/linux/kvm.h @@ -14,7 +14,7 @@ #define KVM_API_VERSION 12 -/* for KVM_TRACE_ENABLE */ +/* for KVM_TRACE_ENABLE, deprecated */ struct kvm_user_trace_setup { __u32 buf_size; /* sub_buffer size of each per-cpu */ __u32 buf_nr; /* the number of sub_buffers of each per-cpu */ @@ -325,35 +325,6 @@ struct kvm_guest_debug { #define KVM_TRC_CYCLE_SIZE 8 #define KVM_TRC_EXTRA_MAX 7 -/* This structure represents a single trace buffer record. */ -struct kvm_trace_rec { - /* variable rec_val - * is split into: - * bits 0 - 27 -> event id - * bits 28 -30 -> number of extra data args of size u32 - * bits 31 -> binary indicator for if tsc is in record - */ - __u32 rec_val; - __u32 pid; - __u32 vcpu_id; - union { - struct { - __u64 timestamp; - __u32 extra_u32[KVM_TRC_EXTRA_MAX]; - } __attribute__((packed)) timestamp; - struct { - __u32 extra_u32[KVM_TRC_EXTRA_MAX]; - } notimestamp; - } u; -}; - -#define TRACE_REC_EVENT_ID(val) \ - (0x0fffffff & (val)) -#define TRACE_REC_NUM_DATA_ARGS(val) \ - (0x70000000 & ((val) << 28)) -#define TRACE_REC_TCS(val) \ - (0x80000000 & ((val) << 31)) - #define KVMIO 0xAE /* Index: kvm/arch/x86/kvm/Kconfig =================================================================== --- kvm.orig/arch/x86/kvm/Kconfig +++ kvm/arch/x86/kvm/Kconfig @@ -62,18 +62,6 @@ config KVM_AMD To compile this as a module, choose M here: the module will be called kvm-amd. -config KVM_TRACE - bool "KVM trace support" - depends on KVM && SYSFS - select MARKERS - select RELAY - select DEBUG_FS - default n - ---help--- - This option allows reading a trace of kvm-related events through - relayfs. Note the ABI is not considered stable and will be - modified in future updates. - # OK, it's a little counter-intuitive to do this, but it puts it neatly under # the virtualization menu. source drivers/lguest/Kconfig -- ^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2009-06-28 15:55 UTC | newest] Thread overview: 21+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2009-06-15 18:31 [patch 0/2] replace kvmtrace with event traces Marcelo Tosatti 2009-06-15 18:31 ` [patch 1/2] KVM: convert custom marker based tracing to " Marcelo Tosatti 2009-06-15 20:03 ` Steven Rostedt 2009-06-16 12:44 ` Marcelo Tosatti 2009-06-16 13:40 ` Steven Rostedt 2009-06-16 22:13 ` [patch 0/2] replace kvmtrace with event traces v2 Marcelo Tosatti 2009-06-16 22:13 ` [patch 1/2] KVM: convert custom marker based tracing to event traces Marcelo Tosatti 2009-06-17 11:52 ` Avi Kivity 2009-06-17 12:22 ` [patch 0/2] replace kvmtrace with event traces rebased Marcelo Tosatti 2009-06-17 12:22 ` [patch 1/2] KVM: convert custom marker based tracing to event traces Marcelo Tosatti 2009-06-17 12:22 ` [patch 2/2] KVM: remove old KVMTRACE support code Marcelo Tosatti 2009-06-17 13:33 ` Avi Kivity 2009-06-18 14:47 ` [patch 0/3] " Marcelo Tosatti 2009-06-18 14:47 ` [patch 1/3] KVM: PPC: convert marker probes to event trace Marcelo Tosatti 2009-06-18 14:47 ` [patch 2/3] KVM: remove old KVMTRACE support code Marcelo Tosatti 2009-06-18 14:47 ` [patch 3/3] kvm-kmod: dummy event trace hooks Marcelo Tosatti 2009-06-28 15:57 ` [patch 0/3] remove old KVMTRACE support code Avi Kivity 2009-06-17 12:35 ` [patch 0/2] replace kvmtrace with event traces rebased Avi Kivity 2009-06-16 22:13 ` [patch 2/2] KVM: remove old KVMTRACE support code Marcelo Tosatti 2009-06-17 11:53 ` Avi Kivity 2009-06-15 18:31 ` Marcelo Tosatti
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox