tracing: Make persistent ring buffer freeable
Masami Hiramatsu (Google)
maintainerv4 cover tracing: Make persistent ring buffer freeable
Hi,
Here is the 4th version of patches for making the persistent ring buffer freeable. The previous version is here;
https://lore.kernel.org/all/173928521419.906035.17750338150436695675.stgit@devnote2/
In this version, I used free_reserved_area() instead of custom releasing code. This seems working correctly. Thanks Mike!
Thank you,
---
Masami Hiramatsu (Google) (2):
mm/memblock: Add reserved memory release function
tracing: Freeable reserved ring buffer
include/linux/mm.h | 1 + kernel/trace/trace.c | 13 +++++++++- kernel/trace/trace.h | 1 + mm/memblock.c | 66 +++++++++++++++++++++++++++++++++++++++++--------- 4 files changed, 68 insertions(+), 13 deletions(-)
--
Masami Hiramatsu (Google) <[email protected]>
Masami Hiramatsu (Google)
maintainerPATCH v4 1/2 mm/memblock: Add reserved memory release function
From: Masami Hiramatsu (Google) <[email protected]>
Add reserve_mem_release_by_name() to release a reserved memory region with a given name. This allows us to release reserved memory which is defined by kernel cmdline, after boot.
---
Changes in v4:
- Use free_reserved_area() according to Mike's comment.
Changes in v2:
- Rename reserved_mem_* to reserve_mem_*.
--- include/linux/mm.h | 1 + mm/memblock.c | 66 +++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 55 insertions(+), 12 deletions(-)
include/linux/mm.h +1 -0
@@ -4123,6 +4123,7 @@ void vma_pgtable_walk_begin(struct vm_area_struct *vma);void vma_pgtable_walk_end (struct vm_area_struct *vma);int reserve_mem_find_by_name (const char *name,phys_addr_t *start,phys_addr_t *size); +int reserve_mem_release_by_name (const char *name);#ifdef CONFIG_64BIT int do_mseal (unsigned long start,size_t len_in,unsigned long flags);
mm/memblock.c +54 -12
94 lines not on this page · raw message
Re: [PATCH v4 1/2] mm/memblock: Add reserved memory release function
Quoted 45 lines · Masami Hiramatsu (Google)
From: Masami Hiramatsu (Google) <[email protected]>
Add
reserve_mem_release_by_name()to release a reserved memory region with a given name. This allows us to release reserved memory which is defined by kernel cmdline, after boot.Signed-off-by Masami Hiramatsu (Google) <[email protected]>Cc Andrew Morton <[email protected]>---
Changes in v4:
- Usefree_reserved_area()according to Mike's comment.
Changes in v2:
- Rename reserved_mem_* to reserve_mem_*.
---include/linux/mm.h| 1 +mm/memblock.c| 66 +++++++++++++++++++++++++++++++++++++++++++---------2 files changed, 55 insertions(+), 12 deletions(-)include/linux/mm.h +1
-0@@ -4123,6 +4123,7 @@ void vma_pgtable_walk_begin(struct vm_area_struct *vma);void vma_pgtable_walk_end (struct vm_area_struct *vma);int reserve_mem_find_by_name (const char *name,phys_addr_t *start,phys_addr_t *size); +int reserve_mem_release_by_name (const char *name);#ifdef CONFIG_64BIT int do_mseal (unsigned long start,size_t len_in,unsigned long flags);mm/memblock.c +1
-0@@ -16,6 +16,7 @@#include <linux/kmemleak.h> #include <linux/seq_file.h> #include <linux/memblock.h> +#include <linux/mutex.h> #include <asm/sections.h> #include <linux/io.h>
mm/memblock.c struct reserve_mem_table { · line 2288
Quoted 5 lines
mm/memblock.c +1
-0@@ -2283,6 +2284,7 @@ struct reserve_mem_table { };static struct reserve_mem_table reserved_mem_table[RESERVE_MEM_MAX_ENTRIES ];static int reserved_mem_count; +static DEFINE_MUTEX (reserve_mem_lock);
This looks break the memblock tests in tools/testing/memblock.
memblock.c:2289:8: warning: type defaults to ‘int’ in declaration of ‘DEFINE_MUTEX’ [-Wimplicit-int]
2289 | static DEFINE_MUTEX(reserve_mem_lock);
| ^~~~~~~~~~~~
memblock.c:2289:1: warning: parameter names (without types) in function declaration
2289 | static DEFINE_MUTEX(reserve_mem_lock);
| ^~~~~~
memblock.c: In function ‘reserve_mem_find_by_name’:
memblock.c:2332:9: warning: implicit declaration of function ‘guard’ [-Wimplicit-function-declaration]
2332 | guard(mutex)(&reserve_mem_lock);
| ^~~~~Masami Hiramatsu (Google)
maintainerRe: [PATCH v4 1/2] mm/memblock: Add reserved memory release function
Quoted 55 lines · On Sat, 5 Apr 2025 02:30:18 +0000 Wei Yang <[email protected]> wrote:
Quoted 45 lines · Masami Hiramatsu (Google)
From: Masami Hiramatsu (Google) <[email protected]>
Add
reserve_mem_release_by_name()to release a reserved memory region with a given name. This allows us to release reserved memory which is defined by kernel cmdline, after boot.Signed-off-by Masami Hiramatsu (Google) <[email protected]>Cc Andrew Morton <[email protected]>---
Changes in v4:
- Usefree_reserved_area()according to Mike's comment.
Changes in v2:
- Rename reserved_mem_* to reserve_mem_*.
---include/linux/mm.h| 1 +mm/memblock.c| 66 +++++++++++++++++++++++++++++++++++++++++++---------2 files changed, 55 insertions(+), 12 deletions(-)include/linux/mm.h +1
-0@@ -4123,6 +4123,7 @@ void vma_pgtable_walk_begin(struct vm_area_struct *vma);void vma_pgtable_walk_end (struct vm_area_struct *vma);int reserve_mem_find_by_name (const char *name,phys_addr_t *start,phys_addr_t *size); +int reserve_mem_release_by_name (const char *name);#ifdef CONFIG_64BIT int do_mseal (unsigned long start,size_t len_in,unsigned long flags);mm/memblock.c +1
-0@@ -16,6 +16,7 @@#include <linux/kmemleak.h> #include <linux/seq_file.h> #include <linux/memblock.h> +#include <linux/mutex.h> #include <asm/sections.h> #include <linux/io.h> mm/memblock.c struct reserve_mem_table { · line 2288
Quoted 5 lines
mm/memblock.c +1
-0@@ -2283,6 +2284,7 @@ struct reserve_mem_table { };static struct reserve_mem_table reserved_mem_table[RESERVE_MEM_MAX_ENTRIES ];static int reserved_mem_count; +static DEFINE_MUTEX (reserve_mem_lock);This looks break the memblock tests in
tools/testing/memblock.memblock.c:2289:8: warning: type defaults to ‘int’ in declaration of ‘DEFINE_MUTEX’ [-Wimplicit-int]
Quoted 9 lines
2289 | static DEFINE_MUTEX(reserve_mem_lock);
| ^~~~~~~~~~~~
memblock.c:2289:1: warning: parameter names (without types) in function declaration
2289 | static DEFINE_MUTEX(reserve_mem_lock);
| ^~~~~~
memblock.c: In function ‘reserve_mem_find_by_name’:
memblock.c:2332:9: warning: implicit declaration of function ‘guard’ [-Wimplicit-function-declaration]
2332 | guard(mutex)(&reserve_mem_lock);
| ^~~~~Hmm, this means the memblock test builds the kernel source code in user space. I think we need to add linux/mutex.h under tools/testing/memblock.
But this is fragile by design. As I did for lib/bootconfig and tools/bootconfig, you should use __KERNEL__ and makes it not depending on the kernel header files because it does not expected to be used in user space.
Even if I added mutex.h, it stopped with another reason.
test -L linux/memblock.h || ln -s ../../../../include/linux/memblock.h linux/memblock.h test -L asm/asm.h || ln -s ../../../arch/x86/include/asm/asm.h asm/asm.h test -L asm/cmpxchg.h || ln -s ../../../arch/x86/include/asm/cmpxchg.h asm/cmpxchg.h
cc -I. -I../../include -Wall -O2 -fsanitize=address -fsanitize=undefined -D CONFIG_PHYS_ADDR_T_64BIT -c -o main.o main.c
test -L memblock.c || ln -s ../../../mm/memblock.c memblock.c
cc -I. -I../../include -Wall -O2 -fsanitize=address -fsanitize=undefined -D CONFIG_PHYS_ADDR_T_64BIT -c -o memblock.o memblock.cmemblock.c: In function 'memblock_add_range.isra':
memblock.c:685:17: warning: 'end_rgn' may be used uninitialized [-Wmaybe-uninitialized]
685 | memblock_merge_regions(type, start_rgn, end_rgn);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
memblock.c:591:42: note: 'end_rgn' was declared here
591 | int idx, nr_new, start_rgn = -1, end_rgn;
| ^~~~~~~
cc -I. -I../../include -Wall -O2 -fsanitize=address -fsanitize=undefined -D CONFIG_PHYS_ADDR_T_64BIT -c -o lib/slab.o lib/slab.c
cc -I. -I../../include -Wall -O2 -fsanitize=address -fsanitize=undefined -D CONFIG_PHYS_ADDR_T_64BIT -c -o mmzone.o mmzone.c
cc -I. -I../../include -Wall -O2 -fsanitize=address -fsanitize=undefined -D CONFIG_PHYS_ADDR_T_64BIT -c -o slab.o ../../lib/slab.c../../lib/slab.c:6:10: fatal error: urcu/uatomic.h: No such file or directory
6 | #include <urcu/uatomic.h>
| ^~~~~~~~~~~~~~~~
compilation terminated.
make: *** [<builtin>: slab.o] Error 1
Thank you,
Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
Masami Hiramatsu (Google)
maintainerRe: [PATCH v4 1/2] mm/memblock: Add reserved memory release function
Quoted 22 lines · On Mon, 7 Apr 2025 09:33:51 +0900 Masami Hiramatsu (Google)…
But this is fragile by design. As I did for lib/bootconfig and
tools/bootconfig, you should use__KERNEL__and makes it not depending on the kernel header files because it does not expected to be used in user space.
Even if I addedmutex.h, it stopped with another reason.test -L
linux/memblock.h|| ln -s../../../../include/linux/memblock.hlinux/memblock.htest -Lasm/asm.h|| ln -s../../../arch/x86/include/asm/asm.hasm/asm.htest -Lasm/cmpxchg.h|| ln -s../../../arch/x86/include/asm/cmpxchg.hasm/cmpxchg.h
cc -I. -I../../include -Wall -O2 -fsanitize=address -fsanitize=undefined -DCONFIG_PHYS_ADDR_T_64BIT-c -o main.omain.c
test -Lmemblock.c|| ln -s../../../mm/memblock.cmemblock.c
cc -I. -I../../include -Wall -O2 -fsanitize=address -fsanitize=undefined -DCONFIG_PHYS_ADDR_T_64BIT-c -o memblock.omemblock.cmemblock.c: In function 'memblock_add_range.isra':
memblock.c:685:17: warning: 'end_rgn' may be used uninitialized [-Wmaybe-uninitialized]685 | memblock_merge_regions(type, start_rgn, end_rgn); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ memblock.c:591:42: note: 'end_rgn' was declared here 591 | int idx, nr_new, start_rgn = -1, end_rgn; | ^~~~~~~ cc -I. -I../../include -Wall -O2 -fsanitize=address -fsanitize=undefined -D CONFIG_PHYS_ADDR_T_64BIT -c -o lib/slab.o lib/slab.c cc -I. -I../../include -Wall -O2 -fsanitize=address -fsanitize=undefined -D CONFIG_PHYS_ADDR_T_64BIT -c -o mmzone.o mmzone.c cc -I. -I../../include -Wall -O2 -fsanitize=address -fsanitize=undefined -D CONFIG_PHYS_ADDR_T_64BIT -c -o slab.o ../../lib/slab.c
Quoted 5 lines
../../lib/slab.c:6:10: fatal error:urcu/uatomic.h: No such file or directory
6 | #include <urcu/uatomic.h>
| ^~~~~~~~~~~~~~~~
compilation terminated.
make: *** [<builtin>: slab.o] Error 1
Ah, sorry. This is from liburcu. I installed the package and fixes the issue. Let me send the patch.
Thank you,
Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
Masami Hiramatsu (Google)
maintainerPATCH v4 2/2 tracing: Freeable reserved ring buffer
In reply to Masami Hiramatsu (Google)From: Masami Hiramatsu (Google) <[email protected]>
Make the ring buffer on reserved memory to be freeable. This allows us to free the trace instance on the reserved memory without changing cmdline and rebooting. Even if we can not change the kernel cmdline for security reason, we can release the reserved memory for the ring buffer as free (available) memory.
For example, boot kernel with reserved memory; "reserve_mem=20M:2M:trace trace_instance=boot_mapped^traceoff@trace"
~ # free
total used free shared buff/cache available
Mem: 1995548 50544 1927568 14964 17436 1911480
Swap: 0 0 0
~ # rmdir /sys/kernel/tracing/instances/boot_mapped/
[ 23.704023] Freeing reserve_mem:trace memory: 20476K
~ # free
total used free shared buff/cache available
Mem: 2016024 41844 1956740 14968 17440 1940572
Swap: 0 0 0---
Changes in v4:
- Update the result example in the description.
Changes in v3:
- Remove debug printk.
--- kernel/trace/trace.c | 13 ++++++++++++- kernel/trace/trace.h | 1 + 2 files changed, 13 insertions(+), 1 deletion(-)
kernel/trace/trace.c +12 -1
@@ -9284,6 +9284,9 @@ static void free_trace_buffers(struct trace_array *tr)#ifdef CONFIG_TRACER_MAX_TRACE free_trace_buffer (&tr->max_buffer);#endif + +if (tr->range_addr_start) +vunmap ((void *)tr->range_addr_start); }static void init_trace_flags_index (struct trace_array *tr)
@@ -9445,6 +9448,7 @@ trace_array_create_systems(const char *name, const char *systems,free_cpumask_var (tr->pipe_cpumask);free_cpumask_var (tr->tracing_cpumask);kfree_const (tr->system_names); +kfree (tr->range_name);kfree (tr->name);kfree (tr);
@@ -9571,6 +9575,11 @@ static int __remove_instance(struct trace_array *tr)free_trace_buffers (tr);clear_tracing_err_log (tr); +if (tr->range_name) { +reserve_mem_release_by_name (tr->range_name); +kfree (tr->range_name); + } +for (i =0 ; i < tr->nr_topts; i++) {kfree (tr->topts[i].topts); }
@@ -10368,6 +10377,7 @@ __init static void enable_instances(void)bool traceoff = false;char *flag_delim;char *addr_delim; + char *rname __free(kfree) = NULL; tok =strsep (&curr_str,"," );
@@ -10424,6 +10434,7 @@ __init static void enable_instances(void)pr_warn ("Failed to map boot instance %s to %s\n" , name, tok);continue ; } + rname =kstrdup (tok,GFP_KERNEL ); }if (start) {
@@ -10460,7 +10471,7 @@ __init static void enable_instances(void)*/ if (start) { tr->flags |=TRACE_ARRAY_FL_BOOT ; - tr->ref++; + tr->range_name =no_free_ptr (rname); }while ((tok =strsep (&curr_str,"," ))) {
kernel/trace/trace.h +1 -0
@@ -348,6 +348,7 @@ struct trace_array {unsigned int mapped;unsigned long range_addr_start;unsigned long range_addr_size; +char *range_name;long text_delta;long data_delta;
Steven Rostedt
maintainerQuoted 10 lines · On Wed, 19 Feb 2025 00:08:47 +0900 "Masami Hiramatsu (Google)"…
Hi,
Here is the 4th version of patches for making the persistent ring buffer freeable. The previous version is here;
https://lore.kernel.org/all/173928521419.906035.17750338150436695675.stgit@devnote2/
In this version, I used
free_reserved_area()instead of custom releasing code. This seems working correctly. Thanks Mike!
Thanks Masami,
I'll start testing this after the fixes I have get tested. I'm currently testing the fixes for the sorttable linux-next fixes, after that I'm going to test the histogram fix, and then I'll test these patches.
-- Steve