mirror of https://github.com/torvalds/linux.git
perf tools kvm: Use "cycles" to sample guest for "kvm top" on Intel
As same reason with previous patch, use "cyles" instead of "cycles:P"
event by default to sample guest for "perf kvm top" command on Intel
platforms.
Fixes: cf8e55fe50 ("KVM: x86/pmu: Expose CPUIDs feature bits PDCM, DS, DTES64")
Reported-by: Kevin Tian <kevin.tian@intel.com>
Signed-off-by: Dapeng Mi <dapeng1.mi@linux.intel.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Like Xu <likexu@tencent.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
c1afca106e
commit
cbeb3d4784
|
|
@ -2084,6 +2084,38 @@ __cmd_buildid_list(const char *file_name, int argc, const char **argv)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int __cmd_top(int argc, const char **argv)
|
||||||
|
{
|
||||||
|
int rec_argc, i = 0, ret;
|
||||||
|
const char **rec_argv;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* kvm_add_default_arch_event() may add 2 extra options, so
|
||||||
|
* allocate 2 more pointers in adavance.
|
||||||
|
*/
|
||||||
|
rec_argc = argc + 2;
|
||||||
|
rec_argv = calloc(rec_argc + 1, sizeof(char *));
|
||||||
|
if (!rec_argv)
|
||||||
|
return -ENOMEM;
|
||||||
|
|
||||||
|
for (i = 0; i < argc; i++)
|
||||||
|
rec_argv[i] = STRDUP_FAIL_EXIT(argv[i]);
|
||||||
|
|
||||||
|
BUG_ON(i != argc);
|
||||||
|
|
||||||
|
ret = kvm_add_default_arch_event(&i, rec_argv);
|
||||||
|
if (ret)
|
||||||
|
goto EXIT;
|
||||||
|
|
||||||
|
ret = cmd_top(i, rec_argv);
|
||||||
|
|
||||||
|
EXIT:
|
||||||
|
for (i = 0; i < rec_argc; i++)
|
||||||
|
free((void *)rec_argv[i]);
|
||||||
|
free(rec_argv);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
int cmd_kvm(int argc, const char **argv)
|
int cmd_kvm(int argc, const char **argv)
|
||||||
{
|
{
|
||||||
const char *file_name = NULL;
|
const char *file_name = NULL;
|
||||||
|
|
@ -2144,7 +2176,7 @@ int cmd_kvm(int argc, const char **argv)
|
||||||
else if (strlen(argv[0]) > 2 && strstarts("diff", argv[0]))
|
else if (strlen(argv[0]) > 2 && strstarts("diff", argv[0]))
|
||||||
return cmd_diff(argc, argv);
|
return cmd_diff(argc, argv);
|
||||||
else if (!strcmp(argv[0], "top"))
|
else if (!strcmp(argv[0], "top"))
|
||||||
return cmd_top(argc, argv);
|
return __cmd_top(argc, argv);
|
||||||
else if (strlen(argv[0]) > 2 && strstarts("buildid-list", argv[0]))
|
else if (strlen(argv[0]) > 2 && strstarts("buildid-list", argv[0]))
|
||||||
return __cmd_buildid_list(file_name, argc, argv);
|
return __cmd_buildid_list(file_name, argc, argv);
|
||||||
#if defined(HAVE_KVM_STAT_SUPPORT) && defined(HAVE_LIBTRACEEVENT)
|
#if defined(HAVE_KVM_STAT_SUPPORT) && defined(HAVE_LIBTRACEEVENT)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue