Commit f42907e8 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo

perf script: Add missing PERF_IP_FLAG_CHARS for VM-Entry and VM-Exit

Add 'g' (guest) for VM-Entry and 'h' (host) for VM-Exit.

Fixes: c025d46c ("perf script: Add branch types for VM-Entry and VM-Exit")
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lore.kernel.org/lkml/20210521175127.27264-1-adrian.hunter@intel.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent f56299a9
...@@ -108,9 +108,9 @@ displayed as follows: ...@@ -108,9 +108,9 @@ displayed as follows:
perf script --itrace=ibxwpe -F+flags perf script --itrace=ibxwpe -F+flags
The flags are "bcrosyiABEx" which stand for branch, call, return, conditional, The flags are "bcrosyiABExgh" which stand for branch, call, return, conditional,
system, asynchronous, interrupt, transaction abort, trace begin, trace end, and system, asynchronous, interrupt, transaction abort, trace begin, trace end,
in transaction, respectively. in transaction, VM-entry, and VM-exit respectively.
perf script also supports higher level ways to dump instruction traces: perf script also supports higher level ways to dump instruction traces:
......
...@@ -183,14 +183,15 @@ OPTIONS ...@@ -183,14 +183,15 @@ OPTIONS
At this point usage is displayed, and perf-script exits. At this point usage is displayed, and perf-script exits.
The flags field is synthesized and may have a value when Instruction The flags field is synthesized and may have a value when Instruction
Trace decoding. The flags are "bcrosyiABEx" which stand for branch, Trace decoding. The flags are "bcrosyiABExgh" which stand for branch,
call, return, conditional, system, asynchronous, interrupt, call, return, conditional, system, asynchronous, interrupt,
transaction abort, trace begin, trace end, and in transaction, transaction abort, trace begin, trace end, in transaction, VM-Entry, and VM-Exit
respectively. Known combinations of flags are printed more nicely e.g. respectively. Known combinations of flags are printed more nicely e.g.
"call" for "bc", "return" for "br", "jcc" for "bo", "jmp" for "b", "call" for "bc", "return" for "br", "jcc" for "bo", "jmp" for "b",
"int" for "bci", "iret" for "bri", "syscall" for "bcs", "sysret" for "brs", "int" for "bci", "iret" for "bri", "syscall" for "bcs", "sysret" for "brs",
"async" for "by", "hw int" for "bcyi", "tx abrt" for "bA", "tr strt" for "bB", "async" for "by", "hw int" for "bcyi", "tx abrt" for "bA", "tr strt" for "bB",
"tr end" for "bE". However the "x" flag will be display separately in those "tr end" for "bE", "vmentry" for "bcg", "vmexit" for "bch".
However the "x" flag will be displayed separately in those
cases e.g. "jcc (x)" for a condition branch within a transaction. cases e.g. "jcc (x)" for a condition branch within a transaction.
The callindent field is synthesized and may have a value when The callindent field is synthesized and may have a value when
......
...@@ -100,7 +100,7 @@ enum { ...@@ -100,7 +100,7 @@ enum {
PERF_IP_FLAG_VMEXIT = 1ULL << 12, PERF_IP_FLAG_VMEXIT = 1ULL << 12,
}; };
#define PERF_IP_FLAG_CHARS "bcrosyiABEx" #define PERF_IP_FLAG_CHARS "bcrosyiABExgh"
#define PERF_BRANCH_MASK (\ #define PERF_BRANCH_MASK (\
PERF_IP_FLAG_BRANCH |\ PERF_IP_FLAG_BRANCH |\
......
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