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

Commit 9b71272b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'tracing-fixes-for-linus' of... 

Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  ftrace: Fix the output of profile
  ring-buffer: Make it generally available
  ftrace: Remove duplicate newline
  tracing: Fix trace_buf_size boot option
  ftrace: Fix t_hash_start()
  ftrace: Don't manipulate @pos in t_start()
  ftrace: Don't increment @pos in g_start()
  tracing: Reset iterator in t_start()
  trace_stat: Don't increment @pos in seq start()
  tracing_bprintk: Don't increment @pos in t_start()
  tracing/events: Don't increment @pos in s_start()
parents 61abfd2d 0296e425

Documentation/kernel-parameters.txt

+2 −1
Original line number Original line Diff line number Diff line
@@ -2467,7 +2467,8 @@ and is between 256 and 4096 characters. It is defined in the file 




	tp720=		[HW,PS2]

	tp720=		[HW,PS2]





	trace_buf_size=nn[KMG] [ftrace] will set tracing buffer size.

	trace_buf_size=nn[KMG]

			[FTRACE] will set tracing buffer size.





	trix=		[HW,OSS] MediaTrix AudioTrix Pro

	trix=		[HW,OSS] MediaTrix AudioTrix Pro

			Format:

			Format:

kernel/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -96,6 +96,7 @@ obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o 
obj-$(CONFIG_FUNCTION_TRACER) += trace/

obj-$(CONFIG_FUNCTION_TRACER) += trace/

obj-$(CONFIG_TRACING) += trace/

obj-$(CONFIG_TRACING) += trace/

obj-$(CONFIG_X86_DS) += trace/

obj-$(CONFIG_X86_DS) += trace/

obj-$(CONFIG_RING_BUFFER) += trace/

obj-$(CONFIG_SMP) += sched_cpupri.o

obj-$(CONFIG_SMP) += sched_cpupri.o

obj-$(CONFIG_SLOW_WORK) += slow-work.o

obj-$(CONFIG_SLOW_WORK) += slow-work.o

obj-$(CONFIG_PERF_COUNTERS) += perf_counter.o

obj-$(CONFIG_PERF_COUNTERS) += perf_counter.o

kernel/trace/ftrace.c

