summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@intel.com>2024-06-24 23:10:58 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-08-19 05:33:29 +0200
commit7d87d26bd186456cf90e19a28f89b07901cb225f (patch)
treee66c11102285e89e86a5ed0ec252fa22a5525292 /kernel
parent818c1f5ff39f5ede713adb3b97f459411955bc8e (diff)
downloadlinux-7d87d26bd186456cf90e19a28f89b07901cb225f.tar.gz
linux-7d87d26bd186456cf90e19a28f89b07901cb225f.tar.bz2
linux-7d87d26bd186456cf90e19a28f89b07901cb225f.zip
perf: Fix perf_aux_size() for greater-than 32-bit size
[ Upstream commit 3df94a5b1078dfe2b0c03f027d018800faf44c82 ] perf_buffer->aux_nr_pages uses a 32-bit type, so a cast is needed to calculate a 64-bit size. Fixes: 45bfb2e50471 ("perf: Add AUX area to ring buffer for raw data streams") Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lore.kernel.org/r/20240624201101.60186-5-adrian.hunter@intel.com Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/events/internal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/internal.h b/kernel/events/internal.h
index 6e87b358e082..30218d7c74e6 100644
--- a/kernel/events/internal.h
+++ b/kernel/events/internal.h
@@ -122,7 +122,7 @@ static inline unsigned long perf_data_size(struct ring_buffer *rb)
static inline unsigned long perf_aux_size(struct ring_buffer *rb)
{
- return rb->aux_nr_pages << PAGE_SHIFT;
+ return (unsigned long)rb->aux_nr_pages << PAGE_SHIFT;
}
#define __DEFINE_OUTPUT_COPY_BODY(advance_buf, memcpy_func, ...) \