Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d77879b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'trace-fixes-v3.15-rc1' of... 

Merge tag 'trace-fixes-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt:
 "This contains two fixes.

  The first is to remove a duplication of creating debugfs files that
  already exist and causes an error report to be printed due to the
  failure of the second creation.

  The second is a memory leak fix that was introduced in 3.14"

* tag 'trace-fixes-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing/uprobes: Fix uprobe_cpu_buffer memory leak
  tracing: Do not try to recreated toplevel set_ftrace_* files
parents 87a54cae 6ea6215f

kernel/trace/trace_functions.c

+10 −6
Original line number Diff line number Diff line
@@ -58,12 +58,16 @@ int ftrace_create_function_files(struct trace_array *tr, 
{

	int ret;



	/* The top level array uses the "global_ops". */

	if (!(tr->flags & TRACE_ARRAY_FL_GLOBAL)) {

	/*

	 * The top level array uses the "global_ops", and the files are

	 * created on boot up.

	 */

	if (tr->flags & TRACE_ARRAY_FL_GLOBAL)

		return 0;



	ret = allocate_ftrace_ops(tr);

	if (ret)

		return ret;

	}



	ftrace_create_filter_files(tr->ops, parent);

kernel/trace/trace_uprobe.c

+6 −0
Original line number Diff line number Diff line
@@ -732,9 +732,15 @@ static int uprobe_buffer_enable(void) 


static void uprobe_buffer_disable(void)

{

	int cpu;



	BUG_ON(!mutex_is_locked(&event_mutex));



	if (--uprobe_buffer_refcnt == 0) {

		for_each_possible_cpu(cpu)

			free_page((unsigned long)per_cpu_ptr(uprobe_cpu_buffer,

							     cpu)->buf);



		free_percpu(uprobe_cpu_buffer);

		uprobe_cpu_buffer = NULL;

	}