tracing: Updates for 4.13-rc2
Subsystems (4)
Steven Rostedt
maintainerPATCH 2/3 tracing: Fix kmemleak in instance_rmdir
In reply to Steven RostedtFrom: Chunyu Hu <[email protected]>
Hit the kmemleak when executing instance_rmdir, it forgot releasing mem of tracing_cpumask. With this fix, the warn does not appear any more.
unreferenced object 0xffff93a8dfaa7c18 (size 8):
comm "mkdir", pid 1436, jiffies 4294763622 (age 9134.308s) hex dump (first 8 bytes):
ff ff ff ff ff ff ff ff ........
backtrace:
[<ffffffff88b6567a>] kmemleak_alloc+0x4a/0xa0
[<ffffffff8861ea41>] __kmalloc_node+0xf1/0x280
[<ffffffff88b505d3>] alloc_cpumask_var_node+0x23/0x30
[<ffffffff88b5060e>] alloc_cpumask_var+0xe/0x10
[<ffffffff88571ab0>] instance_mkdir+0x90/0x240
[<ffffffff886e5100>] tracefs_syscall_mkdir+0x40/0x70
[<ffffffff886565c9>] vfs_mkdir+0x109/0x1b0
[<ffffffff8865b1d0>] SyS_mkdir+0xd0/0x100
[<ffffffff88403857>] do_syscall_64+0x67/0x150
[<ffffffff88b710e7>] return_from_SYSCALL_64+0x0/0x6a
[<ffffffffffffffff>] 0xffffffffffffffff--- kernel/trace/trace.c | 1 + 1 file changed, 1 insertion(+)
kernel/trace/trace.c +1 -0
@@ -7774,6 +7774,7 @@ static int instance_rmdir(const char *name) }kfree (tr->topts); +free_cpumask_var (tr->tracing_cpumask);kfree (tr->name);kfree (tr);
Signature · 1 line
2.10.2
Steven Rostedt
maintainercover tracing: Updates for 4.13-rc2
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next
Head SHA1: f86f418059b94aa01f9342611a272ca60c583e89
Chunyan Zhang (1):
trace: fix the errors caused by incompatible type of RCU variables
Chunyu Hu (1):
tracing: Fix kmemleak in instance_rmdir
Joel Fernandes (1):
tracing/ring_buffer: Try harder to allocate
----
include/linux/ftrace.h | 6 +++--- include/linux/trace_events.h | 2 +- kernel/trace/ftrace.c | 41 +++++++++++++++++++++++++++-------------- kernel/trace/ring_buffer.c | 10 +++++----- kernel/trace/trace.c | 1 + kernel/trace/trace.h | 6 +++--- 6 files changed, 40 insertions(+), 26 deletions(-)
Steven Rostedt
maintainerPATCH 1/3 tracing/ring_buffer: Try harder to allocate
From: Joel Fernandes <[email protected]>
ftrace can fail to allocate per-CPU ring buffer on systems with a large number of CPUs coupled while large amounts of cache happening in the page cache. Currently the ring buffer allocation doesn't retry in the VM implementation even if direct-reclaim made some progress but still wasn't able to find a free page. On retrying I see that the allocations almost always succeed. The retry doesn't happen because __GFP_NORETRY is used in the tracer to prevent the case where we might OOM, however if we drop __GFP_NORETRY, we risk destabilizing the system if OOM killer is triggered. To prevent this situation, use the __GFP_RETRY_MAYFAIL flag introduced recently [1].
Tested the following still succeeds without destabilizing a system with 1GB memory.
echo 300000 > /sys/kernel/debug/tracing/buffer_size_kb
[1] https://marc.info/?l=linux-mm&m=149820805124906&w=2
--- kernel/trace/ring_buffer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
kernel/trace/ring_buffer.c +5 -5
@@ -1136,12 +1136,12 @@ static int __rb_allocate_pages(long nr_pages, struct list_head *pages, int cpu)for (i =0 ; i < nr_pages; i++) {struct page *page;/* -* __GFP_NORETRY flag makes sure that the allocation fails -* gracefully without invoking oom-killer and the system is -* not destabilized. +* __GFP_RETRY_MAYFAIL flag makes sure that the allocation fails +* gracefully without invoking oom-killer and the system is not +* destabilized. */ bpage =kzalloc_node (ALIGN (sizeof (*bpage),cache_line_size ()), -GFP_KERNEL | __GFP_NORETRY, +GFP_KERNEL | __GFP_RETRY_MAYFAIL,cpu_to_node (cpu));if (!bpage) goto free_pages;
@@ -1149,7 +1149,7 @@ static int __rb_allocate_pages(long nr_pages, struct list_head *pages, int cpu)list_add (&bpage->list, pages); page =alloc_pages_node (cpu_to_node (cpu), -GFP_KERNEL | __GFP_NORETRY,0 ); +GFP_KERNEL | __GFP_RETRY_MAYFAIL,0 );if (!page) goto free_pages; bpage->page =page_address (page);
Signature · 1 line
2.10.2
Steven Rostedt
maintainerPATCH 3/3 trace: fix the errors caused by incompatible type of RCU variables
In reply to Steven RostedtFrom: Chunyan Zhang <[email protected]>
The variables which are processed by RCU functions should be annotated as RCU, otherwise sparse will report the errors like below:
"error: incompatible types in comparison expression (different address spaces)"
--- include/linux/ftrace.h | 6 +++--- include/linux/trace_events.h | 2 +- kernel/trace/ftrace.c | 41 +++++++++++++++++++++++++++-------------- kernel/trace/trace.h | 6 +++--- 4 files changed, 34 insertions(+), 21 deletions(-)
include/linux/ftrace.h +3 -3
@@ -145,8 +145,8 @@ enum {#ifdef CONFIG_DYNAMIC_FTRACE /* The hash used to know what functions callbacks trace */ struct ftrace_ops_hash { -struct ftrace_hash *notrace_hash; -struct ftrace_hash *filter_hash; +struct ftrace_hash __rcu *notrace_hash; +struct ftrace_hash __rcu *filter_hash;struct mutex regex_lock; };
@@ -168,7 +168,7 @@ static inline void ftrace_free_init_mem(void) { }*/ struct ftrace_ops {ftrace_func_t func; -struct ftrace_ops *next; +struct ftrace_ops __rcu *next;unsigned long flags;void *private;ftrace_func_t saved_func;
include/linux/trace_events.h +1 -1
@@ -338,7 +338,7 @@ enum {struct trace_event_file {struct list_head list;struct trace_event_call *event_call; -struct event_filter *filter; +struct event_filter __rcu *filter;struct dentry *dir;struct trace_array *tr;struct trace_subsystem_dir *system;
kernel/trace/ftrace.c +27 -14
104 lines not on this page · raw message
kernel/trace/trace.h +3 -3
@@ -1210,9 +1210,9 @@ struct ftrace_event_field {struct event_filter {int n_preds;/* Number assigned */ int a_preds;/* allocated */ -struct filter_pred *preds; -struct filter_pred *root; -char *filter_string; +struct filter_pred __rcu *preds; +struct filter_pred __rcu *root; +char *filter_string; };struct event_subsystem {
Signature · 1 line
2.10.2