From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
Jan Kiszka <jan.kiszka@siemens.com>
Subject: [PATCH 3/4] tools lib traceevent: Add back in kvm plugins nested_vmexit events
Date: Thu, 12 Jun 2014 22:10:05 -0400 [thread overview]
Message-ID: <20140613021157.291421941@goodmis.org> (raw)
In-Reply-To: 20140613021002.444608350@goodmis.org
[-- Attachment #1: 0003-tools-lib-traceevent-Add-back-in-kvm-plugin-s-nested.patch --]
[-- Type: text/plain, Size: 3041 bytes --]
From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>
The nested vmexit events were removed from the backport from trace-cmd because
they were considered buggy. They have since been updated in trace-cmd but
are still missing from the traceevent library. Add back in the buggy
version to be able to backport the fixes.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
tools/lib/traceevent/plugin_kvm.c | 41 +++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/tools/lib/traceevent/plugin_kvm.c b/tools/lib/traceevent/plugin_kvm.c
index 2d7d1d7df0a8..0d437837569f 100644
--- a/tools/lib/traceevent/plugin_kvm.c
+++ b/tools/lib/traceevent/plugin_kvm.c
@@ -326,6 +326,35 @@ 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)
+{
+ unsigned long long val;
+
+ pevent_print_num_field(s, " rip %0x016llx", event, "rip", record, 1);
+
+ if (pevent_get_field_val(s, event, "exit_code", record, &val, 1) < 0)
+ return -1;
+
+ trace_seq_printf(s, "reason %s", find_exit_reason(2, val));
+
+ pevent_print_num_field(s, " ext_inf1: %0x016llx", event, "exit_info1", record, 1);
+ pevent_print_num_field(s, " ext_inf2: %0x016llx", event, "exit_info2", record, 1);
+ pevent_print_num_field(s, " ext_int: %0x016llx", event, "exit_int_info", record, 1);
+ pevent_print_num_field(s, " ext_int_err: %0x016llx", 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 %0x016llx", event, "rip", record, 1);
+
+ return kvm_nested_vmexit_inject_handler(s, record, event, context);
+}
+
union kvm_mmu_page_role {
unsigned word;
struct {
@@ -422,6 +451,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);
@@ -456,6 +491,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);
--
2.0.0.rc2
next prev parent reply other threads:[~2014-06-13 2:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-13 2:10 [PATCH 0/4] tools lib tracing: Updates from trace-cmd for plugin_kvm Steven Rostedt
2014-06-13 2:10 ` [PATCH 1/4] tools lib traceevent: Report unknown VMX exit reasons with code Steven Rostedt
2014-06-13 2:10 ` [PATCH 2/4] tools lib traceevent: Factor out print_exit_reason in kvm plugin Steven Rostedt
2014-06-13 2:10 ` Steven Rostedt [this message]
2014-06-25 5:49 ` [tip:perf/core] tools lib traceevent: Add back in kvm plugins nested_vmexit events tip-bot for Steven Rostedt (Red Hat)
2014-06-13 2:10 ` [PATCH 4/4] tools lib traceevent: Fix and cleanup kvm_nested_vmexit tracepoints Steven Rostedt
2014-06-13 9:55 ` Namhyung Kim
2014-06-13 13:59 ` Steven Rostedt
2014-06-13 14:31 ` [PATCH 5/4] tools lib traceevent: Fix format in plugin_kvm Steven Rostedt
2014-06-25 5:49 ` [tip:perf/core] " tip-bot for Steven Rostedt
2014-06-16 8:02 ` [PATCH 0/4] tools lib tracing: Updates from trace-cmd for plugin_kvm Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140613021157.291421941@goodmis.org \
--to=rostedt@goodmis.org \
--cc=jan.kiszka@siemens.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=namhyung@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).