Merge tag 'media/v4.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[karo-tx-linux.git] / tools / lib / traceevent / plugin_kvm.c

diff --git a/tools/lib/traceevent/plugin_kvm.c b/tools/lib/traceevent/plugin_kvm.c
index 3e6122067d67d4ff5ed43caa5746ee72d64aace1..88fe83dff7cdf4fb957a23670324138225affa86 100644 (file)
--- a/tools/lib/traceevent/plugin_kvm.c
+++ b/tools/lib/traceevent/plugin_kvm.c
@@ -244,15 +244,14 @@ static const char *find_exit_reason(unsigned isa, int val)
        return strings[i].str;
 }
 
-static int kvm_exit_handler(struct trace_seq *s, struct pevent_record *record,
-                           struct event_format *event, void *context)
+static int print_exit_reason(struct trace_seq *s, struct pevent_record *record,
+                            struct event_format *event, const char *field)
 {
        unsigned long long isa;
        unsigned long long val;
-       unsigned long long info1 = 0, info2 = 0;
        const char *reason;
 
-       if (pevent_get_field_val(s, event, "exit_reason", record, &val, 1) < 0)
+       if (pevent_get_field_val(s, event, field, record, &val, 1) < 0)
                return -1;
 
        if (pevent_get_field_val(s, event, "isa", record, &isa, 0) < 0)
@@ -263,6 +262,16 @@ static int kvm_exit_handler(struct trace_seq *s, struct pevent_record *record,
                trace_seq_printf(s, "reason %s", reason);
        else
                trace_seq_printf(s, "reason UNKNOWN (%llu)", val);
+       return 0;
+}
+
+static int kvm_exit_handler(struct trace_seq *s, struct pevent_record *record,
+                           struct event_format *event, void *context)
+{
+       unsigned long long info1 = 0, info2 = 0;
+
+       if (print_exit_reason(s, record, event, "exit_reason") < 0)
+               return -1;
 
        pevent_print_num_field(s, " rip 0x%lx", event, "guest_rip", record, 1);
 
@@ -317,6 +326,29 @@ static int kvm_emulate_insn_handler(struct trace_seq *s,
        return 0;
 }
 
+
+static int kvm_nested_vmexit_inject_handler(struct trace_seq *s, struct pevent_record *record,
+                                           struct event_format *event, void *context)
+{
+       if (print_exit_reason(s, record, event, "exit_code") < 0)
+               return -1;
+
+       pevent_print_num_field(s, " info1 %llx", event, "exit_info1", record, 1);
+       pevent_print_num_field(s, " info2 %llx", event, "exit_info2", record, 1);
+       pevent_print_num_field(s, " int_info %llx", event, "exit_int_info", record, 1);
+       pevent_print_num_field(s, " int_info_err %llx", event, "exit_int_info_err", record, 1);
+
+       return 0;
+}
+
+static int kvm_nested_vmexit_handler(struct trace_seq *s, struct pevent_record *record,
+                                    struct event_format *event, void *context)
+{
+       pevent_print_num_field(s, "rip %llx ", event, "rip", record, 1);
+
+       return kvm_nested_vmexit_inject_handler(s, record, event, context);
+}
+
 union kvm_mmu_page_role {
        unsigned word;
        struct {
@@ -413,6 +445,12 @@ int PEVENT_PLUGIN_LOADER(struct pevent *pevent)
        pevent_register_event_handler(pevent, -1, "kvm", "kvm_emulate_insn",
                                      kvm_emulate_insn_handler, NULL);
 
+       pevent_register_event_handler(pevent, -1, "kvm", "kvm_nested_vmexit",
+                                     kvm_nested_vmexit_handler, NULL);
+
+       pevent_register_event_handler(pevent, -1, "kvm", "kvm_nested_vmexit_inject",
+                                     kvm_nested_vmexit_inject_handler, NULL);
+
        pevent_register_event_handler(pevent, -1, "kvmmmu", "kvm_mmu_get_page",
                                      kvm_mmu_get_page_handler, NULL);
 
@@ -447,6 +485,12 @@ void PEVENT_PLUGIN_UNLOADER(struct pevent *pevent)
        pevent_unregister_event_handler(pevent, -1, "kvm", "kvm_emulate_insn",
                                        kvm_emulate_insn_handler, NULL);
 
+       pevent_unregister_event_handler(pevent, -1, "kvm", "kvm_nested_vmexit",
+                                       kvm_nested_vmexit_handler, NULL);
+
+       pevent_unregister_event_handler(pevent, -1, "kvm", "kvm_nested_vmexit_inject",
+                                       kvm_nested_vmexit_inject_handler, NULL);
+
        pevent_unregister_event_handler(pevent, -1, "kvmmmu", "kvm_mmu_get_page",
                                        kvm_mmu_get_page_handler, NULL);