averello/linux-stable-mirror
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2026-09-22 09:34:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

tracing: Fix trace_buf_size= cmdline parameter with sizes >= 2G

Browse Source 
commit d008ba8be8 upstream.

Some of the sizing logic through tracer_alloc_buffers() uses int
internally, causing unexpected behavior if the user passes a value that
does not fit in an int (on my x86 machine, the result is uselessly tiny
buffers).

Fix by plumbing the parameter's real type (unsigned long) through to the
ring buffer allocation functions, which already use unsigned long.

It has always been possible to create larger ring buffers via the sysfs
interface: this only affects the cmdline parameter.

Cc: stable@vger.kernel.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Link: https://patch.msgid.link/bff42a4288aada08bdf74da3f5b67a2c28b761f8.1772852067.git.calvin@wbinvd.org
Fixes: 73c5162aa3 ("tracing: keep ring buffer to minimum size till used")
Signed-off-by: Calvin Owens <calvin@wbinvd.org>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Calvin Owens
2026-03-25 11:05:54 +01:00
committed by Greg Kroah-Hartman
parent aeb7255531
commit e9311e199a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/trace/trace.c
+3 -3
View File
@@ -9271,7 +9271,7 @@ static void
init_tracer_tracefs(struct trace_array *tr, struct dentry *d_tracer);
static int
allocate_trace_buffer(struct trace_array *tr, struct array_buffer *buf, int size)
allocate_trace_buffer(struct trace_array *tr, struct array_buffer *buf, unsigned long size)
{
enum ring_buffer_flags rb_flags;
@@ -9307,7 +9307,7 @@ static void free_trace_buffer(struct array_buffer *buf)
}
}
static int allocate_trace_buffers(struct trace_array *tr, int size)
static int allocate_trace_buffers(struct trace_array *tr, unsigned long size)
{
int ret;
@@ -10330,7 +10330,7 @@ __init static void enable_instances(void)
__init static int tracer_alloc_buffers(void)
{
int ring_buf_size;
unsigned long ring_buf_size;
int ret = -ENOMEM;