Patched in Tegra support.

1 files changed, 21 insertions, 117 deletions

diff --git a/arch/x86/kvm/trace.h b/arch/x86/kvm/trace.h
index fe5e00ed703..3ff898c104f 100644
--- a/arch/x86/kvm/trace.h
+++ b/arch/x86/kvm/trace.h
@@ -2,9 +2,6 @@
 #define _TRACE_KVM_H
 
 #include <linux/tracepoint.h>
-#include <asm/vmx.h>
-#include <asm/svm.h>
-#include <asm/clocksource.h>
 
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM kvm
@@ -208,9 +205,8 @@ TRACE_EVENT(kvm_exit,
         ),
 
         TP_printk("reason %s rip 0x%lx info %llx %llx",
-                 (__entry->isa == KVM_ISA_VMX) ?
-                 __print_symbolic(__entry->exit_reason, VMX_EXIT_REASONS) :
-                 __print_symbolic(__entry->exit_reason, SVM_EXIT_REASONS),
+                 ftrace_print_symbols_seq(p, __entry->exit_reason,
+                                          kvm_x86_ops->exit_reasons_str),
                  __entry->guest_rip, __entry->info1, __entry->info2)
 );
 
@@ -429,40 +425,6 @@ TRACE_EVENT(kvm_apic_accept_irq,
                   __entry->coalesced ? " (coalesced)" : "")
 );
 
-TRACE_EVENT(kvm_eoi,
-            TP_PROTO(struct kvm_lapic *apic, int vector),
-            TP_ARGS(apic, vector),
-
-        TP_STRUCT__entry(
-                __field(        __u32,          apicid          )
-                __field(        int,            vector          )
-        ),
-
-        TP_fast_assign(
-                __entry->apicid         = apic->vcpu->vcpu_id;
-                __entry->vector         = vector;
-        ),
-
-        TP_printk("apicid %x vector %d", __entry->apicid, __entry->vector)
-);
-
-TRACE_EVENT(kvm_pv_eoi,
-            TP_PROTO(struct kvm_lapic *apic, int vector),
-            TP_ARGS(apic, vector),
-
-        TP_STRUCT__entry(
-                __field(        __u32,          apicid          )
-                __field(        int,            vector          )
-        ),
-
-        TP_fast_assign(
-                __entry->apicid         = apic->vcpu->vcpu_id;
-                __entry->vector         = vector;
-        ),
-
-        TP_printk("apicid %x vector %d", __entry->apicid, __entry->vector)
-);
-
 /*
  * Tracepoint for nested VMRUN
  */
@@ -524,9 +486,9 @@ TRACE_EVENT(kvm_nested_intercepts,
 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, __u32 isa),
+                     __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, isa),
+                    exit_int_info, exit_int_info_err),
 
         TP_STRUCT__entry(
                 __field(        __u64,          rip                     )
@@ -535,7 +497,6 @@ TRACE_EVENT(kvm_nested_vmexit,
                 __field(        __u64,          exit_info2              )
                 __field(        __u32,          exit_int_info           )
                 __field(        __u32,          exit_int_info_err       )
-                __field(        __u32,          isa                     )
         ),
 
         TP_fast_assign(
@@ -545,14 +506,12 @@ TRACE_EVENT(kvm_nested_vmexit,
                 __entry->exit_info2             = exit_info2;
                 __entry->exit_int_info          = exit_int_info;
                 __entry->exit_int_info_err      = exit_int_info_err;
-                __entry->isa                    = isa;
         ),
         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,
-                 (__entry->isa == KVM_ISA_VMX) ?
-                 __print_symbolic(__entry->exit_code, VMX_EXIT_REASONS) :
-                 __print_symbolic(__entry->exit_code, SVM_EXIT_REASONS),
+                  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)
 );
@@ -563,9 +522,9 @@ TRACE_EVENT(kvm_nested_vmexit,
 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, __u32 isa),
