summaryrefslogtreecommitdiff
path: root/tools/perf
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@intel.com>2024-06-25 13:45:31 +0300
committerNamhyung Kim <namhyung@kernel.org>2024-07-02 15:24:01 -0700
commit36b4cd990a8fd3f5b748883050e9d8c69fe6398d (patch)
treefc8a200e08577f0bcd56600aff4288c728e32796 /tools/perf
parent74ad3cb08b0166776c41a460b70034edb02acb65 (diff)
downloadlinux-36b4cd990a8fd3f5b748883050e9d8c69fe6398d.tar.gz
linux-36b4cd990a8fd3f5b748883050e9d8c69fe6398d.tar.bz2
linux-36b4cd990a8fd3f5b748883050e9d8c69fe6398d.zip
perf intel-pt: Fix aux_watermark calculation for 64-bit size
aux_watermark is a u32. For a 64-bit size, cap the aux_watermark calculation at UINT_MAX instead of truncating it to 32-bits. Fixes: 874fc35cdd55 ("perf intel-pt: Use aux_watermark") Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Link: https://lore.kernel.org/r/20240625104532.11990-2-adrian.hunter@intel.com Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/arch/x86/util/intel-pt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util/intel-pt.c
index 6de7e2d21075..c8fa15f280d2 100644
--- a/tools/perf/arch/x86/util/intel-pt.c
+++ b/tools/perf/arch/x86/util/intel-pt.c
@@ -758,7 +758,8 @@ static int intel_pt_recording_options(struct auxtrace_record *itr,
}
if (!opts->auxtrace_snapshot_mode && !opts->auxtrace_sample_mode) {
- u32 aux_watermark = opts->auxtrace_mmap_pages * page_size / 4;
+ size_t aw = opts->auxtrace_mmap_pages * (size_t)page_size / 4;
+ u32 aux_watermark = aw > UINT_MAX ? UINT_MAX : aw;
intel_pt_evsel->core.attr.aux_watermark = aux_watermark;
}