perf intel-pt: Fix exclude_guest setting

[ Upstream commit b40934ae32232140e85dc7dc1c3ea0e296986723 ]

In the past, the exclude_guest setting has had no effect on Intel PT
tracing, but that may not be the case in the future.

Set the flag correctly based upon whether KVM is using Intel PT
"Host/Guest" mode, which is determined by the kvm_intel module
parameter pt_mode:

 pt_mode=0	System-wide mode : host and guest output to host buffer
 pt_mode=1	Host/Guest mode : host/guest output to host/guest
                buffers respectively

Fixes: 6e86bfdc4a ("perf intel-pt: Support decoding of guest kernel")
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20240625104532.11990-3-adrian.hunter@intel.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Adrian Hunter 2024-06-25 13:45:32 +03:00 коммит произвёл Greg Kroah-Hartman
Родитель d5f39d2b82
Коммит d856cb53b6
1 изменённых файлов: 12 добавлений и 0 удалений

Просмотреть файл

@ -31,6 +31,7 @@
#include "../../../util/tsc.h" #include "../../../util/tsc.h"
#include <internal/lib.h> // page_size #include <internal/lib.h> // page_size
#include "../../../util/intel-pt.h" #include "../../../util/intel-pt.h"
#include <api/fs/fs.h>
#define KiB(x) ((x) * 1024) #define KiB(x) ((x) * 1024)
#define MiB(x) ((x) * 1024 * 1024) #define MiB(x) ((x) * 1024 * 1024)
@ -438,6 +439,16 @@ static int intel_pt_track_switches(struct evlist *evlist)
return 0; return 0;
} }
static bool intel_pt_exclude_guest(void)
{
int pt_mode;
if (sysfs__read_int("module/kvm_intel/parameters/pt_mode", &pt_mode))
pt_mode = 0;
return pt_mode == 1;
}
static void intel_pt_valid_str(char *str, size_t len, u64 valid) static void intel_pt_valid_str(char *str, size_t len, u64 valid)
{ {
unsigned int val, last = 0, state = 1; unsigned int val, last = 0, state = 1;
@ -641,6 +652,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr,
} }
evsel->core.attr.freq = 0; evsel->core.attr.freq = 0;
evsel->core.attr.sample_period = 1; evsel->core.attr.sample_period = 1;
evsel->core.attr.exclude_guest = intel_pt_exclude_guest();
evsel->no_aux_samples = true; evsel->no_aux_samples = true;
intel_pt_evsel = evsel; intel_pt_evsel = evsel;
opts->full_auxtrace = true; opts->full_auxtrace = true;