+                     __u32 exit_int_info, __u32 exit_int_info_err),
             TP_ARGS(exit_code, exit_info1, exit_info2,
-                    exit_int_info, exit_int_info_err, isa),
+                    exit_int_info, exit_int_info_err),
 
         TP_STRUCT__entry(
                 __field(        __u32,          exit_code               )
@@ -573,7 +532,6 @@ TRACE_EVENT(kvm_nested_vmexit_inject,
                 __field(        __u64,          exit_info2              )
                 __field(        __u32,          exit_int_info           )
                 __field(        __u32,          exit_int_info_err       )
-                __field(        __u32,          isa                     )
         ),
 
         TP_fast_assign(
@@ -582,14 +540,12 @@ TRACE_EVENT(kvm_nested_vmexit_inject,
                 __entry->exit_info2             = exit_info2;
                 __entry->exit_int_info          = exit_int_info;
                 __entry->exit_int_info_err      = exit_int_info_err;
-                __entry->isa                    = isa;
         ),
 
         TP_printk("reason: %s ext_inf1: 0x%016llx "
                   "ext_inf2: 0x%016llx ext_int: 0x%08x ext_int_err: 0x%08x",
-                 (__entry->isa == KVM_ISA_VMX) ?
-                 __print_symbolic(__entry->exit_code, VMX_EXIT_REASONS) :
-                 __print_symbolic(__entry->exit_code, SVM_EXIT_REASONS),
+                  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)
 );
@@ -656,6 +612,16 @@ TRACE_EVENT(kvm_skinit,
                   __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)
@@ -722,7 +688,7 @@ TRACE_EVENT(kvm_emulate_insn,
 
         TP_printk("%x:%llx:%s (%s)%s",
                   __entry->csbase, __entry->rip,
-                  __print_hex(__entry->insn, __entry->len),
+                  __print_insn(__entry->insn, __entry->len),
                   __print_symbolic(__entry->flags,
                                    kvm_trace_symbol_emul_flags),
                   __entry->failed ? " failed" : ""
@@ -755,68 +721,6 @@ TRACE_EVENT(
                   __entry->write ? "Write" : "Read",
                   __entry->gpa_match ? "GPA" : "GVA")
 );
-
-#ifdef CONFIG_X86_64
-
-#define host_clocks                                     \
-        {VCLOCK_NONE, "none"},                          \
-        {VCLOCK_TSC,  "tsc"},                           \
-        {VCLOCK_HPET, "hpet"}                           \
-
-TRACE_EVENT(kvm_update_master_clock,
-        TP_PROTO(bool use_master_clock, unsigned int host_clock, bool offset_matched),
-        TP_ARGS(use_master_clock, host_clock, offset_matched),
-
-        TP_STRUCT__entry(
-                __field(                bool,   use_master_clock        )
-                __field(        unsigned int,   host_clock              )
-                __field(                bool,   offset_matched          )
-        ),
-
-        TP_fast_assign(
-                __entry->use_master_clock       = use_master_clock;
-                __entry->host_clock             = host_clock;
-                __entry->offset_matched         = offset_matched;
-        ),
-
-        TP_printk("masterclock %d hostclock %s offsetmatched %u",
-                  __entry->use_master_clock,
-                  __print_symbolic(__entry->host_clock, host_clocks),
-                  __entry->offset_matched)
-);
-
-TRACE_EVENT(kvm_track_tsc,
-        TP_PROTO(unsigned int vcpu_id, unsigned int nr_matched,
-                 unsigned int online_vcpus, bool use_master_clock,
-                 unsigned int host_clock),
-        TP_ARGS(vcpu_id, nr_matched, online_vcpus, use_master_clock,
-                host_clock),
-
-        TP_STRUCT__entry(
-                __field(        unsigned int,   vcpu_id                 )
-                __field(        unsigned int,   nr_vcpus_matched_tsc    )
-                __field(        unsigned int,   online_vcpus            )
-                __field(        bool,           use_master_clock        )
-                __field(        unsigned int,   host_clock              )
-        ),
-
-        TP_fast_assign(
-                __entry->vcpu_id                = vcpu_id;
-                __entry->nr_vcpus_matched_tsc   = nr_matched;
-                __entry->online_vcpus           = online_vcpus;
-                __entry->use_master_clock       = use_master_clock;
-                __entry->host_clock             = host_clock;
-        ),
-
-        TP_printk("vcpu_id %u masterclock %u offsetmatched %u nr_online %u"
-                  " hostclock %s",
-                  __entry->vcpu_id, __entry->use_master_clock,
-                  __entry->nr_vcpus_matched_tsc, __entry->online_vcpus,
-                  __print_symbolic(__entry->host_clock, host_clocks))
-);
-
-#endif /* CONFIG_X86_64 */
-
 #endif /* _TRACE_KVM_H */
 
 #undef TRACE_INCLUDE_PATH