Pull tracing fixes from Steven Rostedt: "Three minor updates - Use the new GFP_RETRY_MAYFAIL to be more aggressive in allocating memory for the ring buffer without causing OOMs - Fix a memory leak in adding and removing instances - Add __rcu annotation to be able to debug RCU usage of function tracing a bit better" * tag 'trace-v4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: trace: fix the errors caused by incompatible type of RCU variables tracing: Fix kmemleak in instance_rmdir tracing/ring_buffer: Try harder to allocate
Showing the changes to include/linux (2 of 6 files). Show all
Unified · Split
| @@ -145,8 +145,8 @@ enum { · 144 unmodified lines | ||
| 145 | 145 | #ifdef CONFIG_DYNAMIC_FTRACE |
| 146 | 146 | /* The hash used to know what functions callbacks trace */ |
| 147 | 147 | struct ftrace_ops_hash { |
| 148 | − struct ftrace_hash *notrace_hash; | |
| 149 | − struct ftrace_hash *filter_hash; | |
| 148 | + struct ftrace_hash __rcu *notrace_hash; | |
| 149 | + struct ftrace_hash __rcu *filter_hash; | |
| 150 | 150 | struct mutex regex_lock; |
| 151 | 151 | }; |
| 152 | 152 | |
| @@ -168,7 +168,7 @@ static inline void ftrace_free_init_mem(void) { } · 15 unmodified lines | ||
| 168 | 168 | */ |
| 169 | 169 | struct ftrace_ops { |
| 170 | 170 | ftrace_func_t func; |
| 171 | − struct ftrace_ops *next; | |
| 171 | + struct ftrace_ops __rcu *next; | |
| 172 | 172 | unsigned long flags; |
| 173 | 173 | void *private; |
| 174 | 174 | ftrace_func_t saved_func; |
| @@ -338,7 +338,7 @@ enum { · 337 unmodified lines | ||
| 338 | 338 | struct trace_event_file { |
| 339 | 339 | struct list_head list; |
| 340 | 340 | struct trace_event_call *event_call; |
| 341 | − struct event_filter *filter; | |
| 341 | + struct event_filter __rcu *filter; | |
| 342 | 342 | struct dentry *dir; |
| 343 | 343 | struct trace_array *tr; |
| 344 | 344 | struct trace_subsystem_dir *system; |