Commit 1c92f885 authored by Ingo Molnar's avatar Ingo Molnar

Merge tag 'perf-core-for-mingo' of...

Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf into perf/core

Pull perf/core improvements and fixes from Jiri Olsa:

  * Updates from trace-cmd for traceevent plugin_kvm plus args cleanup (Steven Rostedt, Jan Kiszka)
Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 06c654ca 1545d8ac
...@@ -5,8 +5,7 @@ ...@@ -5,8 +5,7 @@
#include "event-parse.h" #include "event-parse.h"
static unsigned long long static unsigned long long
process___le16_to_cpup(struct trace_seq *s, process___le16_to_cpup(struct trace_seq *s, unsigned long long *args)
unsigned long long *args)
{ {
uint16_t *val = (uint16_t *) (unsigned long) args[0]; uint16_t *val = (uint16_t *) (unsigned long) args[0];
return val ? (long long) le16toh(*val) : 0; return val ? (long long) le16toh(*val) : 0;
......
...@@ -30,8 +30,7 @@ ...@@ -30,8 +30,7 @@
#define MINOR(dev) ((unsigned int) ((dev) & MINORMASK)) #define MINOR(dev) ((unsigned int) ((dev) & MINORMASK))
static unsigned long long static unsigned long long
process_jbd2_dev_to_name(struct trace_seq *s, process_jbd2_dev_to_name(struct trace_seq *s, unsigned long long *args)
unsigned long long *args)
{ {
unsigned int dev = args[0]; unsigned int dev = args[0];
...@@ -40,8 +39,7 @@ process_jbd2_dev_to_name(struct trace_seq *s, ...@@ -40,8 +39,7 @@ process_jbd2_dev_to_name(struct trace_seq *s,
} }
static unsigned long long static unsigned long long
process_jiffies_to_msecs(struct trace_seq *s, process_jiffies_to_msecs(struct trace_seq *s, unsigned long long *args)
unsigned long long *args)
{ {
unsigned long long jiffies = args[0]; unsigned long long jiffies = args[0];
......
...@@ -240,25 +240,38 @@ static const char *find_exit_reason(unsigned isa, int val) ...@@ -240,25 +240,38 @@ static const char *find_exit_reason(unsigned isa, int val)
for (i = 0; strings[i].val >= 0; i++) for (i = 0; strings[i].val >= 0; i++)
if (strings[i].val == val) if (strings[i].val == val)
break; break;
if (strings[i].str)
return strings[i].str; return strings[i].str;
return "UNKNOWN";
} }
static int kvm_exit_handler(struct trace_seq *s, struct pevent_record *record, static int print_exit_reason(struct trace_seq *s, struct pevent_record *record,
struct event_format *event, void *context) struct event_format *event, const char *field)
{ {
unsigned long long isa; unsigned long long isa;
unsigned long long val; 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; return -1;
if (pevent_get_field_val(s, event, "isa", record, &isa, 0) < 0) if (pevent_get_field_val(s, event, "isa", record, &isa, 0) < 0)
isa = 1; isa = 1;
trace_seq_printf(s, "reason %s", find_exit_reason(isa, val)); reason = find_exit_reason(isa, val);
if (reason)
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); pevent_print_num_field(s, " rip 0x%lx", event, "guest_rip", record, 1);
...@@ -313,6 +326,29 @@ static int kvm_emulate_insn_handler(struct trace_seq *s, ...@@ -313,6 +326,29 @@ static int kvm_emulate_insn_handler(struct trace_seq *s,
return 0; 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 { union kvm_mmu_page_role {
unsigned word; unsigned word;
struct { struct {
...@@ -409,6 +445,12 @@ int PEVENT_PLUGIN_LOADER(struct pevent *pevent) ...@@ -409,6 +445,12 @@ int PEVENT_PLUGIN_LOADER(struct pevent *pevent)
pevent_register_event_handler(pevent, -1, "kvm", "kvm_emulate_insn", pevent_register_event_handler(pevent, -1, "kvm", "kvm_emulate_insn",
kvm_emulate_insn_handler, NULL); 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", pevent_register_event_handler(pevent, -1, "kvmmmu", "kvm_mmu_get_page",
kvm_mmu_get_page_handler, NULL); kvm_mmu_get_page_handler, NULL);
...@@ -443,6 +485,12 @@ void PEVENT_PLUGIN_UNLOADER(struct pevent *pevent) ...@@ -443,6 +485,12 @@ void PEVENT_PLUGIN_UNLOADER(struct pevent *pevent)
pevent_unregister_event_handler(pevent, -1, "kvm", "kvm_emulate_insn", pevent_unregister_event_handler(pevent, -1, "kvm", "kvm_emulate_insn",
kvm_emulate_insn_handler, NULL); 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", pevent_unregister_event_handler(pevent, -1, "kvmmmu", "kvm_mmu_get_page",
kvm_mmu_get_page_handler, NULL); kvm_mmu_get_page_handler, NULL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment