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

Pull tracing fixes from Steven Rostedt: "Various bug fixes: - Two small memory leaks in error paths. - A missed return error code on an error path. - A fix to check the tracing ring buffer CPU when it doesn't exist (caused by setting maxcpus on the command line that is less than the actual number of CPUs, and then onlining them manually). - A fix to have the reset of boot tracers called by lateinit_sync() instead of just lateinit(). As some of the tracers register via lateinit(), and if the clear happens before the tracer is registered, it will never start even though it was told to via the kernel command line" * tag 'trace-v4.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: tracing: Fix freeing of filter in create_filter() when set_str is false tracing: Fix kmemleak in tracing_map_array_free() ftrace: Check for null ret_stack on profile function graph entry function ring-buffer: Have ring_buffer_alloc_read_page() return error on offline CPU tracing: Missing error code in tracer_alloc_buffers() tracing: Call clear_boot_tracer() at lateinit_sync

Linus Torvalds committed 9 years ago

Commit 415be6c2 parents 1cffe59 8b0db1a6 files · +38 −16Browse files

Unified · Split

6 files

kernel/trace/ftrace.c +4 −0
kernel/trace/ring_buffer.c +9 −5
kernel/trace/ring_buffer_benchmark.c +1 −1
kernel/trace/trace.c +13 −6
kernel/trace/trace_events_filter.c +4 −0
kernel/trace/tracing_map.c +7 −4

kernel/trace/ftrace.c+4−0

@@ -889,6 +889,10 @@ static int profile_graph_entry(struct ftrace_graph_ent *trace) · 888 unmodified lines
889		889
890	function_profile_call(trace->func, 0, NULL, NULL);	890	function_profile_call(trace->func, 0, NULL, NULL);
891		891
		892	/* If function graph is shutting down, ret_stack can be NULL */
		893	if (!current->ret_stack)
		894	return 0;
		895
892	if (index >= 0 && index < FTRACE_RETFUNC_DEPTH)	896	if (index >= 0 && index < FTRACE_RETFUNC_DEPTH)
893	current->ret_stack[index].subtime = 0;	897	current->ret_stack[index].subtime = 0;
894		898

kernel/trace/ring_buffer.c+9−5

  * the page that was allocated, with the read page of the buffer.
  *
  * Returns:
- *  The page allocated, or NULL on error.
+ *  The page allocated, or ERR_PTR
  */
 void *ring_buffer_alloc_read_page(struct ring_buffer *buffer, int cpu)
 {
-	struct ring_buffer_per_cpu *cpu_buffer = buffer->buffers[cpu];
+	struct ring_buffer_per_cpu *cpu_buffer;
 	struct buffer_data_page *bpage = NULL;
 	unsigned long flags;
 	struct page *page;
+	if (!cpumask_test_cpu(cpu, buffer->cpumask))
+		return ERR_PTR(-ENODEV);
+	cpu_buffer = buffer->buffers[cpu];
 	local_irq_save(flags);
 	arch_spin_lock(&cpu_buffer->lock);
 	page = alloc_pages_node(cpu_to_node(cpu),
 				GFP_KERNEL | __GFP_NORETRY, 0);
 	if (!page)
-		return NULL;
+		return ERR_PTR(-ENOMEM);
 	bpage = page_address(page);
  *
  * for example:
  *	rpage = ring_buffer_alloc_read_page(buffer, cpu);
- *	if (!rpage)
+ *	if (IS_ERR(rpage))
- *		return error;
+ *		return PTR_ERR(rpage);
  *	ret = ring_buffer_read_page(buffer, &rpage, len, cpu, 0);
  *	if (ret >= 0)
  *		process_page(rpage, ret);

kernel/trace/ring_buffer_benchmark.c+1−1

@@ -113,7 +113,7 @@ static enum event_status read_page(int cpu) · 112 unmodified lines
113	int i;	113	int i;
114		114
115	bpage = ring_buffer_alloc_read_page(buffer, cpu);	115	bpage = ring_buffer_alloc_read_page(buffer, cpu);
116	if (!bpage)	116	if (IS_ERR(bpage))
117	return EVENT_DROPPED;	117	return EVENT_DROPPED;
118		118
119	ret = ring_buffer_read_page(buffer, &bpage, PAGE_SIZE, cpu, 1);	119	ret = ring_buffer_read_page(buffer, &bpage, PAGE_SIZE, cpu, 1);

kernel/trace/trace.c+13−6

 {
 	struct ftrace_buffer_info *info = filp->private_data;
 	struct trace_iterator *iter = &info->iter;
-	ssize_t ret;
+	ssize_t ret = 0;
 	ssize_t size;
 	if (!count)
 	if (!info->spare) {
 		info->spare = ring_buffer_alloc_read_page(iter->trace_buffer->buffer,
 							  iter->cpu_file);
-		info->spare_cpu = iter->cpu_file;
+		if (IS_ERR(info->spare)) {
+			ret = PTR_ERR(info->spare);
+			info->spare = NULL;
+		} else {
+			info->spare_cpu = iter->cpu_file;
+		}
 	}
 	if (!info->spare)
-		return -ENOMEM;
+		return ret;
 	/* Do we have previous read data to read? */
 	if (info->read < PAGE_SIZE)
 		ref->ref = 1;
 		ref->buffer = iter->trace_buffer->buffer;
 		ref->page = ring_buffer_alloc_read_page(ref->buffer, iter->cpu_file);
-		if (!ref->page) {
+		if (IS_ERR(ref->page)) {
-			ret = -ENOMEM;
+			ret = PTR_ERR(ref->page);
+			ref->page = NULL;
 			kfree(ref);
 			break;
 		}
 	if (ret < 0)
 		goto out_free_cpumask;
 	/* Used for event triggers */
+	ret = -ENOMEM;
 	temp_buffer = ring_buffer_alloc(PAGE_SIZE, RB_FL_OVERWRITE);
 	if (!temp_buffer)
 		goto out_rm_hp_state;
 }
 fs_initcall(tracer_init_tracefs);
-late_initcall(clear_boot_tracer);
+late_initcall_sync(clear_boot_tracer);

kernel/trace/trace_events_filter.c+4−0

 		if (err && set_str)
 			append_filter_err(ps, filter);
 	}
+	if (err && !set_str) {
+		free_event_filter(filter);
+		filter = NULL;
+	}
 	create_filter_finish(ps);
 	*filterp = filter;

kernel/trace/tracing_map.c+7−4

 	if (!a)
 		return;
-	if (!a->pages) {
+	if (!a->pages)
-		kfree(a);
+		goto free;
-		return;
-	}
 	for (i = 0; i < a->n_pages; i++) {
 		if (!a->pages[i])
 			break;
 		free_page((unsigned long)a->pages[i]);
 	}
+	kfree(a->pages);
+ free:
+	kfree(a);
 }
 struct tracing_map_array *tracing_map_array_alloc(unsigned int n_elts,

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

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code