renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 20:23:57 +08:00
Code

Merge commit '0f17976568b3f72e676450af0c0db6f8752253d6' into trace/ftrace/core

Browse Source 
Need to get the changes from 0f17976568 ("ftrace: Fix regression with
module command in stack_trace_filter") as it is required to fix some other
changes with stack_trace_filter and the new development code.

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt (VMware) 2017-07-05 09:51:24 -04:00
commit 4dce17b26b
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/trace/ftrace.c
View File

@ -4653,9 +4653,6 @@ static int ftrace_process_regex(struct ftrace_iterator *iter,
command = strsep(&next, ":"); command = strsep(&next, ":");
if (WARN_ON_ONCE(!tr))
return -EINVAL;
mutex_lock(&ftrace_cmd_mutex); mutex_lock(&ftrace_cmd_mutex);
list_for_each_entry(p, &ftrace_commands, list) { list_for_each_entry(p, &ftrace_commands, list) {
if (strcmp(p->name, command) == 0) { if (strcmp(p->name, command) == 0) {

3
kernel/trace/trace.c
View File

@ -6957,6 +6957,9 @@ ftrace_trace_snapshot_callback(struct trace_array *tr, struct ftrace_hash *hash,
char *number; char *number;
int ret; int ret;
if (!tr)
return -ENODEV;
/* hash funcs only work with set_ftrace_filter */ /* hash funcs only work with set_ftrace_filter */
if (!enable) if (!enable)
return -EINVAL; return -EINVAL;

12
kernel/trace/trace_functions.c
View File

@ -654,6 +654,9 @@ ftrace_trace_onoff_callback(struct trace_array *tr, struct ftrace_hash *hash,
{ {
struct ftrace_probe_ops *ops; struct ftrace_probe_ops *ops;
if (!tr)
return -ENODEV;
/* we register both traceon and traceoff to this callback */ /* we register both traceon and traceoff to this callback */
if (strcmp(cmd, "traceon") == 0) if (strcmp(cmd, "traceon") == 0)
ops = param ? &traceon_count_probe_ops : &traceon_probe_ops; ops = param ? &traceon_count_probe_ops : &traceon_probe_ops;
@ -670,6 +673,9 @@ ftrace_stacktrace_callback(struct trace_array *tr, struct ftrace_hash *hash,
{ {
struct ftrace_probe_ops *ops; struct ftrace_probe_ops *ops;
if (!tr)
return -ENODEV;
ops = param ? &stacktrace_count_probe_ops : &stacktrace_probe_ops; ops = param ? &stacktrace_count_probe_ops : &stacktrace_probe_ops;
return ftrace_trace_probe_callback(tr, ops, hash, glob, cmd, return ftrace_trace_probe_callback(tr, ops, hash, glob, cmd,
@ -682,6 +688,9 @@ ftrace_dump_callback(struct trace_array *tr, struct ftrace_hash *hash,
{ {
struct ftrace_probe_ops *ops; struct ftrace_probe_ops *ops;
if (!tr)
return -ENODEV;
ops = &dump_probe_ops; ops = &dump_probe_ops;
/* Only dump once. */ /* Only dump once. */
@ -695,6 +704,9 @@ ftrace_cpudump_callback(struct trace_array *tr, struct ftrace_hash *hash,
{ {
struct ftrace_probe_ops *ops; struct ftrace_probe_ops *ops;
if (!tr)
return -ENODEV;
ops = &cpudump_probe_ops; ops = &cpudump_probe_ops;
/* Only dump once. */ /* Only dump once. */

6
kernel/trace/trace_stack.c
View File

@ -409,7 +409,9 @@ static const struct file_operations stack_trace_fops = {
static int static int
stack_trace_filter_open(struct inode *inode, struct file *file) stack_trace_filter_open(struct inode *inode, struct file *file)
{ {
return ftrace_regex_open(&trace_ops, FTRACE_ITER_FILTER, struct ftrace_ops *ops = inode->i_private;
return ftrace_regex_open(ops, FTRACE_ITER_FILTER,
inode, file); inode, file);
} }
@ -476,7 +478,7 @@ static __init int stack_trace_init(void)
NULL, &stack_trace_fops); NULL, &stack_trace_fops);
trace_create_file("stack_trace_filter", 0444, d_tracer, trace_create_file("stack_trace_filter", 0444, d_tracer,
NULL, &stack_trace_filter_fops); &trace_ops, &stack_trace_filter_fops);
if (stack_trace_filter_buf[0]) if (stack_trace_filter_buf[0])
ftrace_set_early_filter(&trace_ops, stack_trace_filter_buf, 1); ftrace_set_early_filter(&trace_ops, stack_trace_filter_buf, 1);