Re: [PATCH] perf script: Add missing PERF_IP_FLAG_CHARS for VM-Entry and VM-Exit

[Arnaldo Carvalho de Melo]

Em Fri, May 21, 2021 at 08:51:27PM +0300, Adrian Hunter escreveu:
> Add 'g' (guest) for VM-Entry and 'h' (host) for VM-Exit.

Thanks, applied.

- Arnaldo

 
> Fixes: c025d46cd932c ("perf script: Add branch types for VM-Entry and VM-Exit")
> Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>
> ---
>  tools/perf/Documentation/perf-intel-pt.txt | 6 +++---
>  tools/perf/Documentation/perf-script.txt   | 7 ++++---
>  tools/perf/util/event.h                    | 2 +-
>  3 files changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/tools/perf/Documentation/perf-intel-pt.txt b/tools/perf/Documentation/perf-intel-pt.txt
> index 8d6cce062a5f..e382dbd4ff0a 100644
> --- a/tools/perf/Documentation/perf-intel-pt.txt
> +++ b/tools/perf/Documentation/perf-intel-pt.txt
> @@ -108,9 +108,9 @@ displayed as follows:
>  
>  	perf script --itrace=ibxwpe -F+flags
>  
> -The flags are "bcrosyiABEx" which stand for branch, call, return, conditional,
> -system, asynchronous, interrupt, transaction abort, trace begin, trace end, and
> -in transaction, respectively.
> +The flags are "bcrosyiABExgh" which stand for branch, call, return, conditional,
> +system, asynchronous, interrupt, transaction abort, trace begin, trace end,
> +in transaction, VM-entry, and VM-exit respectively.
>  
>  perf script also supports higher level ways to dump instruction traces:
>  
> diff --git a/tools/perf/Documentation/perf-script.txt b/tools/perf/Documentation/perf-script.txt
> index 5b8b61075039..48a5f5b26dd4 100644
> --- a/tools/perf/Documentation/perf-script.txt
> +++ b/tools/perf/Documentation/perf-script.txt
> @@ -183,14 +183,15 @@ OPTIONS
>  	At this point usage is displayed, and perf-script exits.
>  
>  	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,
> -	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.
>  	"call" for "bc", "return" for "br", "jcc" for "bo", "jmp" for "b",
>  	"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",
> -	"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.
>  
>  	The callindent field is synthesized and may have a value when
> diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
> index 8a62fb39e365..19ad64f2bd83 100644
> --- a/tools/perf/util/event.h
> +++ b/tools/perf/util/event.h
> @@ -100,7 +100,7 @@ enum {
>  	PERF_IP_FLAG_VMEXIT		= 1ULL << 12,
>  };
>  
> -#define PERF_IP_FLAG_CHARS "bcrosyiABEx"
> +#define PERF_IP_FLAG_CHARS "bcrosyiABExgh"
>  
>  #define PERF_BRANCH_MASK		(\
>  	PERF_IP_FLAG_BRANCH		|\
> -- 
> 2.17.1
> 

-- 

- Arnaldo