+32 −24
Original line number Original line Diff line number Diff line
@@ -291,7 +291,9 @@ function_stat_next(void *v, int idx) 
	pg = (struct ftrace_profile_page *)((unsigned long)rec & PAGE_MASK);

	pg = (struct ftrace_profile_page *)((unsigned long)rec & PAGE_MASK);





 again:

 again:

	if (idx != 0)

		rec++;

		rec++;



	if ((void *)rec >= (void *)&pg->records[pg->index]) {

	if ((void *)rec >= (void *)&pg->records[pg->index]) {

		pg = pg->next;

		pg = pg->next;

		if (!pg)

		if (!pg)
@@ -1417,10 +1419,20 @@ static void *t_hash_start(struct seq_file *m, loff_t *pos) 
{

{

	struct ftrace_iterator *iter = m->private;

	struct ftrace_iterator *iter = m->private;

	void *p = NULL;

	void *p = NULL;

	loff_t l;



	if (!(iter->flags & FTRACE_ITER_HASH))

		*pos = 0;





	iter->flags |= FTRACE_ITER_HASH;

	iter->flags |= FTRACE_ITER_HASH;





	return t_hash_next(m, p, pos);

	iter->hidx = 0;

	for (l = 0; l <= *pos; ) {

		p = t_hash_next(m, p, &l);

		if (!p)

			break;

	}

	return p;

}

}





static int t_hash_show(struct seq_file *m, void *v)

static int t_hash_show(struct seq_file *m, void *v)
@@ -1467,8 +1479,6 @@ t_next(struct seq_file *m, void *v, loff_t *pos) 
			iter->pg = iter->pg->next;

			iter->pg = iter->pg->next;

			iter->idx = 0;

			iter->idx = 0;

			goto retry;

			goto retry;

		} else {

			iter->idx = -1;

		}

		}

	} else {

	} else {

		rec = &iter->pg->records[iter->idx++];

		rec = &iter->pg->records[iter->idx++];
@@ -1497,6 +1507,7 @@ static void *t_start(struct seq_file *m, loff_t *pos) 
{

{

	struct ftrace_iterator *iter = m->private;

	struct ftrace_iterator *iter = m->private;

	void *p = NULL;

	void *p = NULL;

	loff_t l;





	mutex_lock(&ftrace_lock);

	mutex_lock(&ftrace_lock);

	/*

	/*
@@ -1508,23 +1519,21 @@ static void *t_start(struct seq_file *m, loff_t *pos) 
		if (*pos > 0)

		if (*pos > 0)

			return t_hash_start(m, pos);

			return t_hash_start(m, pos);

		iter->flags |= FTRACE_ITER_PRINTALL;

		iter->flags |= FTRACE_ITER_PRINTALL;

		(*pos)++;

		return iter;

		return iter;

	}

	}





	if (iter->flags & FTRACE_ITER_HASH)

	if (iter->flags & FTRACE_ITER_HASH)

		return t_hash_start(m, pos);

		return t_hash_start(m, pos);





	if (*pos > 0) {

	iter->pg = ftrace_pages_start;

		if (iter->idx < 0)

	iter->idx = 0;

			return p;

	for (l = 0; l <= *pos; ) {

		(*pos)--;

		p = t_next(m, p, &l);

		iter->idx--;

		if (!p)

			break;

	}

	}





	p = t_next(m, p, pos);

	if (!p && iter->flags & FTRACE_ITER_FILTER)



	if (!p)

		return t_hash_start(m, pos);

		return t_hash_start(m, pos);





	return p;

	return p;
@@ -2500,32 +2509,31 @@ int ftrace_graph_count; 
unsigned long ftrace_graph_funcs[FTRACE_GRAPH_MAX_FUNCS] __read_mostly;

unsigned long ftrace_graph_funcs[FTRACE_GRAPH_MAX_FUNCS] __read_mostly;





static void *

static void *

g_next(struct seq_file *m, void *v, loff_t *pos)

__g_next(struct seq_file *m, loff_t *pos)

{

{

	unsigned long *array = m->private;

	unsigned long *array = m->private;

	int index = *pos;



	(*pos)++;





	if (index >= ftrace_graph_count)

	if (*pos >= ftrace_graph_count)

		return NULL;

		return NULL;

	return &array[*pos];

}





	return &array[index];

static void *

g_next(struct seq_file *m, void *v, loff_t *pos)

{

	(*pos)++;

	return __g_next(m, pos);

}

}





static void *g_start(struct seq_file *m, loff_t *pos)

static void *g_start(struct seq_file *m, loff_t *pos)

{

{

	void *p = NULL;



	mutex_lock(&graph_lock);

	mutex_lock(&graph_lock);





	/* Nothing, tell g_show to print all functions are enabled */

	/* Nothing, tell g_show to print all functions are enabled */

	if (!ftrace_graph_count && !*pos)

	if (!ftrace_graph_count && !*pos)

		return (void *)1;

		return (void *)1;





	p = g_next(m, p, pos);

	return __g_next(m, pos);



	return p;

}

}





static void g_stop(struct seq_file *m, void *p)

static void g_stop(struct seq_file *m, void *p)

kernel/trace/ring_buffer.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -1563,6 +1563,8 @@ rb_reserve_next_event(struct ring_buffer_per_cpu *cpu_buffer, 
	return NULL;

	return NULL;

}

}





#ifdef CONFIG_TRACING



#define TRACE_RECURSIVE_DEPTH 16

#define TRACE_RECURSIVE_DEPTH 16





static int trace_recursive_lock(void)

