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

Merge tag 'trace-v5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace 

Pull tracing fixes and cleanups from Steven Rostedt:
 "This contains a series of last minute clean ups, small fixes and error
  checks"

* tag 'trace-v5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing/probe: Verify alloc_trace_*probe() result
  tracing/probe: Check event/group naming rule at parsing
  tracing/probe: Check the size of argument name and body
  tracing/probe: Check event name length correctly
  tracing/probe: Check maxactive error cases
  tracing: kdb: Fix ftdump to not sleep
  trace/probes: Remove kernel doc style from non kernel doc comment
  tracing/probes: Make reserved_field_names static
parents 323ea40f a039480e

include/linux/ring_buffer.h

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ ring_buffer_consume(struct ring_buffer *buffer, int cpu, u64 *ts, 
		    unsigned long *lost_events);



struct ring_buffer_iter *

ring_buffer_read_prepare(struct ring_buffer *buffer, int cpu);

ring_buffer_read_prepare(struct ring_buffer *buffer, int cpu, gfp_t flags);

void ring_buffer_read_prepare_sync(void);

void ring_buffer_read_start(struct ring_buffer_iter *iter);

void ring_buffer_read_finish(struct ring_buffer_iter *iter);

kernel/trace/ring_buffer.c

+3 −2
Original line number Diff line number Diff line
@@ -4191,6 +4191,7 @@ EXPORT_SYMBOL_GPL(ring_buffer_consume); 
 * ring_buffer_read_prepare - Prepare for a non consuming read of the buffer

 * @buffer: The ring buffer to read from

 * @cpu: The cpu buffer to iterate over

 * @flags: gfp flags to use for memory allocation

 *

 * This performs the initial preparations necessary to iterate

 * through the buffer.  Memory is allocated, buffer recording
@@ -4208,7 +4209,7 @@ EXPORT_SYMBOL_GPL(ring_buffer_consume); 
 * This overall must be paired with ring_buffer_read_finish.

 */

struct ring_buffer_iter *

ring_buffer_read_prepare(struct ring_buffer *buffer, int cpu)

ring_buffer_read_prepare(struct ring_buffer *buffer, int cpu, gfp_t flags)

{

	struct ring_buffer_per_cpu *cpu_buffer;

	struct ring_buffer_iter *iter;
@@ -4216,7 +4217,7 @@ ring_buffer_read_prepare(struct ring_buffer *buffer, int cpu) 
	if (!cpumask_test_cpu(cpu, buffer->cpumask))

		return NULL;



	iter = kmalloc(sizeof(*iter), GFP_KERNEL);

	iter = kmalloc(sizeof(*iter), flags);

	if (!iter)

		return NULL;

kernel/trace/trace.c

+4 −2
Original line number Diff line number Diff line
@@ -4079,7 +4079,8 @@ __tracing_open(struct inode *inode, struct file *file, bool snapshot) 
	if (iter->cpu_file == RING_BUFFER_ALL_CPUS) {

		for_each_tracing_cpu(cpu) {

			iter->buffer_iter[cpu] =

				ring_buffer_read_prepare(iter->trace_buffer->buffer, cpu);

				ring_buffer_read_prepare(iter->trace_buffer->buffer,

							 cpu, GFP_KERNEL);

		}

		ring_buffer_read_prepare_sync();

		for_each_tracing_cpu(cpu) {
@@ -4089,7 +4090,8 @@ __tracing_open(struct inode *inode, struct file *file, bool snapshot) 
	} else {

		cpu = iter->cpu_file;

		iter->buffer_iter[cpu] =

			ring_buffer_read_prepare(iter->trace_buffer->buffer, cpu);

			ring_buffer_read_prepare(iter->trace_buffer->buffer,

						 cpu, GFP_KERNEL);

		ring_buffer_read_prepare_sync();

		ring_buffer_read_start(iter->buffer_iter[cpu]);

		tracing_iter_reset(iter, cpu);

kernel/trace/trace_kdb.c

+4 −2
Original line number Diff line number Diff line
@@ -51,14 +51,16 @@ static void ftrace_dump_buf(int skip_lines, long cpu_file) 
	if (cpu_file == RING_BUFFER_ALL_CPUS) {

		for_each_tracing_cpu(cpu) {

			iter.buffer_iter[cpu] =

			ring_buffer_read_prepare(iter.trace_buffer->buffer, cpu);

			ring_buffer_read_prepare(iter.trace_buffer->buffer,

						 cpu, GFP_ATOMIC);

			ring_buffer_read_start(iter.buffer_iter[cpu]);

			tracing_iter_reset(&iter, cpu);

		}

	} else {

		iter.cpu_file = cpu_file;

		iter.buffer_iter[cpu_file] =

			ring_buffer_read_prepare(iter.trace_buffer->buffer, cpu_file);

			ring_buffer_read_prepare(iter.trace_buffer->buffer,

						 cpu_file, GFP_ATOMIC);

		ring_buffer_read_start(iter.buffer_iter[cpu_file]);

		tracing_iter_reset(&iter, cpu_file);

	}

kernel/trace/trace_kprobe.c

+11 −12
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static struct dyn_event_operations trace_kprobe_ops = { 
	.match = trace_kprobe_match,

};



/**

/*

 * Kprobe event core functions

 */

struct trace_kprobe {
@@ -221,7 +221,7 @@ static struct trace_kprobe *alloc_trace_kprobe(const char *group, 


	tk->rp.maxactive = maxactive;



	if (!event || !is_good_name(event)) {

	if (!event || !group) {

		ret = -EINVAL;

		goto error;

	}
@@ -231,11 +231,6 @@ static struct trace_kprobe *alloc_trace_kprobe(const char *group, 
	if (!tk->tp.call.name)

		goto error;



	if (!group || !is_good_name(group)) {

		ret = -EINVAL;

		goto error;

	}



	tk->tp.class.system = kstrdup(group, GFP_KERNEL);

	if (!tk->tp.class.system)

		goto error;
@@ -624,7 +619,11 @@ static int trace_kprobe_create(int argc, const char *argv[]) 
	if (event)

		event++;



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

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

		if (!is_return) {

			pr_info("Maxactive is not for kprobe");

			return -EINVAL;

		}

		if (event)

			len = event - &argv[0][1] - 1;

		else
@@ -634,8 +633,8 @@ static int trace_kprobe_create(int argc, const char *argv[]) 
		memcpy(buf, &argv[0][1], len);

		buf[len] = '\0';

		ret = kstrtouint(buf, 0, &maxactive);

		if (ret) {

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

		if (ret || !maxactive) {

			pr_info("Invalid maxactive number\n");

			return ret;

		}

		/* kretprobes instances are iterated over via a list. The
@@ -694,9 +693,9 @@ static int trace_kprobe_create(int argc, const char *argv[]) 
	tk = alloc_trace_kprobe(group, event, addr, symbol, offset, maxactive,

			       argc, is_return);

	if (IS_ERR(tk)) {

		pr_info("Failed to allocate trace_probe.(%d)\n",

			(int)PTR_ERR(tk));

		ret = PTR_ERR(tk);

		/* This must return -ENOMEM otherwise there is a bug */

		WARN_ON_ONCE(ret != -ENOMEM);

		goto out;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE