FAILED: patch "[PATCH] ring-buffer: Initialise reader page order in" failed to apply to 6.12-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x 6d014e44b68ddd43f71288d2a4dbb1a259869149
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026081707-pajamas-stoplight-328c@gregkh' --subject-prefix 'PATCH 6.12.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 6d014e44b68ddd43f71288d2a4dbb1a259869149 Mon Sep 17 00:00:00 2001
From: Vincent Donnefort <[email protected]>
Date: Thu, 6 Aug 2026 22:13:03 +0100
Subject: [PATCH] ring-buffer: Initialise reader page order in
rb_allocate_cpu_buffer()
In rb_allocate_cpu_buffer(), bpage->order was omitted, leaving it as 0. This is an issue for a ring-buffer with subbufs bigger than PAGE_SIZE if when freed: free_buffer_page() relies on this value. Align the value with the actual allocation size (buffer::subbuf_order).
kernel/trace/ring_buffer.c +1 -0
@@ -2510,6 +2510,7 @@ rb_allocate_cpu_buffer(struct trace_buffer *buffer, long nr_pages, int cpu) bpage =alloc_cpu_page (cpu);if (!bpage)return NULL ; + bpage->order = cpu_buffer->buffer->subbuf_order;rb_check_bpage (cpu_buffer, bpage);
Sasha Levin
maintainerPATCH 1/2 ring-buffer: Simplify functions with __free(kfree) to free allocations
From: Steven Rostedt <[email protected]>
[ Upstream commit 99d232804405e35d7a9af1536a057578a1442e81 ]
The function rb_allocate_pages() allocates cpu_buffer and on error needs to free it. It has a single return. Use __free(kfree) and return directly on errors and have the return use return_ptr(cpu_buffer).
The function alloc_buffer() allocates buffer and on error needs to free it. It has a single return. Use __free(kfree) and return directly on errors and have the return use return_ptr(buffer).
The function __rb_map_vma() allocates a temporary array "pages". Have it use __free() and not worry about freeing it when returning.
Stable-dep-of: 6d014e44b68d ("ring-buffer: Initialise reader page order in rb_allocate_cpu_buffer()")
--- kernel/trace/ring_buffer.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-)
kernel/trace/ring_buffer.c +9 -18
@@ -2193,7 +2193,7 @@ static int rb_allocate_pages(struct ring_buffer_per_cpu *cpu_buffer,static struct ring_buffer_per_cpu *rb_allocate_cpu_buffer (struct trace_buffer *buffer,long nr_pages,int cpu) { -struct ring_buffer_per_cpu *cpu_buffer; + struct ring_buffer_per_cpu *cpu_buffer __free(kfree) = NULL;struct ring_buffer_meta *meta;struct buffer_page *bpage;struct page *page;
@@ -2219,7 +2219,7 @@ rb_allocate_cpu_buffer(struct trace_buffer *buffer, long nr_pages, int cpu) bpage =kzalloc_node (ALIGN (sizeof (*bpage),cache_line_size ()),GFP_KERNEL ,cpu_to_node (cpu));if (!bpage) - goto fail_free_buffer; +return NULL ;rb_check_bpage (cpu_buffer, bpage);
@@ -2285,13 +2285,11 @@ rb_allocate_cpu_buffer(struct trace_buffer *buffer, long nr_pages, int cpu)rb_head_page_activate (cpu_buffer); } -return cpu_buffer; +return_ptr (cpu_buffer); fail_free_reader:free_buffer_page (cpu_buffer->reader_page); - fail_free_buffer: -kfree (cpu_buffer);return NULL ; }
@@ -2335,7 +2333,7 @@ static struct trace_buffer *alloc_buffer(unsigned long size, unsigned flags,unsigned long end, struct lock_class_key *key) { - struct trace_buffer *buffer; + struct trace_buffer *buffer __free(kfree) = NULL;long nr_pages;int subbuf_size;int bsize;
@@ -2349,7 +2347,7 @@ static struct trace_buffer *alloc_buffer(unsigned long size, unsigned flags,return NULL ;if (!zalloc_cpumask_var (&buffer->cpumask,GFP_KERNEL )) - goto fail_free_buffer; +return NULL ; buffer->subbuf_order = order; subbuf_size = (PAGE_SIZE << order);
@@ -2441,7 +2439,7 @@ static struct trace_buffer *alloc_buffer(unsigned long size, unsigned flags,atomic_notifier_chain_register (&panic_notifier_list, &buffer->flush_nb); } -return buffer; +return_ptr (buffer); fail_free_buffers:for_each_buffer_cpu (buffer, cpu) {
@@ -2453,8 +2451,6 @@ static struct trace_buffer *alloc_buffer(unsigned long size, unsigned flags, fail_free_cpumask:free_cpumask_var (buffer->cpumask); - fail_free_buffer: -kfree (buffer);return NULL ; }
@@ -7007,7 +7003,7 @@ static int __rb_map_vma(struct ring_buffer_per_cpu *cpu_buffer, {unsigned long nr_subbufs, nr_pages, nr_vma_pages, pgoff = vma->vm_pgoff;unsigned int subbuf_pages, subbuf_order; -struct page **pages; + struct page **pages __free(kfree) = NULL;int p =0 , s =0 ;int err;
@@ -7075,10 +7071,8 @@ static int __rb_map_vma(struct ring_buffer_per_cpu *cpu_buffer,struct page *page;int off =0 ; -if (WARN_ON_ONCE (s >= nr_subbufs)) { - err = -EINVAL ; - goto out; - } +if (WARN_ON_ONCE (s >= nr_subbufs)) +return -EINVAL ; page =virt_to_page ((void *)cpu_buffer->subbuf_ids[s]);
@@ -7093,9 +7087,6 @@ static int __rb_map_vma(struct ring_buffer_per_cpu *cpu_buffer, err =vm_insert_pages (vma, vma->vm_start, pages, &nr_pages); -out: -kfree (pages); - return err; }#else
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 ring-buffer: Initialise reader page order in rb_allocate_cpu_buffer()
From: Vincent Donnefort <[email protected]>
[ Upstream commit 6d014e44b68ddd43f71288d2a4dbb1a259869149 ]
In rb_allocate_cpu_buffer(), bpage->order was omitted, leaving it as 0. This is an issue for a ring-buffer with subbufs bigger than PAGE_SIZE if when freed: free_buffer_page() relies on this value. Align the value with the actual allocation size (buffer::subbuf_order).
--- kernel/trace/ring_buffer.c | 1 + 1 file changed, 1 insertion(+)
kernel/trace/ring_buffer.c +1 -0
@@ -2220,6 +2220,7 @@ rb_allocate_cpu_buffer(struct trace_buffer *buffer, long nr_pages, int cpu) GFP_KERNEL, cpu_to_node(cpu));if (!bpage)return NULL ; + bpage->order = cpu_buffer->buffer->subbuf_order;rb_check_bpage (cpu_buffer, bpage);
Signature · 1 line
2.53.0