korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 04:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf intel-pt: Fix aux_watermark calculation for 64-bit size

Browse Source 
[ Upstream commit 36b4cd990a ]

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: 874fc35cdd ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Adrian Hunter 2024-06-25 13:45:31 +03:00 committed by Greg Kroah-Hartman
parent b7182f73d7
commit f44c448bfb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/perf/arch/x86/util/intel-pt.c
View File

@ -758,7 +758,8 @@ static int intel_pt_recording_options(struct auxtrace_record *itr,
} }
if (!opts->auxtrace_snapshot_mode && !opts->auxtrace_sample_mode) { 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; intel_pt_evsel->core.attr.aux_watermark = aux_watermark;
} }