[ltt-dev] [LTTNG PATCH] Move KVM trace includes in a standard directory
Mathieu Desnoyers
compudj at krystal.dyndns.org
Sat Sep 11 10:55:42 EDT 2010
* Julien Desfossez (julien.desfossez at polymtl.ca) wrote:
> The mmutrace.h and trace.h were defined in arch/x86/kvm/.
> Moved them in arch/x86/include and fixed the dependencies to make
> inclusion possible by lttng-modules.
merged, thanks!
>
> Signed-off-by: Julien Desfossez <julien.desfossez at polymtl.ca>
> ---
> arch/x86/include/kvm-mmutrace.h | 206 ++++++++++++
> arch/x86/include/kvm-trace.h | 700 +++++++++++++++++++++++++++++++++++++++
> arch/x86/kvm/i8259.c | 2 +-
> arch/x86/kvm/lapic.c | 2 +-
> arch/x86/kvm/mmu.c | 2 +-
> arch/x86/kvm/mmutrace.h | 206 ------------
> arch/x86/kvm/svm.c | 2 +-
> arch/x86/kvm/trace.h | 700 ---------------------------------------
> arch/x86/kvm/vmx.c | 2 +-
> arch/x86/kvm/x86.c | 2 +-
> 10 files changed, 912 insertions(+), 912 deletions(-)
> create mode 100644 arch/x86/include/kvm-mmutrace.h
> create mode 100644 arch/x86/include/kvm-trace.h
> delete mode 100644 arch/x86/kvm/mmutrace.h
> delete mode 100644 arch/x86/kvm/trace.h
>
> diff --git a/arch/x86/include/kvm-mmutrace.h b/arch/x86/include/kvm-mmutrace.h
> new file mode 100644
> index 0000000..9dda266
> --- /dev/null
> +++ b/arch/x86/include/kvm-mmutrace.h
> @@ -0,0 +1,206 @@
> +#if !defined(_TRACE_KVMMMU_H) || defined(TRACE_HEADER_MULTI_READ)
> +#define _TRACE_KVMMMU_H
> +
> +#include <linux/tracepoint.h>
> +#include <linux/ftrace_event.h>
> +
> +#undef TRACE_SYSTEM
> +#define TRACE_SYSTEM kvmmmu
> +
> +#define KVM_MMU_PAGE_FIELDS \
> + __field(__u64, gfn) \
> + __field(__u32, role) \
> + __field(__u32, root_count) \
> + __field(bool, unsync)
> +
> +#define KVM_MMU_PAGE_ASSIGN(sp) \
> + __entry->gfn = sp->gfn; \
> + __entry->role = sp->role.word; \
> + __entry->root_count = sp->root_count; \
> + __entry->unsync = sp->unsync;
> +
> +#define KVM_MMU_PAGE_PRINTK() ({ \
> + const char *ret = p->buffer + p->len; \
> + static const char *access_str[] = { \
> + "---", "--x", "w--", "w-x", "-u-", "-ux", "wu-", "wux" \
> + }; \
> + union kvm_mmu_page_role role; \
> + \
> + role.word = __entry->role; \
> + \
> + trace_seq_printf(p, "sp gfn %llx %u%s q%u%s %s%s" \
> + " %snxe root %u %s%c", \
> + __entry->gfn, role.level, \
> + role.cr4_pae ? " pae" : "", \
> + role.quadrant, \
> + role.direct ? " direct" : "", \
> + access_str[role.access], \
> + role.invalid ? " invalid" : "", \
> + role.nxe ? "" : "!", \
> + __entry->root_count, \
> + __entry->unsync ? "unsync" : "sync", 0); \
> + ret; \
> + })
> +
> +#define kvm_mmu_trace_pferr_flags \
> + { PFERR_PRESENT_MASK, "P" }, \
> + { PFERR_WRITE_MASK, "W" }, \
> + { PFERR_USER_MASK, "U" }, \
> + { PFERR_RSVD_MASK, "RSVD" }, \
> + { PFERR_FETCH_MASK, "F" }
> +
> +/*
> + * A pagetable walk has started
> + */
> +TRACE_EVENT(
> + kvm_mmu_pagetable_walk,
> + TP_PROTO(u64 addr, int write_fault, int user_fault, int fetch_fault),
> + TP_ARGS(addr, write_fault, user_fault, fetch_fault),
> +
> + TP_STRUCT__entry(
> + __field(__u64, addr)
> + __field(__u32, pferr)
> + ),
> +
> + TP_fast_assign(
> + __entry->addr = addr;
> + __entry->pferr = (!!write_fault << 1) | (!!user_fault << 2)
> + | (!!fetch_fault << 4);
> + ),
> +
> + TP_printk("addr %llx pferr %x %s", __entry->addr, __entry->pferr,
> + __print_flags(__entry->pferr, "|", kvm_mmu_trace_pferr_flags))
> +);
> +
> +
> +/* We just walked a paging element */
> +TRACE_EVENT(
> + kvm_mmu_paging_element,
> + TP_PROTO(u64 pte, int level),
> + TP_ARGS(pte, level),
> +
> + TP_STRUCT__entry(
> + __field(__u64, pte)
> + __field(__u32, level)
> + ),
> +
> + TP_fast_assign(
> + __entry->pte = pte;
> + __entry->level = level;
> + ),
> +
> + TP_printk("pte %llx level %u", __entry->pte, __entry->level)
> +);
> +
> +DECLARE_EVENT_CLASS(kvm_mmu_set_bit_class,
> +
> + TP_PROTO(unsigned long table_gfn, unsigned index, unsigned size),
> +
> + TP_ARGS(table_gfn, index, size),
> +
> + TP_STRUCT__entry(
> + __field(__u64, gpa)
> + ),
> +
> + TP_fast_assign(
> + __entry->gpa = ((u64)table_gfn << PAGE_SHIFT)
> + + index * size;
> + ),
> +
> + TP_printk("gpa %llx", __entry->gpa)
> +);
> +
> +/* We set a pte accessed bit */
> +DEFINE_EVENT(kvm_mmu_set_bit_class, kvm_mmu_set_accessed_bit,
> +
> + TP_PROTO(unsigned long table_gfn, unsigned index, unsigned size),
> +
> + TP_ARGS(table_gfn, index, size)
> +);
> +
> +/* We set a pte dirty bit */
> +DEFINE_EVENT(kvm_mmu_set_bit_class, kvm_mmu_set_dirty_bit,
> +
> + TP_PROTO(unsigned long table_gfn, unsigned index, unsigned size),
> +
> + TP_ARGS(table_gfn, index, size)
> +);
> +
> +TRACE_EVENT(
> + kvm_mmu_walker_error,
> + TP_PROTO(u32 pferr),
> + TP_ARGS(pferr),
> +
> + TP_STRUCT__entry(
> + __field(__u32, pferr)
> + ),
> +
> + TP_fast_assign(
> + __entry->pferr = pferr;
> + ),
> +
> + TP_printk("pferr %x %s", __entry->pferr,
> + __print_flags(__entry->pferr, "|", kvm_mmu_trace_pferr_flags))
> +);
> +
> +TRACE_EVENT(
> + kvm_mmu_get_page,
> + TP_PROTO(struct kvm_mmu_page *sp, bool created),
> + TP_ARGS(sp, created),
> +
> + TP_STRUCT__entry(
> + KVM_MMU_PAGE_FIELDS
> + __field(bool, created)
> + ),
> +
> + TP_fast_assign(
> + KVM_MMU_PAGE_ASSIGN(sp)
> + __entry->created = created;
> + ),
> +
> + TP_printk("%s %s", KVM_MMU_PAGE_PRINTK(),
> + __entry->created ? "new" : "existing")
> +);
> +
> +DECLARE_EVENT_CLASS(kvm_mmu_page_class,
> +
> + TP_PROTO(struct kvm_mmu_page *sp),
> + TP_ARGS(sp),
> +
> + TP_STRUCT__entry(
> + KVM_MMU_PAGE_FIELDS
> + ),
> +
> + TP_fast_assign(
> + KVM_MMU_PAGE_ASSIGN(sp)
> + ),
> +
> + TP_printk("%s", KVM_MMU_PAGE_PRINTK())
> +);
> +
> +DEFINE_EVENT(kvm_mmu_page_class, kvm_mmu_sync_page,
> + TP_PROTO(struct kvm_mmu_page *sp),
> +
> + TP_ARGS(sp)
> +);
> +
> +DEFINE_EVENT(kvm_mmu_page_class, kvm_mmu_unsync_page,
> + TP_PROTO(struct kvm_mmu_page *sp),
> +
> + TP_ARGS(sp)
> +);
> +
> +DEFINE_EVENT(kvm_mmu_page_class, kvm_mmu_zap_page,
> + TP_PROTO(struct kvm_mmu_page *sp),
> +
> + TP_ARGS(sp)
> +);
> +#endif /* _TRACE_KVMMMU_H */
> +
> +#undef TRACE_INCLUDE_PATH
> +#define TRACE_INCLUDE_PATH .
> +#undef TRACE_INCLUDE_FILE
> +#define TRACE_INCLUDE_FILE kvm-mmutrace
> +
> +/* This part must be outside protection */
> +#include <trace/define_trace.h>
> diff --git a/arch/x86/include/kvm-trace.h b/arch/x86/include/kvm-trace.h
> new file mode 100644
> index 0000000..3dede2d
> --- /dev/null
> +++ b/arch/x86/include/kvm-trace.h
> @@ -0,0 +1,700 @@
> +#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
> +
> +/*
> + * 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", __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 hypercall.
> + */
> +TRACE_EVENT(kvm_hv_hypercall,
> + TP_PROTO(__u16 code, bool fast, __u16 rep_cnt, __u16 rep_idx,
> + __u64 ingpa, __u64 outgpa),
> + TP_ARGS(code, fast, rep_cnt, rep_idx, ingpa, outgpa),
> +
> + TP_STRUCT__entry(
> + __field( __u16, code )
> + __field( bool, fast )
> + __field( __u16, rep_cnt )
> + __field( __u16, rep_idx )
> + __field( __u64, ingpa )
> + __field( __u64, outgpa )
> + ),
> +
> + TP_fast_assign(
> + __entry->code = code;
> + __entry->fast = fast;
> + __entry->rep_cnt = rep_cnt;
> + __entry->rep_idx = rep_idx;
> + __entry->ingpa = ingpa;
> + __entry->outgpa = outgpa;
> + ),
> +
> + TP_printk("code 0x%x %s cnt 0x%x idx 0x%x in 0x%llx out 0x%llx",
> + __entry->code, __entry->fast ? "fast" : "slow",
> + __entry->rep_cnt, __entry->rep_idx, __entry->ingpa,
> + __entry->outgpa)
> +);
> +
> +/*
> + * 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)
> +);
> +
> +#define AREG(x) { APIC_##x, "APIC_" #x }
> +
> +#define kvm_trace_symbol_apic \
> + AREG(ID), AREG(LVR), AREG(TASKPRI), AREG(ARBPRI), AREG(PROCPRI), \
> + AREG(EOI), AREG(RRR), AREG(LDR), AREG(DFR), AREG(SPIV), AREG(ISR), \
> + AREG(TMR), AREG(IRR), AREG(ESR), AREG(ICR), AREG(ICR2), AREG(LVTT), \
> + AREG(LVTTHMR), AREG(LVTPC), AREG(LVT0), AREG(LVT1), AREG(LVTERR), \
> + AREG(TMICT), AREG(TMCCT), AREG(TDCR), AREG(SELF_IPI), AREG(EFEAT), \
> + AREG(ECTRL)
> +/*
> + * 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 %s = 0x%x",
> + __entry->rw ? "write" : "read",
> + __print_symbolic(__entry->reg, kvm_trace_symbol_apic),
> + __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)
> +
> +/*
> + * Tracepoint for kvm guest exit:
> + */
> +TRACE_EVENT(kvm_exit,
> + TP_PROTO(unsigned int exit_reason, struct kvm_vcpu *vcpu),
> + TP_ARGS(exit_reason, vcpu),
> +
> + TP_STRUCT__entry(
> + __field( unsigned int, exit_reason )
> + __field( unsigned long, guest_rip )
> + ),
> +
> + TP_fast_assign(
> + __entry->exit_reason = exit_reason;
> + __entry->guest_rip = kvm_rip_read(vcpu);
> + ),
> +
> + TP_printk("reason %s rip 0x%lx",
> + ftrace_print_symbols_seq(p, __entry->exit_reason,
> + kvm_x86_ops->exit_reasons_str),
> + __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)
> +);
> +
> +#define EXS(x) { x##_VECTOR, "#" #x }
> +
> +#define kvm_trace_sym_exc \
> + EXS(DE), EXS(DB), EXS(BP), EXS(OF), EXS(BR), EXS(UD), EXS(NM), \
> + EXS(DF), EXS(TS), EXS(NP), EXS(SS), EXS(GP), EXS(PF), \
> + EXS(MF), EXS(MC)
> +
> +/*
> + * Tracepoint for kvm interrupt injection:
> + */
> +TRACE_EVENT(kvm_inj_exception,
> + TP_PROTO(unsigned exception, bool has_error, unsigned error_code),
> + TP_ARGS(exception, has_error, error_code),
> +
> + TP_STRUCT__entry(
> + __field( u8, exception )
> + __field( u8, has_error )
> + __field( u32, error_code )
> + ),
> +
> + TP_fast_assign(
> + __entry->exception = exception;
> + __entry->has_error = has_error;
> + __entry->error_code = error_code;
> + ),
> +
> + TP_printk("%s (0x%x)",
> + __print_symbolic(__entry->exception, kvm_trace_sym_exc),
> + /* FIXME: don't print error_code if not present */
> + __entry->has_error ? __entry->error_code : 0)
> +);
> +
> +/*
> + * 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 write, u32 ecx, u64 data, bool exception),
> + TP_ARGS(write, ecx, data, exception),
> +
> + TP_STRUCT__entry(
> + __field( unsigned, write )
> + __field( u32, ecx )
> + __field( u64, data )
> + __field( u8, exception )
> + ),
> +
> + TP_fast_assign(
> + __entry->write = write;
> + __entry->ecx = ecx;
> + __entry->data = data;
> + __entry->exception = exception;
> + ),
> +
> + TP_printk("msr_%s %x = 0x%llx%s",
> + __entry->write ? "write" : "read",
> + __entry->ecx, __entry->data,
> + __entry->exception ? " (#GP)" : "")
> +);
> +
> +#define trace_kvm_msr_read(ecx, data) trace_kvm_msr(0, ecx, data, false)
> +#define trace_kvm_msr_write(ecx, data) trace_kvm_msr(1, ecx, data, false)
> +#define trace_kvm_msr_read_ex(ecx) trace_kvm_msr(0, ecx, 0, true)
> +#define trace_kvm_msr_write_ex(ecx, data) trace_kvm_msr(1, ecx, data, true)
> +
> +/*
> + * 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)
> +
> +TRACE_EVENT(kvm_pic_set_irq,
> + TP_PROTO(__u8 chip, __u8 pin, __u8 elcr, __u8 imr, bool coalesced),
> + TP_ARGS(chip, pin, elcr, imr, coalesced),
> +
> + TP_STRUCT__entry(
> + __field( __u8, chip )
> + __field( __u8, pin )
> + __field( __u8, elcr )
> + __field( __u8, imr )
> + __field( bool, coalesced )
> + ),
> +
> + TP_fast_assign(
> + __entry->chip = chip;
> + __entry->pin = pin;
> + __entry->elcr = elcr;
> + __entry->imr = imr;
> + __entry->coalesced = coalesced;
> + ),
> +
> + TP_printk("chip %u pin %u (%s%s)%s",
> + __entry->chip, __entry->pin,
> + (__entry->elcr & (1 << __entry->pin)) ? "level":"edge",
> + (__entry->imr & (1 << __entry->pin)) ? "|masked":"",
> + __entry->coalesced ? " (coalesced)" : "")
> +);
> +
> +#define kvm_apic_dst_shorthand \
> + {0x0, "dst"}, \
> + {0x1, "self"}, \
> + {0x2, "all"}, \
> + {0x3, "all-but-self"}
> +
> +TRACE_EVENT(kvm_apic_ipi,
> + TP_PROTO(__u32 icr_low, __u32 dest_id),
> + TP_ARGS(icr_low, dest_id),
> +
> + TP_STRUCT__entry(
> + __field( __u32, icr_low )
> + __field( __u32, dest_id )
> + ),
> +
> + TP_fast_assign(
> + __entry->icr_low = icr_low;
> + __entry->dest_id = dest_id;
> + ),
> +
> + TP_printk("dst %x vec %u (%s|%s|%s|%s|%s)",
> + __entry->dest_id, (u8)__entry->icr_low,
> + __print_symbolic((__entry->icr_low >> 8 & 0x7),
> + kvm_deliver_mode),
> + (__entry->icr_low & (1<<11)) ? "logical" : "physical",
> + (__entry->icr_low & (1<<14)) ? "assert" : "de-assert",
> + (__entry->icr_low & (1<<15)) ? "level" : "edge",
> + __print_symbolic((__entry->icr_low >> 18 & 0x3),
> + kvm_apic_dst_shorthand))
> +);
> +
> +TRACE_EVENT(kvm_apic_accept_irq,
> + TP_PROTO(__u32 apicid, __u16 dm, __u8 tm, __u8 vec, bool coalesced),
> + TP_ARGS(apicid, dm, tm, vec, coalesced),
> +
> + TP_STRUCT__entry(
> + __field( __u32, apicid )
> + __field( __u16, dm )
> + __field( __u8, tm )
> + __field( __u8, vec )
> + __field( bool, coalesced )
> + ),
> +
> + TP_fast_assign(
> + __entry->apicid = apicid;
> + __entry->dm = dm;
> + __entry->tm = tm;
> + __entry->vec = vec;
> + __entry->coalesced = coalesced;
> + ),
> +
> + TP_printk("apicid %x vec %u (%s|%s)%s",
> + __entry->apicid, __entry->vec,
> + __print_symbolic((__entry->dm >> 8 & 0x7), kvm_deliver_mode),
> + __entry->tm ? "level" : "edge",
> + __entry->coalesced ? " (coalesced)" : "")
> +);
> +
> +/*
> + * Tracepoint for nested VMRUN
> + */
> +TRACE_EVENT(kvm_nested_vmrun,
> + TP_PROTO(__u64 rip, __u64 vmcb, __u64 nested_rip, __u32 int_ctl,
> + __u32 event_inj, bool npt),
> + TP_ARGS(rip, vmcb, nested_rip, int_ctl, event_inj, npt),
> +
> + TP_STRUCT__entry(
> + __field( __u64, rip )
> + __field( __u64, vmcb )
> + __field( __u64, nested_rip )
> + __field( __u32, int_ctl )
> + __field( __u32, event_inj )
> + __field( bool, npt )
> + ),
> +
> + TP_fast_assign(
> + __entry->rip = rip;
> + __entry->vmcb = vmcb;
> + __entry->nested_rip = nested_rip;
> + __entry->int_ctl = int_ctl;
> + __entry->event_inj = event_inj;
> + __entry->npt = npt;
> + ),
> +
> + TP_printk("rip: 0x%016llx vmcb: 0x%016llx nrip: 0x%016llx int_ctl: 0x%08x "
> + "event_inj: 0x%08x npt: %s",
> + __entry->rip, __entry->vmcb, __entry->nested_rip,
> + __entry->int_ctl, __entry->event_inj,
> + __entry->npt ? "on" : "off")
> +);
> +
> +TRACE_EVENT(kvm_nested_intercepts,
> + TP_PROTO(__u16 cr_read, __u16 cr_write, __u32 exceptions, __u64 intercept),
> + TP_ARGS(cr_read, cr_write, exceptions, intercept),
> +
> + TP_STRUCT__entry(
> + __field( __u16, cr_read )
> + __field( __u16, cr_write )
> + __field( __u32, exceptions )
> + __field( __u64, intercept )
> + ),
> +
> + TP_fast_assign(
> + __entry->cr_read = cr_read;
> + __entry->cr_write = cr_write;
> + __entry->exceptions = exceptions;
> + __entry->intercept = intercept;
> + ),
> +
> + TP_printk("cr_read: %04x cr_write: %04x excp: %08x intercept: %016llx",
> + __entry->cr_read, __entry->cr_write, __entry->exceptions,
> + __entry->intercept)
> +);
> +/*
> + * Tracepoint for #VMEXIT while nested
> + */
> +TRACE_EVENT(kvm_nested_vmexit,
> + TP_PROTO(__u64 rip, __u32 exit_code,
> + __u64 exit_info1, __u64 exit_info2,
> + __u32 exit_int_info, __u32 exit_int_info_err),
> + TP_ARGS(rip, exit_code, exit_info1, exit_info2,
> + exit_int_info, exit_int_info_err),
> +
> + TP_STRUCT__entry(
> + __field( __u64, rip )
> + __field( __u32, exit_code )
> + __field( __u64, exit_info1 )
> + __field( __u64, exit_info2 )
> + __field( __u32, exit_int_info )
> + __field( __u32, exit_int_info_err )
> + ),
> +
> + TP_fast_assign(
> + __entry->rip = rip;
> + __entry->exit_code = exit_code;
> + __entry->exit_info1 = exit_info1;
> + __entry->exit_info2 = exit_info2;
> + __entry->exit_int_info = exit_int_info;
> + __entry->exit_int_info_err = exit_int_info_err;
> + ),
> + TP_printk("rip: 0x%016llx reason: %s ext_inf1: 0x%016llx "
> + "ext_inf2: 0x%016llx ext_int: 0x%08x ext_int_err: 0x%08x",
> + __entry->rip,
> + ftrace_print_symbols_seq(p, __entry->exit_code,
> + kvm_x86_ops->exit_reasons_str),
> + __entry->exit_info1, __entry->exit_info2,
> + __entry->exit_int_info, __entry->exit_int_info_err)
> +);
> +
> +/*
> + * Tracepoint for #VMEXIT reinjected to the guest
> + */
> +TRACE_EVENT(kvm_nested_vmexit_inject,
> + TP_PROTO(__u32 exit_code,
> + __u64 exit_info1, __u64 exit_info2,
> + __u32 exit_int_info, __u32 exit_int_info_err),
> + TP_ARGS(exit_code, exit_info1, exit_info2,
> + exit_int_info, exit_int_info_err),
> +
> + TP_STRUCT__entry(
> + __field( __u32, exit_code )
> + __field( __u64, exit_info1 )
> + __field( __u64, exit_info2 )
> + __field( __u32, exit_int_info )
> + __field( __u32, exit_int_info_err )
> + ),
> +
> + TP_fast_assign(
> + __entry->exit_code = exit_code;
> + __entry->exit_info1 = exit_info1;
> + __entry->exit_info2 = exit_info2;
> + __entry->exit_int_info = exit_int_info;
> + __entry->exit_int_info_err = exit_int_info_err;
> + ),
> +
> + TP_printk("reason: %s ext_inf1: 0x%016llx "
> + "ext_inf2: 0x%016llx ext_int: 0x%08x ext_int_err: 0x%08x",
> + ftrace_print_symbols_seq(p, __entry->exit_code,
> + kvm_x86_ops->exit_reasons_str),
> + __entry->exit_info1, __entry->exit_info2,
> + __entry->exit_int_info, __entry->exit_int_info_err)
> +);
> +
> +/*
> + * Tracepoint for nested #vmexit because of interrupt pending
> + */
> +TRACE_EVENT(kvm_nested_intr_vmexit,
> + TP_PROTO(__u64 rip),
> + TP_ARGS(rip),
> +
> + TP_STRUCT__entry(
> + __field( __u64, rip )
> + ),
> +
> + TP_fast_assign(
> + __entry->rip = rip
> + ),
> +
> + TP_printk("rip: 0x%016llx", __entry->rip)
> +);
> +
> +/*
> + * Tracepoint for nested #vmexit because of interrupt pending
> + */
> +TRACE_EVENT(kvm_invlpga,
> + TP_PROTO(__u64 rip, int asid, u64 address),
> + TP_ARGS(rip, asid, address),
> +
> + TP_STRUCT__entry(
> + __field( __u64, rip )
> + __field( int, asid )
> + __field( __u64, address )
> + ),
> +
> + TP_fast_assign(
> + __entry->rip = rip;
> + __entry->asid = asid;
> + __entry->address = address;
> + ),
> +
> + TP_printk("rip: 0x%016llx asid: %d address: 0x%016llx",
> + __entry->rip, __entry->asid, __entry->address)
> +);
> +
> +/*
> + * Tracepoint for nested #vmexit because of interrupt pending
> + */
> +TRACE_EVENT(kvm_skinit,
> + TP_PROTO(__u64 rip, __u32 slb),
> + TP_ARGS(rip, slb),
> +
> + TP_STRUCT__entry(
> + __field( __u64, rip )
> + __field( __u32, slb )
> + ),
> +
> + TP_fast_assign(
> + __entry->rip = rip;
> + __entry->slb = slb;
> + ),
> +
> + TP_printk("rip: 0x%016llx slb: 0x%08x",
> + __entry->rip, __entry->slb)
> +);
> +
> +#define __print_insn(insn, ilen) ({ \
> + int i; \
> + const char *ret = p->buffer + p->len; \
> + \
> + for (i = 0; i < ilen; ++i) \
> + trace_seq_printf(p, " %02x", insn[i]); \
> + trace_seq_printf(p, "%c", 0); \
> + ret; \
> + })
> +
> +#define KVM_EMUL_INSN_F_CR0_PE (1 << 0)
> +#define KVM_EMUL_INSN_F_EFL_VM (1 << 1)
> +#define KVM_EMUL_INSN_F_CS_D (1 << 2)
> +#define KVM_EMUL_INSN_F_CS_L (1 << 3)
> +
> +#define kvm_trace_symbol_emul_flags \
> + { 0, "real" }, \
> + { KVM_EMUL_INSN_F_CR0_PE \
> + | KVM_EMUL_INSN_F_EFL_VM, "vm16" }, \
> + { KVM_EMUL_INSN_F_CR0_PE, "prot16" }, \
> + { KVM_EMUL_INSN_F_CR0_PE \
> + | KVM_EMUL_INSN_F_CS_D, "prot32" }, \
> + { KVM_EMUL_INSN_F_CR0_PE \
> + | KVM_EMUL_INSN_F_CS_L, "prot64" }
> +
> +#define kei_decode_mode(mode) ({ \
> + u8 flags = 0xff; \
> + switch (mode) { \
> + case X86EMUL_MODE_REAL: \
> + flags = 0; \
> + break; \
> + case X86EMUL_MODE_VM86: \
> + flags = KVM_EMUL_INSN_F_EFL_VM; \
> + break; \
> + case X86EMUL_MODE_PROT16: \
> + flags = KVM_EMUL_INSN_F_CR0_PE; \
> + break; \
> + case X86EMUL_MODE_PROT32: \
> + flags = KVM_EMUL_INSN_F_CR0_PE \
> + | KVM_EMUL_INSN_F_CS_D; \
> + break; \
> + case X86EMUL_MODE_PROT64: \
> + flags = KVM_EMUL_INSN_F_CR0_PE \
> + | KVM_EMUL_INSN_F_CS_L; \
> + break; \
> + } \
> + flags; \
> + })
> +
> +TRACE_EVENT(kvm_emulate_insn,
> + TP_PROTO(struct kvm_vcpu *vcpu, __u8 failed),
> + TP_ARGS(vcpu, failed),
> +
> + TP_STRUCT__entry(
> + __field( __u64, rip )
> + __field( __u32, csbase )
> + __field( __u8, len )
> + __array( __u8, insn, 15 )
> + __field( __u8, flags )
> + __field( __u8, failed )
> + ),
> +
> + TP_fast_assign(
> + __entry->rip = vcpu->arch.emulate_ctxt.decode.fetch.start;
> + __entry->csbase = kvm_x86_ops->get_segment_base(vcpu, VCPU_SREG_CS);
> + __entry->len = vcpu->arch.emulate_ctxt.decode.eip
> + - vcpu->arch.emulate_ctxt.decode.fetch.start;
> + memcpy(__entry->insn,
> + vcpu->arch.emulate_ctxt.decode.fetch.data,
> + 15);
> + __entry->flags = kei_decode_mode(vcpu->arch.emulate_ctxt.mode);
> + __entry->failed = failed;
> + ),
> +
> + TP_printk("%x:%llx:%s (%s)%s",
> + __entry->csbase, __entry->rip,
> + __print_insn(__entry->insn, __entry->len),
> + __print_symbolic(__entry->flags,
> + kvm_trace_symbol_emul_flags),
> + __entry->failed ? " failed" : ""
> + )
> + );
> +
> +#define trace_kvm_emulate_insn_start(vcpu) trace_kvm_emulate_insn(vcpu, 0)
> +#define trace_kvm_emulate_insn_failed(vcpu) trace_kvm_emulate_insn(vcpu, 1)
> +
> +#endif /* _TRACE_KVM_H */
> +
> +#undef TRACE_INCLUDE_PATH
> +#define TRACE_INCLUDE_PATH arch/x86/include
> +#undef TRACE_INCLUDE_FILE
> +#define TRACE_INCLUDE_FILE kvm-trace
> +
> +/* This part must be outside protection */
> +#include <trace/define_trace.h>
> diff --git a/arch/x86/kvm/i8259.c b/arch/x86/kvm/i8259.c
> index 93825ff..3f47969 100644
> --- a/arch/x86/kvm/i8259.c
> +++ b/arch/x86/kvm/i8259.c
> @@ -31,7 +31,7 @@
> #include "irq.h"
>
> #include <linux/kvm_host.h>
> -#include "trace.h"
> +#include <kvm-trace.h>
>
> static void pic_lock(struct kvm_pic *s)
> __acquires(&s->lock)
> diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
> index 1eb7a4a..cdfadbc 100644
> --- a/arch/x86/kvm/lapic.c
> +++ b/arch/x86/kvm/lapic.c
> @@ -35,7 +35,7 @@
> #include <asm/atomic.h>
> #include "kvm_cache_regs.h"
> #include "irq.h"
> -#include "trace.h"
> +#include <kvm-trace.h>
> #include "x86.h"
>
> #ifndef CONFIG_X86_64
> diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
> index b1ed0a1..46db20e 100644
> --- a/arch/x86/kvm/mmu.c
> +++ b/arch/x86/kvm/mmu.c
> @@ -149,7 +149,7 @@ module_param(oos_shadow, bool, 0644);
> #include <trace/events/kvm.h>
>
> #define CREATE_TRACE_POINTS
> -#include "mmutrace.h"
> +#include <kvm-mmutrace.h>
>
> #define SPTE_HOST_WRITEABLE (1ULL << PT_FIRST_AVAIL_BITS_SHIFT)
>
> diff --git a/arch/x86/kvm/mmutrace.h b/arch/x86/kvm/mmutrace.h
> deleted file mode 100644
> index 42f07b1..0000000
> --- a/arch/x86/kvm/mmutrace.h
> +++ /dev/null
> @@ -1,206 +0,0 @@
> -#if !defined(_TRACE_KVMMMU_H) || defined(TRACE_HEADER_MULTI_READ)
> -#define _TRACE_KVMMMU_H
> -
> -#include <linux/tracepoint.h>
> -#include <linux/ftrace_event.h>
> -
> -#undef TRACE_SYSTEM
> -#define TRACE_SYSTEM kvmmmu
> -
> -#define KVM_MMU_PAGE_FIELDS \
> - __field(__u64, gfn) \
> - __field(__u32, role) \
> - __field(__u32, root_count) \
> - __field(bool, unsync)
> -
> -#define KVM_MMU_PAGE_ASSIGN(sp) \
> - __entry->gfn = sp->gfn; \
> - __entry->role = sp->role.word; \
> - __entry->root_count = sp->root_count; \
> - __entry->unsync = sp->unsync;
> -
> -#define KVM_MMU_PAGE_PRINTK() ({ \
> - const char *ret = p->buffer + p->len; \
> - static const char *access_str[] = { \
> - "---", "--x", "w--", "w-x", "-u-", "-ux", "wu-", "wux" \
> - }; \
> - union kvm_mmu_page_role role; \
> - \
> - role.word = __entry->role; \
> - \
> - trace_seq_printf(p, "sp gfn %llx %u%s q%u%s %s%s" \
> - " %snxe root %u %s%c", \
> - __entry->gfn, role.level, \
> - role.cr4_pae ? " pae" : "", \
> - role.quadrant, \
> - role.direct ? " direct" : "", \
> - access_str[role.access], \
> - role.invalid ? " invalid" : "", \
> - role.nxe ? "" : "!", \
> - __entry->root_count, \
> - __entry->unsync ? "unsync" : "sync", 0); \
> - ret; \
> - })
> -
> -#define kvm_mmu_trace_pferr_flags \
> - { PFERR_PRESENT_MASK, "P" }, \
> - { PFERR_WRITE_MASK, "W" }, \
> - { PFERR_USER_MASK, "U" }, \
> - { PFERR_RSVD_MASK, "RSVD" }, \
> - { PFERR_FETCH_MASK, "F" }
> -
> -/*
> - * A pagetable walk has started
> - */
> -TRACE_EVENT(
> - kvm_mmu_pagetable_walk,
> - TP_PROTO(u64 addr, int write_fault, int user_fault, int fetch_fault),
> - TP_ARGS(addr, write_fault, user_fault, fetch_fault),
> -
> - TP_STRUCT__entry(
> - __field(__u64, addr)
> - __field(__u32, pferr)
> - ),
> -
> - TP_fast_assign(
> - __entry->addr = addr;
> - __entry->pferr = (!!write_fault << 1) | (!!user_fault << 2)
> - | (!!fetch_fault << 4);
> - ),
> -
> - TP_printk("addr %llx pferr %x %s", __entry->addr, __entry->pferr,
> - __print_flags(__entry->pferr, "|", kvm_mmu_trace_pferr_flags))
> -);
> -
> -
> -/* We just walked a paging element */
> -TRACE_EVENT(
> - kvm_mmu_paging_element,
> - TP_PROTO(u64 pte, int level),
> - TP_ARGS(pte, level),
> -
> - TP_STRUCT__entry(
> - __field(__u64, pte)
> - __field(__u32, level)
> - ),
> -
> - TP_fast_assign(
> - __entry->pte = pte;
> - __entry->level = level;
> - ),
> -
> - TP_printk("pte %llx level %u", __entry->pte, __entry->level)
> -);
> -
> -DECLARE_EVENT_CLASS(kvm_mmu_set_bit_class,
> -
> - TP_PROTO(unsigned long table_gfn, unsigned index, unsigned size),
> -
> - TP_ARGS(table_gfn, index, size),
> -
> - TP_STRUCT__entry(
> - __field(__u64, gpa)
> - ),
> -
> - TP_fast_assign(
> - __entry->gpa = ((u64)table_gfn << PAGE_SHIFT)
> - + index * size;
> - ),
> -
> - TP_printk("gpa %llx", __entry->gpa)
> -);
> -
> -/* We set a pte accessed bit */
> -DEFINE_EVENT(kvm_mmu_set_bit_class, kvm_mmu_set_accessed_bit,
> -
> - TP_PROTO(unsigned long table_gfn, unsigned index, unsigned size),
> -
> - TP_ARGS(table_gfn, index, size)
> -);
> -
> -/* We set a pte dirty bit */
> -DEFINE_EVENT(kvm_mmu_set_bit_class, kvm_mmu_set_dirty_bit,
> -
> - TP_PROTO(unsigned long table_gfn, unsigned index, unsigned size),
> -
> - TP_ARGS(table_gfn, index, size)
> -);
> -
> -TRACE_EVENT(
> - kvm_mmu_walker_error,
> - TP_PROTO(u32 pferr),
> - TP_ARGS(pferr),
> -
> - TP_STRUCT__entry(
> - __field(__u32, pferr)
> - ),
> -
> - TP_fast_assign(
> - __entry->pferr = pferr;
> - ),
> -
> - TP_printk("pferr %x %s", __entry->pferr,
> - __print_flags(__entry->pferr, "|", kvm_mmu_trace_pferr_flags))
> -);
> -
> -TRACE_EVENT(
> - kvm_mmu_get_page,
> - TP_PROTO(struct kvm_mmu_page *sp, bool created),
> - TP_ARGS(sp, created),
> -
> - TP_STRUCT__entry(
> - KVM_MMU_PAGE_FIELDS
> - __field(bool, created)
> - ),
> -
> - TP_fast_assign(
> - KVM_MMU_PAGE_ASSIGN(sp)
> - __entry->created = created;
> - ),
> -
> - TP_printk("%s %s", KVM_MMU_PAGE_PRINTK(),
> - __entry->created ? "new" : "existing")
> -);
> -
> -DECLARE_EVENT_CLASS(kvm_mmu_page_class,
> -
> - TP_PROTO(struct kvm_mmu_page *sp),
> - TP_ARGS(sp),
> -
> - TP_STRUCT__entry(
> - KVM_MMU_PAGE_FIELDS
> - ),
> -
> - TP_fast_assign(
> - KVM_MMU_PAGE_ASSIGN(sp)
> - ),
> -
> - TP_printk("%s", KVM_MMU_PAGE_PRINTK())
> -);
> -
> -DEFINE_EVENT(kvm_mmu_page_class, kvm_mmu_sync_page,
> - TP_PROTO(struct kvm_mmu_page *sp),
> -
> - TP_ARGS(sp)
> -);
> -
> -DEFINE_EVENT(kvm_mmu_page_class, kvm_mmu_unsync_page,
> - TP_PROTO(struct kvm_mmu_page *sp),
> -
> - TP_ARGS(sp)
> -);
> -
> -DEFINE_EVENT(kvm_mmu_page_class, kvm_mmu_zap_page,
> - TP_PROTO(struct kvm_mmu_page *sp),
> -
> - TP_ARGS(sp)
> -);
> -#endif /* _TRACE_KVMMMU_H */
> -
> -#undef TRACE_INCLUDE_PATH
> -#define TRACE_INCLUDE_PATH .
> -#undef TRACE_INCLUDE_FILE
> -#define TRACE_INCLUDE_FILE mmutrace
> -
> -/* This part must be outside protection */
> -#include <trace/define_trace.h>
> diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
> index ce438e0..ff97609 100644
> --- a/arch/x86/kvm/svm.c
> +++ b/arch/x86/kvm/svm.c
> @@ -32,7 +32,7 @@
> #include <asm/desc.h>
>
> #include <asm/virtext.h>
> -#include "trace.h"
> +#include <kvm-trace.h>
>
> #define __ex(x) __kvm_handle_fault_on_reboot(x)
>
> diff --git a/arch/x86/kvm/trace.h b/arch/x86/kvm/trace.h
> deleted file mode 100644
> index a6544b8..0000000
> --- a/arch/x86/kvm/trace.h
> +++ /dev/null
> @@ -1,700 +0,0 @@
> -#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
> -
> -/*
> - * 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", __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 hypercall.
> - */
> -TRACE_EVENT(kvm_hv_hypercall,
> - TP_PROTO(__u16 code, bool fast, __u16 rep_cnt, __u16 rep_idx,
> - __u64 ingpa, __u64 outgpa),
> - TP_ARGS(code, fast, rep_cnt, rep_idx, ingpa, outgpa),
> -
> - TP_STRUCT__entry(
> - __field( __u16, code )
> - __field( bool, fast )
> - __field( __u16, rep_cnt )
> - __field( __u16, rep_idx )
> - __field( __u64, ingpa )
> - __field( __u64, outgpa )
> - ),
> -
> - TP_fast_assign(
> - __entry->code = code;
> - __entry->fast = fast;
> - __entry->rep_cnt = rep_cnt;
> - __entry->rep_idx = rep_idx;
> - __entry->ingpa = ingpa;
> - __entry->outgpa = outgpa;
> - ),
> -
> - TP_printk("code 0x%x %s cnt 0x%x idx 0x%x in 0x%llx out 0x%llx",
> - __entry->code, __entry->fast ? "fast" : "slow",
> - __entry->rep_cnt, __entry->rep_idx, __entry->ingpa,
> - __entry->outgpa)
> -);
> -
> -/*
> - * 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)
> -);
> -
> -#define AREG(x) { APIC_##x, "APIC_" #x }
> -
> -#define kvm_trace_symbol_apic \
> - AREG(ID), AREG(LVR), AREG(TASKPRI), AREG(ARBPRI), AREG(PROCPRI), \
> - AREG(EOI), AREG(RRR), AREG(LDR), AREG(DFR), AREG(SPIV), AREG(ISR), \
> - AREG(TMR), AREG(IRR), AREG(ESR), AREG(ICR), AREG(ICR2), AREG(LVTT), \
> - AREG(LVTTHMR), AREG(LVTPC), AREG(LVT0), AREG(LVT1), AREG(LVTERR), \
> - AREG(TMICT), AREG(TMCCT), AREG(TDCR), AREG(SELF_IPI), AREG(EFEAT), \
> - AREG(ECTRL)
> -/*
> - * 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 %s = 0x%x",
> - __entry->rw ? "write" : "read",
> - __print_symbolic(__entry->reg, kvm_trace_symbol_apic),
> - __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)
> -
> -/*
> - * Tracepoint for kvm guest exit:
> - */
> -TRACE_EVENT(kvm_exit,
> - TP_PROTO(unsigned int exit_reason, struct kvm_vcpu *vcpu),
> - TP_ARGS(exit_reason, vcpu),
> -
> - TP_STRUCT__entry(
> - __field( unsigned int, exit_reason )
> - __field( unsigned long, guest_rip )
> - ),
> -
> - TP_fast_assign(
> - __entry->exit_reason = exit_reason;
> - __entry->guest_rip = kvm_rip_read(vcpu);
> - ),
> -
> - TP_printk("reason %s rip 0x%lx",
> - ftrace_print_symbols_seq(p, __entry->exit_reason,
> - kvm_x86_ops->exit_reasons_str),
> - __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)
> -);
> -
> -#define EXS(x) { x##_VECTOR, "#" #x }
> -
> -#define kvm_trace_sym_exc \
> - EXS(DE), EXS(DB), EXS(BP), EXS(OF), EXS(BR), EXS(UD), EXS(NM), \
> - EXS(DF), EXS(TS), EXS(NP), EXS(SS), EXS(GP), EXS(PF), \
> - EXS(MF), EXS(MC)
> -
> -/*
> - * Tracepoint for kvm interrupt injection:
> - */
> -TRACE_EVENT(kvm_inj_exception,
> - TP_PROTO(unsigned exception, bool has_error, unsigned error_code),
> - TP_ARGS(exception, has_error, error_code),
> -
> - TP_STRUCT__entry(
> - __field( u8, exception )
> - __field( u8, has_error )
> - __field( u32, error_code )
> - ),
> -
> - TP_fast_assign(
> - __entry->exception = exception;
> - __entry->has_error = has_error;
> - __entry->error_code = error_code;
> - ),
> -
> - TP_printk("%s (0x%x)",
> - __print_symbolic(__entry->exception, kvm_trace_sym_exc),
> - /* FIXME: don't print error_code if not present */
> - __entry->has_error ? __entry->error_code : 0)
> -);
> -
> -/*
> - * 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 write, u32 ecx, u64 data, bool exception),
> - TP_ARGS(write, ecx, data, exception),
> -
> - TP_STRUCT__entry(
> - __field( unsigned, write )
> - __field( u32, ecx )
> - __field( u64, data )
> - __field( u8, exception )
> - ),
> -
> - TP_fast_assign(
> - __entry->write = write;
> - __entry->ecx = ecx;
> - __entry->data = data;
> - __entry->exception = exception;
> - ),
> -
> - TP_printk("msr_%s %x = 0x%llx%s",
> - __entry->write ? "write" : "read",
> - __entry->ecx, __entry->data,
> - __entry->exception ? " (#GP)" : "")
> -);
> -
> -#define trace_kvm_msr_read(ecx, data) trace_kvm_msr(0, ecx, data, false)
> -#define trace_kvm_msr_write(ecx, data) trace_kvm_msr(1, ecx, data, false)
> -#define trace_kvm_msr_read_ex(ecx) trace_kvm_msr(0, ecx, 0, true)
> -#define trace_kvm_msr_write_ex(ecx, data) trace_kvm_msr(1, ecx, data, true)
> -
> -/*
> - * 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)
> -
> -TRACE_EVENT(kvm_pic_set_irq,
> - TP_PROTO(__u8 chip, __u8 pin, __u8 elcr, __u8 imr, bool coalesced),
> - TP_ARGS(chip, pin, elcr, imr, coalesced),
> -
> - TP_STRUCT__entry(
> - __field( __u8, chip )
> - __field( __u8, pin )
> - __field( __u8, elcr )
> - __field( __u8, imr )
> - __field( bool, coalesced )
> - ),
> -
> - TP_fast_assign(
> - __entry->chip = chip;
> - __entry->pin = pin;
> - __entry->elcr = elcr;
> - __entry->imr = imr;
> - __entry->coalesced = coalesced;
> - ),
> -
> - TP_printk("chip %u pin %u (%s%s)%s",
> - __entry->chip, __entry->pin,
> - (__entry->elcr & (1 << __entry->pin)) ? "level":"edge",
> - (__entry->imr & (1 << __entry->pin)) ? "|masked":"",
> - __entry->coalesced ? " (coalesced)" : "")
> -);
> -
> -#define kvm_apic_dst_shorthand \
> - {0x0, "dst"}, \
> - {0x1, "self"}, \
> - {0x2, "all"}, \
> - {0x3, "all-but-self"}
> -
> -TRACE_EVENT(kvm_apic_ipi,
> - TP_PROTO(__u32 icr_low, __u32 dest_id),
> - TP_ARGS(icr_low, dest_id),
> -
> - TP_STRUCT__entry(
> - __field( __u32, icr_low )
> - __field( __u32, dest_id )
> - ),
> -
> - TP_fast_assign(
> - __entry->icr_low = icr_low;
> - __entry->dest_id = dest_id;
> - ),
> -
> - TP_printk("dst %x vec %u (%s|%s|%s|%s|%s)",
> - __entry->dest_id, (u8)__entry->icr_low,
> - __print_symbolic((__entry->icr_low >> 8 & 0x7),
> - kvm_deliver_mode),
> - (__entry->icr_low & (1<<11)) ? "logical" : "physical",
> - (__entry->icr_low & (1<<14)) ? "assert" : "de-assert",
> - (__entry->icr_low & (1<<15)) ? "level" : "edge",
> - __print_symbolic((__entry->icr_low >> 18 & 0x3),
> - kvm_apic_dst_shorthand))
> -);
> -
> -TRACE_EVENT(kvm_apic_accept_irq,
> - TP_PROTO(__u32 apicid, __u16 dm, __u8 tm, __u8 vec, bool coalesced),
> - TP_ARGS(apicid, dm, tm, vec, coalesced),
> -
> - TP_STRUCT__entry(
> - __field( __u32, apicid )
> - __field( __u16, dm )
> - __field( __u8, tm )
> - __field( __u8, vec )
> - __field( bool, coalesced )
> - ),
> -
> - TP_fast_assign(
> - __entry->apicid = apicid;
> - __entry->dm = dm;
> - __entry->tm = tm;
> - __entry->vec = vec;
> - __entry->coalesced = coalesced;
> - ),
> -
> - TP_printk("apicid %x vec %u (%s|%s)%s",
> - __entry->apicid, __entry->vec,
> - __print_symbolic((__entry->dm >> 8 & 0x7), kvm_deliver_mode),
> - __entry->tm ? "level" : "edge",
> - __entry->coalesced ? " (coalesced)" : "")
> -);
> -
> -/*
> - * Tracepoint for nested VMRUN
> - */
> -TRACE_EVENT(kvm_nested_vmrun,
> - TP_PROTO(__u64 rip, __u64 vmcb, __u64 nested_rip, __u32 int_ctl,
> - __u32 event_inj, bool npt),
> - TP_ARGS(rip, vmcb, nested_rip, int_ctl, event_inj, npt),
> -
> - TP_STRUCT__entry(
> - __field( __u64, rip )
> - __field( __u64, vmcb )
> - __field( __u64, nested_rip )
> - __field( __u32, int_ctl )
> - __field( __u32, event_inj )
> - __field( bool, npt )
> - ),
> -
> - TP_fast_assign(
> - __entry->rip = rip;
> - __entry->vmcb = vmcb;
> - __entry->nested_rip = nested_rip;
> - __entry->int_ctl = int_ctl;
> - __entry->event_inj = event_inj;
> - __entry->npt = npt;
> - ),
> -
> - TP_printk("rip: 0x%016llx vmcb: 0x%016llx nrip: 0x%016llx int_ctl: 0x%08x "
> - "event_inj: 0x%08x npt: %s",
> - __entry->rip, __entry->vmcb, __entry->nested_rip,
> - __entry->int_ctl, __entry->event_inj,
> - __entry->npt ? "on" : "off")
> -);
> -
> -TRACE_EVENT(kvm_nested_intercepts,
> - TP_PROTO(__u16 cr_read, __u16 cr_write, __u32 exceptions, __u64 intercept),
> - TP_ARGS(cr_read, cr_write, exceptions, intercept),
> -
> - TP_STRUCT__entry(
> - __field( __u16, cr_read )
> - __field( __u16, cr_write )
> - __field( __u32, exceptions )
> - __field( __u64, intercept )
> - ),
> -
> - TP_fast_assign(
> - __entry->cr_read = cr_read;
> - __entry->cr_write = cr_write;
> - __entry->exceptions = exceptions;
> - __entry->intercept = intercept;
> - ),
> -
> - TP_printk("cr_read: %04x cr_write: %04x excp: %08x intercept: %016llx",
> - __entry->cr_read, __entry->cr_write, __entry->exceptions,
> - __entry->intercept)
> -);
> -/*
> - * Tracepoint for #VMEXIT while nested
> - */
> -TRACE_EVENT(kvm_nested_vmexit,
> - TP_PROTO(__u64 rip, __u32 exit_code,
> - __u64 exit_info1, __u64 exit_info2,
> - __u32 exit_int_info, __u32 exit_int_info_err),
> - TP_ARGS(rip, exit_code, exit_info1, exit_info2,
> - exit_int_info, exit_int_info_err),
> -
> - TP_STRUCT__entry(
> - __field( __u64, rip )
> - __field( __u32, exit_code )
> - __field( __u64, exit_info1 )
> - __field( __u64, exit_info2 )
> - __field( __u32, exit_int_info )
> - __field( __u32, exit_int_info_err )
> - ),
> -
> - TP_fast_assign(
> - __entry->rip = rip;
> - __entry->exit_code = exit_code;
> - __entry->exit_info1 = exit_info1;
> - __entry->exit_info2 = exit_info2;
> - __entry->exit_int_info = exit_int_info;
> - __entry->exit_int_info_err = exit_int_info_err;
> - ),
> - TP_printk("rip: 0x%016llx reason: %s ext_inf1: 0x%016llx "
> - "ext_inf2: 0x%016llx ext_int: 0x%08x ext_int_err: 0x%08x",
> - __entry->rip,
> - ftrace_print_symbols_seq(p, __entry->exit_code,
> - kvm_x86_ops->exit_reasons_str),
> - __entry->exit_info1, __entry->exit_info2,
> - __entry->exit_int_info, __entry->exit_int_info_err)
> -);
> -
> -/*
> - * Tracepoint for #VMEXIT reinjected to the guest
> - */
> -TRACE_EVENT(kvm_nested_vmexit_inject,
> - TP_PROTO(__u32 exit_code,
> - __u64 exit_info1, __u64 exit_info2,
> - __u32 exit_int_info, __u32 exit_int_info_err),
> - TP_ARGS(exit_code, exit_info1, exit_info2,
> - exit_int_info, exit_int_info_err),
> -
> - TP_STRUCT__entry(
> - __field( __u32, exit_code )
> - __field( __u64, exit_info1 )
> - __field( __u64, exit_info2 )
> - __field( __u32, exit_int_info )
> - __field( __u32, exit_int_info_err )
> - ),
> -
> - TP_fast_assign(
> - __entry->exit_code = exit_code;
> - __entry->exit_info1 = exit_info1;
> - __entry->exit_info2 = exit_info2;
> - __entry->exit_int_info = exit_int_info;
> - __entry->exit_int_info_err = exit_int_info_err;
> - ),
> -
> - TP_printk("reason: %s ext_inf1: 0x%016llx "
> - "ext_inf2: 0x%016llx ext_int: 0x%08x ext_int_err: 0x%08x",
> - ftrace_print_symbols_seq(p, __entry->exit_code,
> - kvm_x86_ops->exit_reasons_str),
> - __entry->exit_info1, __entry->exit_info2,
> - __entry->exit_int_info, __entry->exit_int_info_err)
> -);
> -
> -/*
> - * Tracepoint for nested #vmexit because of interrupt pending
> - */
> -TRACE_EVENT(kvm_nested_intr_vmexit,
> - TP_PROTO(__u64 rip),
> - TP_ARGS(rip),
> -
> - TP_STRUCT__entry(
> - __field( __u64, rip )
> - ),
> -
> - TP_fast_assign(
> - __entry->rip = rip
> - ),
> -
> - TP_printk("rip: 0x%016llx", __entry->rip)
> -);
> -
> -/*
> - * Tracepoint for nested #vmexit because of interrupt pending
> - */
> -TRACE_EVENT(kvm_invlpga,
> - TP_PROTO(__u64 rip, int asid, u64 address),
> - TP_ARGS(rip, asid, address),
> -
> - TP_STRUCT__entry(
> - __field( __u64, rip )
> - __field( int, asid )
> - __field( __u64, address )
> - ),
> -
> - TP_fast_assign(
> - __entry->rip = rip;
> - __entry->asid = asid;
> - __entry->address = address;
> - ),
> -
> - TP_printk("rip: 0x%016llx asid: %d address: 0x%016llx",
> - __entry->rip, __entry->asid, __entry->address)
> -);
> -
> -/*
> - * Tracepoint for nested #vmexit because of interrupt pending
> - */
> -TRACE_EVENT(kvm_skinit,
> - TP_PROTO(__u64 rip, __u32 slb),
> - TP_ARGS(rip, slb),
> -
> - TP_STRUCT__entry(
> - __field( __u64, rip )
> - __field( __u32, slb )
> - ),
> -
> - TP_fast_assign(
> - __entry->rip = rip;
> - __entry->slb = slb;
> - ),
> -
> - TP_printk("rip: 0x%016llx slb: 0x%08x",
> - __entry->rip, __entry->slb)
> -);
> -
> -#define __print_insn(insn, ilen) ({ \
> - int i; \
> - const char *ret = p->buffer + p->len; \
> - \
> - for (i = 0; i < ilen; ++i) \
> - trace_seq_printf(p, " %02x", insn[i]); \
> - trace_seq_printf(p, "%c", 0); \
> - ret; \
> - })
> -
> -#define KVM_EMUL_INSN_F_CR0_PE (1 << 0)
> -#define KVM_EMUL_INSN_F_EFL_VM (1 << 1)
> -#define KVM_EMUL_INSN_F_CS_D (1 << 2)
> -#define KVM_EMUL_INSN_F_CS_L (1 << 3)
> -
> -#define kvm_trace_symbol_emul_flags \
> - { 0, "real" }, \
> - { KVM_EMUL_INSN_F_CR0_PE \
> - | KVM_EMUL_INSN_F_EFL_VM, "vm16" }, \
> - { KVM_EMUL_INSN_F_CR0_PE, "prot16" }, \
> - { KVM_EMUL_INSN_F_CR0_PE \
> - | KVM_EMUL_INSN_F_CS_D, "prot32" }, \
> - { KVM_EMUL_INSN_F_CR0_PE \
> - | KVM_EMUL_INSN_F_CS_L, "prot64" }
> -
> -#define kei_decode_mode(mode) ({ \
> - u8 flags = 0xff; \
> - switch (mode) { \
> - case X86EMUL_MODE_REAL: \
> - flags = 0; \
> - break; \
> - case X86EMUL_MODE_VM86: \
> - flags = KVM_EMUL_INSN_F_EFL_VM; \
> - break; \
> - case X86EMUL_MODE_PROT16: \
> - flags = KVM_EMUL_INSN_F_CR0_PE; \
> - break; \
> - case X86EMUL_MODE_PROT32: \
> - flags = KVM_EMUL_INSN_F_CR0_PE \
> - | KVM_EMUL_INSN_F_CS_D; \
> - break; \
> - case X86EMUL_MODE_PROT64: \
> - flags = KVM_EMUL_INSN_F_CR0_PE \
> - | KVM_EMUL_INSN_F_CS_L; \
> - break; \
> - } \
> - flags; \
> - })
> -
> -TRACE_EVENT(kvm_emulate_insn,
> - TP_PROTO(struct kvm_vcpu *vcpu, __u8 failed),
> - TP_ARGS(vcpu, failed),
> -
> - TP_STRUCT__entry(
> - __field( __u64, rip )
> - __field( __u32, csbase )
> - __field( __u8, len )
> - __array( __u8, insn, 15 )
> - __field( __u8, flags )
> - __field( __u8, failed )
> - ),
> -
> - TP_fast_assign(
> - __entry->rip = vcpu->arch.emulate_ctxt.decode.fetch.start;
> - __entry->csbase = kvm_x86_ops->get_segment_base(vcpu, VCPU_SREG_CS);
> - __entry->len = vcpu->arch.emulate_ctxt.decode.eip
> - - vcpu->arch.emulate_ctxt.decode.fetch.start;
> - memcpy(__entry->insn,
> - vcpu->arch.emulate_ctxt.decode.fetch.data,
> - 15);
> - __entry->flags = kei_decode_mode(vcpu->arch.emulate_ctxt.mode);
> - __entry->failed = failed;
> - ),
> -
> - TP_printk("%x:%llx:%s (%s)%s",
> - __entry->csbase, __entry->rip,
> - __print_insn(__entry->insn, __entry->len),
> - __print_symbolic(__entry->flags,
> - kvm_trace_symbol_emul_flags),
> - __entry->failed ? " failed" : ""
> - )
> - );
> -
> -#define trace_kvm_emulate_insn_start(vcpu) trace_kvm_emulate_insn(vcpu, 0)
> -#define trace_kvm_emulate_insn_failed(vcpu) trace_kvm_emulate_insn(vcpu, 1)
> -
> -#endif /* _TRACE_KVM_H */
> -
> -#undef TRACE_INCLUDE_PATH
> -#define TRACE_INCLUDE_PATH arch/x86/kvm
> -#undef TRACE_INCLUDE_FILE
> -#define TRACE_INCLUDE_FILE trace
> -
> -/* This part must be outside protection */
> -#include <trace/define_trace.h>
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index ee03679..88b8b97 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -37,7 +37,7 @@
> #include <asm/virtext.h>
> #include <asm/mce.h>
>
> -#include "trace.h"
> +#include <kvm-trace.h>
>
> #define __ex(x) __kvm_handle_fault_on_reboot(x)
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 840c541..a39c63d 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -44,7 +44,7 @@
> #include <trace/events/kvm.h>
>
> #define CREATE_TRACE_POINTS
> -#include "trace.h"
> +#include <kvm-trace.h>
>
> #include <asm/debugreg.h>
> #include <asm/uaccess.h>
> --
> 1.7.0.4
>
>
> _______________________________________________
> ltt-dev mailing list
> ltt-dev at lists.casi.polymtl.ca
> http://lists.casi.polymtl.ca/cgi-bin/mailman/listinfo/ltt-dev
>
--
Mathieu Desnoyers
Operating System Efficiency R&D Consultant
EfficiOS Inc.
http://www.efficios.com
More information about the lttng-dev
mailing list