static int trace_recursive_lock(void)
@@ -1593,6 +1595,13 @@ static void trace_recursive_unlock(void) 
	current->trace_recursion--;

	current->trace_recursion--;

}

}





#else



#define trace_recursive_lock()		(0)

#define trace_recursive_unlock()	do { } while (0)



#endif



static DEFINE_PER_CPU(int, rb_need_resched);

static DEFINE_PER_CPU(int, rb_need_resched);





/**

/**
@@ -3104,6 +3113,7 @@ int ring_buffer_read_page(struct ring_buffer *buffer, 
}

}

EXPORT_SYMBOL_GPL(ring_buffer_read_page);

EXPORT_SYMBOL_GPL(ring_buffer_read_page);





#ifdef CONFIG_TRACING

static ssize_t

static ssize_t

rb_simple_read(struct file *filp, char __user *ubuf,

rb_simple_read(struct file *filp, char __user *ubuf,

	       size_t cnt, loff_t *ppos)

	       size_t cnt, loff_t *ppos)
@@ -3171,6 +3181,7 @@ static __init int rb_init_debugfs(void) 
}

}





fs_initcall(rb_init_debugfs);

fs_initcall(rb_init_debugfs);

#endif





#ifdef CONFIG_HOTPLUG_CPU

#ifdef CONFIG_HOTPLUG_CPU

static int rb_cpu_notify(struct notifier_block *self,

static int rb_cpu_notify(struct notifier_block *self,

kernel/trace/trace.c

+6 −17
Original line number Original line Diff line number Diff line
@@ -284,13 +284,12 @@ void trace_wake_up(void) 
static int __init set_buf_size(char *str)

static int __init set_buf_size(char *str)

{

{

	unsigned long buf_size;

	unsigned long buf_size;

	int ret;





	if (!str)

	if (!str)

		return 0;

		return 0;

	ret = strict_strtoul(str, 0, &buf_size);

	buf_size = memparse(str, &str);

	/* nr_entries can not be zero */

	/* nr_entries can not be zero */

	if (ret < 0 || buf_size == 0)

	if (buf_size == 0)

		return 0;

		return 0;

	trace_buf_size = buf_size;

	trace_buf_size = buf_size;

	return 1;

	return 1;
@@ -2053,25 +2052,23 @@ static int tracing_open(struct inode *inode, struct file *file) 
static void *

static void *

t_next(struct seq_file *m, void *v, loff_t *pos)

t_next(struct seq_file *m, void *v, loff_t *pos)

{

{

	struct tracer *t = m->private;

	struct tracer *t = v;





	(*pos)++;

	(*pos)++;





	if (t)

	if (t)

		t = t->next;

		t = t->next;





	m->private = t;



	return t;

	return t;

}

}





static void *t_start(struct seq_file *m, loff_t *pos)

static void *t_start(struct seq_file *m, loff_t *pos)

{

{

	struct tracer *t = m->private;

	struct tracer *t;

	loff_t l = 0;

	loff_t l = 0;





	mutex_lock(&trace_types_lock);

	mutex_lock(&trace_types_lock);

	for (; t && l < *pos; t = t_next(m, t, &l))

	for (t = trace_types; t && l < *pos; t = t_next(m, t, &l))

		;

		;





	return t;

	return t;
@@ -2107,18 +2104,10 @@ static struct seq_operations show_traces_seq_ops = { 




static int show_traces_open(struct inode *inode, struct file *file)

static int show_traces_open(struct inode *inode, struct file *file)

{

{

	int ret;



	if (tracing_disabled)

	if (tracing_disabled)

		return -ENODEV;

		return -ENODEV;





	ret = seq_open(file, &show_traces_seq_ops);

	return seq_open(file, &show_traces_seq_ops);

	if (!ret) {

		struct seq_file *m = file->private_data;

		m->private = trace_types;

	}



	return ret;

}

}





static ssize_t

static ssize_t