tools/perf: Move kvm-stat header file from conditional inclusion to common include section
PATCH v2 1/3 tools/perf: Move kvm-stat header file from conditional inclusion to common include section
Move kvm-stat header file to the common include section, and make the definitions in the header file under the conditional inclusion #ifdef HAVE_KVM_STAT_SUPPORT.
This helps to define other perf kvm related function prototypes in kvm-stat header file, which may not need kvm-stat support.
--- tools/perf/builtin-kvm.c | 2 +- tools/perf/util/kvm-stat.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)
tools/perf/builtin-kvm.c +1 -1
@@ -19,6 +19,7 @@#include "util/top.h" #include "util/data.h" #include "util/ordered-events.h" +#include "util/kvm-stat.h" #include <sys/prctl.h> #ifdef HAVE_TIMERFD_SUPPORT
@@ -55,7 +56,6 @@ static const char *get_filename_for_perf_kvm(void) }#ifdef HAVE_KVM_STAT_SUPPORT -#include "util/kvm-stat.h" void exit_event_get_key(struct perf_evsel *evsel, struct perf_sample *sample,
tools/perf/util/kvm-stat.h +3 -0
@@ -2,6 +2,8 @@#ifndef __PERF_KVM_STAT_H#define __PERF_KVM_STAT_H +#ifdef HAVE_KVM_STAT_SUPPORT +#include "../perf.h" #include "tool.h" #include "stat.h"
@@ -144,5 +146,6 @@ extern const int decode_str_len;extern const char *kvm_exit_reason;extern const char *kvm_entry_trace;extern const char *kvm_exit_trace; +#endif /* HAVE_KVM_STAT_SUPPORT */ #endif /* __PERF_KVM_STAT_H */
Signature · 1 line
2.20.1
PATCH v2 2/3 tools/perf: Add arch neutral function to choose event for perf kvm record
'perf kvm record' uses 'cycles'(if the user did not specify any event) as the default event to profile the guest.
This will not provide any proper samples from the guest incase of powerpc architecture, since in powerpc the PMUs are controlled by the guest rather than the host.
Patch adds a function to pick an arch specific event for 'perf kvm record', instead of selecting 'cycles' as a default event for all architectures.
For powerpc this function checks for any user specified event, and if there isn't any it returns invalid instead of proceeding with 'cycles' event.
---
Changes from v1->v2
* Cross-build issue for aarch64, reported by Ravi is fixed.
---
tools/perf/arch/powerpc/util/kvm-stat.c | 37 +++++++++++++++++++++++++ tools/perf/builtin-kvm.c | 12 +++++++- tools/perf/util/kvm-stat.h | 1 + 3 files changed, 49 insertions(+), 1 deletion(-)
tools/perf/arch/powerpc/util/kvm-stat.c +37 -0
@@ -8,6 +8,7 @@#include "book3s_hv_exits.h" #include "book3s_hcalls.h" +#include <subcmd/parse-options.h> #define NR_TPS 4
@@ -172,3 +173,39 @@ int cpu_isa_init(struct perf_kvm_stat *kvm, const char *cpuid __maybe_unused)return ret; } + +/* +* Incase of powerpc architecture, pmu registers are programmable +* by guest kernel. So monitoring guest via host may not provide +* valid samples. It is better to fail the "perf kvm record" +* with default "cycles" event to monitor guest in powerpc. +* +* Function to parse the arguments and return appropriate values. +*/ +int kvm_add_default_arch_event (int *argc,const char **argv) +{ +const char **tmp; +bool event = false; +int i, j = *argc; + +const struct option event_options[] = { +OPT_BOOLEAN ('e' ,"event" , &event,NULL ), +OPT_END () + }; + + tmp =calloc (j +1 ,sizeof (char *)); +if (!tmp) +return -EINVAL ; + +for (i =0 ; i < j; i++) + tmp[i] = argv[i]; + +parse_options (j, tmp, event_options,NULL ,PARSE_OPT_KEEP_UNKNOWN ); +if (!event) { +free (tmp); +return -EINVAL ; + } + +free (tmp); +return 0 ; +}
tools/perf/builtin-kvm.c +11 -1
@@ -1510,11 +1510,21 @@ static int kvm_cmd_stat(const char *file_name, int argc, const char **argv) }#endif /* HAVE_KVM_STAT_SUPPORT */ +int __weak kvm_add_default_arch_event (int *argc__maybe_unused , +const char **argv__maybe_unused ) +{ +return 0 ; +} +static int __cmd_record (const char *file_name,int argc,const char **argv) { -int rec_argc, i =0 , j; +int rec_argc, i =0 , j, ret;const char **rec_argv; + ret =kvm_add_default_arch_event (&argc, argv); +if (ret) +return -EINVAL ; + rec_argc = argc +2 ; rec_argv =calloc (rec_argc +1 ,sizeof (char *)); rec_argv[i++] =strdup ("record" );
tools/perf/util/kvm-stat.h +1 -0
@@ -148,4 +148,5 @@ extern const char *kvm_entry_trace;extern const char *kvm_exit_trace;#endif /* HAVE_KVM_STAT_SUPPORT */ +extern int kvm_add_default_arch_event (int *argc,const char **argv);#endif /* __PERF_KVM_STAT_H */
Signature · 1 line
2.20.1
[tip: perf/urgent] perf kvm: Add arch neutral function to choose event for perf kvm record
The following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 124eb5f82bf9395419b20205c4dcc1b8fcda7f29 Gitweb: https://git.kernel.org/tip/124eb5f82bf9395419b20205c4dcc1b8fcda7f29 Author: Anju T Sudhakar <[email protected]> AuthorDate: Thu, 18 Jul 2019 23:47:48 +05:30 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Fri, 20 Sep 2019 10:28:26 -03:00
perf kvm: Add arch neutral function to choose event for perf kvm record
'perf kvm record' uses 'cycles'(if the user did not specify any event) as the default event to profile the guest.
This will not provide any proper samples from the guest incase of powerpc architecture, since in powerpc the PMUs are controlled by the guest rather than the host.
Patch adds a function to pick an arch specific event for 'perf kvm record', instead of selecting 'cycles' as a default event for all architectures.
For powerpc this function checks for any user specified event, and if there isn't any it returns invalid instead of proceeding with 'cycles' event.
--- tools/perf/arch/powerpc/util/kvm-stat.c | 37 ++++++++++++++++++++++++- tools/perf/builtin-kvm.c | 12 +++++++- tools/perf/util/kvm-stat.h | 1 +- 3 files changed, 49 insertions(+), 1 deletion(-)
tools/perf/arch/powerpc/util/kvm-stat.c +37 -0
@@ -8,6 +8,7 @@#include "book3s_hv_exits.h" #include "book3s_hcalls.h" +#include <subcmd/parse-options.h> #define NR_TPS 4
@@ -172,3 +173,39 @@ int cpu_isa_init(struct perf_kvm_stat *kvm, const char *cpuid __maybe_unused)return ret; } + +/* +* Incase of powerpc architecture, pmu registers are programmable +* by guest kernel. So monitoring guest via host may not provide +* valid samples. It is better to fail the "perf kvm record" +* with default "cycles" event to monitor guest in powerpc. +* +* Function to parse the arguments and return appropriate values. +*/ +int kvm_add_default_arch_event (int *argc,const char **argv) +{ +const char **tmp; +bool event = false; +int i, j = *argc; + +const struct option event_options[] = { +OPT_BOOLEAN ('e' ,"event" , &event,NULL ), +OPT_END () + }; + + tmp =calloc (j +1 ,sizeof (char *)); +if (!tmp) +return -EINVAL ; + +for (i =0 ; i < j; i++) + tmp[i] = argv[i]; + +parse_options (j, tmp, event_options,NULL ,PARSE_OPT_KEEP_UNKNOWN ); +if (!event) { +free (tmp); +return -EINVAL ; + } + +free (tmp); +return 0 ; +}
tools/perf/builtin-kvm.c +11 -1
@@ -1514,11 +1514,21 @@ perf_stat: }#endif /* HAVE_KVM_STAT_SUPPORT */ +int __weak kvm_add_default_arch_event (int *argc__maybe_unused , +const char **argv__maybe_unused ) +{ +return 0 ; +} +static int __cmd_record (const char *file_name,int argc,const char **argv) { -int rec_argc, i =0 , j; +int rec_argc, i =0 , j, ret;const char **rec_argv; + ret =kvm_add_default_arch_event (&argc, argv); +if (ret) +return -EINVAL ; + rec_argc = argc +2 ; rec_argv =calloc (rec_argc +1 ,sizeof (char *)); rec_argv[i++] =strdup ("record" );
tools/perf/util/kvm-stat.h +1 -0
@@ -148,4 +148,5 @@ extern const char *kvm_entry_trace;extern const char *kvm_exit_trace;#endif /* HAVE_KVM_STAT_SUPPORT */ +extern int kvm_add_default_arch_event (int *argc,const char **argv);#endif /* __PERF_KVM_STAT_H */
PATCH v2 3/3 tools/perf: Set 'trace_cycles' as defaultevent for perf kvm record in powerpc
In reply to Anju T SudhakarUse 'trace_imc/trace_cycles' as the default event for 'perf kvm record' in powerpc.
--- tools/perf/arch/powerpc/util/kvm-stat.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
tools/perf/arch/powerpc/util/kvm-stat.c +11 -4
@@ -177,8 +177,9 @@ int cpu_isa_init(struct perf_kvm_stat *kvm, const char *cpuid __maybe_unused)/* * Incase of powerpc architecture, pmu registers are programmable * by guest kernel. So monitoring guest via host may not provide -* valid samples. It is better to fail the "perf kvm record" -* with default "cycles" event to monitor guest in powerpc. +* valid samples with default 'cycles' event. It is better to use +* 'trace_imc/trace_cycles' event for guest profiling, since it +* can track the guest instruction pointer in the trace-record. * * Function to parse the arguments and return appropriate values. */
@@ -202,8 +203,14 @@ int kvm_add_default_arch_event(int *argc, const char **argv)parse_options (j, tmp, event_options,NULL ,PARSE_OPT_KEEP_UNKNOWN );if (!event) { -free (tmp); -return -EINVAL ; +if (pmu_have_event ("trace_imc" ,"trace_cycles" )) { + argv[j++] =strdup ("-e" ); + argv[j++] =strdup ("trace_imc/trace_cycles/" ); + *argc +=2 ; + }else { +free (tmp); +return -EINVAL ; + } }free (tmp);
Signature · 1 line
2.20.1
[tip: perf/urgent] perf kvm stat: Set 'trace_cycles' as default event for 'perf kvm record' in powerpc
The following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 2bff2b828502b5e5d5ea5a52643d3542053df03f Gitweb: https://git.kernel.org/tip/2bff2b828502b5e5d5ea5a52643d3542053df03f Author: Anju T Sudhakar <[email protected]> AuthorDate: Thu, 18 Jul 2019 23:47:49 +05:30 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Fri, 20 Sep 2019 10:28:26 -03:00
perf kvm stat: Set 'trace_cycles' as default event for 'perf kvm record' in powerpc
Use 'trace_imc/trace_cycles' as the default event for 'perf kvm record' in powerpc.
--- tools/perf/arch/powerpc/util/kvm-stat.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
tools/perf/arch/powerpc/util/kvm-stat.c +12 -4
@@ -5,6 +5,7 @@#include "util/debug.h" #include "util/evsel.h" #include "util/evlist.h" +#include "util/pmu.h" #include "book3s_hv_exits.h" #include "book3s_hcalls.h"
@@ -177,8 +178,9 @@ int cpu_isa_init(struct perf_kvm_stat *kvm, const char *cpuid __maybe_unused)/* * Incase of powerpc architecture, pmu registers are programmable * by guest kernel. So monitoring guest via host may not provide -* valid samples. It is better to fail the "perf kvm record" -* with default "cycles" event to monitor guest in powerpc. +* valid samples with default 'cycles' event. It is better to use +* 'trace_imc/trace_cycles' event for guest profiling, since it +* can track the guest instruction pointer in the trace-record. * * Function to parse the arguments and return appropriate values. */
@@ -202,8 +204,14 @@ int kvm_add_default_arch_event(int *argc, const char **argv)parse_options (j, tmp, event_options,NULL ,PARSE_OPT_KEEP_UNKNOWN );if (!event) { -free (tmp); -return -EINVAL ; +if (pmu_have_event ("trace_imc" ,"trace_cycles" )) { + argv[j++] =strdup ("-e" ); + argv[j++] =strdup ("trace_imc/trace_cycles/" ); + *argc +=2 ; + }else { +free (tmp); +return -EINVAL ; + } }free (tmp);
LGTM. For the series,
Arnaldo Carvalho de Melo
AppliedEm Fri, Jul 19, 2019 at 10:58:37AM +0530, Ravi Bangoria escreveu:
Quoted 4 lines
LGTM. For the series,
Reviewed-by Ravi Bangoria <[email protected]>
Thanks, applied.
- Arnaldo
[tip: perf/urgent] perf kvm: Move kvm-stat header file from conditional inclusion to common include section
In reply to Anju T SudhakarThe following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 8067b3da970baa12e6045400fdf009673b8dd3c2 Gitweb: https://git.kernel.org/tip/8067b3da970baa12e6045400fdf009673b8dd3c2 Author: Anju T Sudhakar <[email protected]> AuthorDate: Thu, 18 Jul 2019 23:47:47 +05:30 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Fri, 20 Sep 2019 10:28:26 -03:00
perf kvm: Move kvm-stat header file from conditional inclusion to common include section
Move kvm-stat header file to the common include section, and make the definitions in the header file under the conditional inclusion #ifdef HAVE_KVM_STAT_SUPPORT.
This helps to define other 'perf kvm' related function prototypes in kvm-stat header file, which may not need kvm-stat support.
--- tools/perf/builtin-kvm.c | 2 +- tools/perf/util/kvm-stat.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)
tools/perf/builtin-kvm.c +1 -1
@@ -21,6 +21,7 @@#include "util/top.h" #include "util/data.h" #include "util/ordered-events.h" +#include "util/kvm-stat.h" #include "ui/ui.h" #include <sys/prctl.h>
@@ -59,7 +60,6 @@ static const char *get_filename_for_perf_kvm(void) }#ifdef HAVE_KVM_STAT_SUPPORT -#include "util/kvm-stat.h" void exit_event_get_key(struct evsel *evsel, struct perf_sample *sample,
tools/perf/util/kvm-stat.h +3 -0
@@ -2,6 +2,8 @@#ifndef __PERF_KVM_STAT_H#define __PERF_KVM_STAT_H +#ifdef HAVE_KVM_STAT_SUPPORT +#include "tool.h" #include "stat.h" #include "record.h"
@@ -144,5 +146,6 @@ extern const int decode_str_len;extern const char *kvm_exit_reason;extern const char *kvm_entry_trace;extern const char *kvm_exit_trace; +#endif /* HAVE_KVM_STAT_SUPPORT */ #endif /* __PERF_KVM_STAT_H */