Commit c0a0c7a4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'trace-v4.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace 

Pull last-minute tracing fixes from Steven Rostedt:
 "Two fixes:

  One is for a crash when using the :mod: trace probe command into
  stack_trace_filter. This bug was introduced during the last merge
  window.

  The other was there forever. It's a small bug that makes it impossible
  to name a module function for kprobes when the module starts with a
  digit"

* tag 'trace-v4.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing/kprobes: Allow to create probe with a module name starting with a digit
  ftrace: Fix regression with module command in stack_trace_filter
parents fbd57629 9e52b325

kernel/trace/ftrace.c

+0 −3
Original line number Diff line number Diff line
@@ -4337,9 +4337,6 @@ static int ftrace_process_regex(struct ftrace_iterator *iter, 


	command = strsep(&next, ":");



	if (WARN_ON_ONCE(!tr))

		return -EINVAL;



	mutex_lock(&ftrace_cmd_mutex);

	list_for_each_entry(p, &ftrace_commands, list) {

		if (strcmp(p->name, command) == 0) {

kernel/trace/trace.c

+3 −0
Original line number Diff line number Diff line
@@ -6881,6 +6881,9 @@ ftrace_trace_snapshot_callback(struct trace_array *tr, struct ftrace_hash *hash, 
	char *number;

	int ret;



	if (!tr)

		return -ENODEV;



	/* hash funcs only work with set_ftrace_filter */

	if (!enable)

		return -EINVAL;

kernel/trace/trace_functions.c

+12 −0
Original line number Diff line number Diff line
@@ -654,6 +654,9 @@ ftrace_trace_onoff_callback(struct trace_array *tr, struct ftrace_hash *hash, 
{

	struct ftrace_probe_ops *ops;



	if (!tr)

		return -ENODEV;



	/* we register both traceon and traceoff to this callback */

	if (strcmp(cmd, "traceon") == 0)

		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;



	if (!tr)

		return -ENODEV;



	ops = param ? &stacktrace_count_probe_ops : &stacktrace_probe_ops;



	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;



	if (!tr)

		return -ENODEV;



	ops = &dump_probe_ops;



	/* Only dump once. */
@@ -695,6 +704,9 @@ ftrace_cpudump_callback(struct trace_array *tr, struct ftrace_hash *hash, 
{

	struct ftrace_probe_ops *ops;



	if (!tr)

		return -ENODEV;



	ops = &cpudump_probe_ops;



	/* Only dump once. */

kernel/trace/trace_kprobe.c

+5 −9
Original line number Diff line number Diff line
@@ -707,20 +707,16 @@ static int create_trace_kprobe(int argc, char **argv) 
		pr_info("Probe point is not specified.\n");

		return -EINVAL;

	}

	if (isdigit(argv[1][0])) {

		/* an address specified */

		ret = kstrtoul(&argv[1][0], 0, (unsigned long *)&addr);

		if (ret) {

			pr_info("Failed to parse address.\n");

			return ret;

		}

	} else {



	/* try to parse an address. if that fails, try to read the

	 * input as a symbol. */

	if (kstrtoul(argv[1], 0, (unsigned long *)&addr)) {

		/* a symbol specified */

		symbol = argv[1];

		/* TODO: support .init module functions */

		ret = traceprobe_split_symbol_offset(symbol, &offset);

		if (ret) {

			pr_info("Failed to parse symbol.\n");

			pr_info("Failed to parse either an address or a symbol.\n");

			return ret;

		}

		if (offset && is_return &&

kernel/trace/trace_stack.c

+4 −2
Original line number Diff line number Diff line
@@ -409,7 +409,9 @@ static const struct file_operations stack_trace_fops = { 
static int

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);

}
@@ -476,7 +478,7 @@ static __init int stack_trace_init(void) 
			NULL, &stack_trace_fops);



	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])

		ftrace_set_early_filter(&trace_ops, stack_trace_filter_buf, 1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE