[tip:perf/core] tools lib traceevent: Report unknown VMX exit reasons with code

From: tip-bot for Jan Kiszka
Date: Wed Jun 25 2014 - 01:49:47 EST


Commit-ID: 20d3cbd75ef17b96dfb4f5f1600c0278d330f5ca
Gitweb: http://git.kernel.org/tip/20d3cbd75ef17b96dfb4f5f1600c0278d330f5ca
Author: Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
AuthorDate: Thu, 12 Jun 2014 22:10:03 -0400
Committer: Jiri Olsa <jolsa@xxxxxxxxxx>
CommitDate: Thu, 19 Jun 2014 18:17:54 +0200

tools lib traceevent: Report unknown VMX exit reasons with code

Allows to parse the result even if the KVM plugin does not yet
understand a specific exit code.

Link: http://lkml.kernel.org/r/5207446F.1090703@xxxxxx

Acked-by: Namhyung Kim <namhyung@xxxxxxxxxx>
Signed-off-by: Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
---
tools/lib/traceevent/plugin_kvm.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/lib/traceevent/plugin_kvm.c b/tools/lib/traceevent/plugin_kvm.c
index 9e0e8c6..3e61220 100644
--- a/tools/lib/traceevent/plugin_kvm.c
+++ b/tools/lib/traceevent/plugin_kvm.c
@@ -240,9 +240,8 @@ static const char *find_exit_reason(unsigned isa, int val)
for (i = 0; strings[i].val >= 0; i++)
if (strings[i].val == val)
break;
- if (strings[i].str)
- return strings[i].str;
- return "UNKNOWN";
+
+ return strings[i].str;
}

static int kvm_exit_handler(struct trace_seq *s, struct pevent_record *record,
@@ -251,6 +250,7 @@ static int kvm_exit_handler(struct trace_seq *s, struct pevent_record *record,
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)
return -1;
@@ -258,7 +258,11 @@ static int kvm_exit_handler(struct trace_seq *s, struct pevent_record *record,
if (pevent_get_field_val(s, event, "isa", record, &isa, 0) < 0)
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);

pevent_print_num_field(s, " rip 0x%lx", event, "guest_rip", record, 1);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/