Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d87d26b authored by Adrian Hunter's avatar Adrian Hunter Committed by Greg Kroah-Hartman
Browse files

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: 45bfb2e5 ("perf: Add AUX area to ring buffer for raw data streams")
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20240624201101.60186-5-adrian.hunter@intel.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 818c1f5f

kernel/events/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -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, ...)	\