ftrace: build fix

Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

ftrace: build fix
Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Ingo Molnar · Thomas Gleixner
1 parent 0fd9e0dac9
Showing 2 changed files with 67 additions and 46 deletions Side-by-side Diff
kernel/trace/trace.c
kernel/trace/trace_functions.c
@@ -432,47 +432,6 @@
 	data->trace_tail_idx = 0;
 }
  
-#ifdef CONFIG_FTRACE
-static notrace void
-function_trace_call(unsigned long ip, unsigned long parent_ip)
-{
-	struct trace_array *tr = &global_trace;
-	struct trace_array_cpu *data;
-	unsigned long flags;
-	long disabled;
-	int cpu;
-
-	if (unlikely(!tracer_enabled))
-		return;
-
-	local_irq_save(flags);
-	cpu = raw_smp_processor_id();
-	data = tr->data[cpu];
-	disabled = atomic_inc_return(&data->disabled);
-
-	if (likely(disabled == 1))
-		ftrace(tr, data, ip, parent_ip, flags);
-
-	atomic_dec(&data->disabled);
-	local_irq_restore(flags);
-}
-
-static struct ftrace_ops trace_ops __read_mostly =
-{
-	.func = function_trace_call,
-};
-#endif
-
-notrace void tracing_start_function_trace(void)
-{
-	register_ftrace_function(&trace_ops);
-}
-
-notrace void tracing_stop_function_trace(void)
-{
-	unregister_ftrace_function(&trace_ops);
-}
-
 #define SAVED_CMDLINES 128
 static unsigned map_pid_to_cmdline[PID_MAX_DEFAULT+1];
 static unsigned map_cmdline_to_pid[SAVED_CMDLINES];
@@ -635,8 +594,8 @@
 }
  
 notrace void
-ftrace(struct trace_array *tr, struct trace_array_cpu *data,
-       unsigned long ip, unsigned long parent_ip, unsigned long flags)
+__ftrace(struct trace_array *tr, struct trace_array_cpu *data,
+	 unsigned long ip, unsigned long parent_ip, unsigned long flags)
 {
 	struct trace_entry *entry;
 	unsigned long irq_flags;
@@ -651,6 +610,14 @@
 }
  
 notrace void
+ftrace(struct trace_array *tr, struct trace_array_cpu *data,
+       unsigned long ip, unsigned long parent_ip, unsigned long flags)
+{
+	if (likely(!atomic_read(&data->disabled)))
+		__ftrace(tr, data, ip, parent_ip, flags);
+}
+
+notrace void
 trace_special(struct trace_array *tr, struct trace_array_cpu *data,
 	      unsigned long arg1, unsigned long arg2, unsigned long arg3)
 {
@@ -688,6 +655,47 @@
 	spin_unlock_irqrestore(&data->lock, irq_flags);
 }
  
+#ifdef CONFIG_FTRACE
+static notrace void
+function_trace_call(unsigned long ip, unsigned long parent_ip)
+{
+	struct trace_array *tr = &global_trace;
+	struct trace_array_cpu *data;
+	unsigned long flags;
+	long disabled;
+	int cpu;
+
+	if (unlikely(!tracer_enabled))
+		return;
+
+	local_irq_save(flags);
+	cpu = raw_smp_processor_id();
+	data = tr->data[cpu];
+	disabled = atomic_inc_return(&data->disabled);
+
+	if (likely(disabled == 1))
+		__ftrace(tr, data, ip, parent_ip, flags);
+
+	atomic_dec(&data->disabled);
+	local_irq_restore(flags);
+}
+
+static struct ftrace_ops trace_ops __read_mostly =
+{
+	.func = function_trace_call,
+};
+
+notrace void tracing_start_function_trace(void)
+{
+	register_ftrace_function(&trace_ops);
+}
+
+notrace void tracing_stop_function_trace(void)
+{
+	unregister_ftrace_function(&trace_ops);
+}
+#endif
+
 enum trace_file_type {
 	TRACE_FILE_LAT_FMT	= 1,
 };
@@ -722,7 +730,7 @@
 	return &array[iter->next_page_idx[cpu]];
 }
  
-static struct notrace trace_entry *
+static struct trace_entry * notrace
 find_next_entry(struct trace_iterator *iter, int *ent_cpu)
 {
 	struct trace_array *tr = iter->tr;
@@ -1866,6 +1874,7 @@
 	static cpumask_t mask;
 	static int start;
 	unsigned long flags;
+	int ftrace_save;
 	int read = 0;
 	int cpu;
 	int len;
@@ -1944,6 +1953,9 @@
  
 	cpus_clear(mask);
 	local_irq_save(flags);
+	ftrace_save = ftrace_enabled;
+	ftrace_enabled = 0;
+	smp_wmb();
 	for_each_possible_cpu(cpu) {
 		data = iter->tr->data[cpu];
  
  
@@ -1951,10 +1963,14 @@
 			continue;
  
 		atomic_inc(&data->disabled);
-		spin_lock(&data->lock);
 		cpu_set(cpu, mask);
 	}
  
+	for_each_cpu_mask(cpu, mask) {
+		data = iter->tr->data[cpu];
+		spin_lock(&data->lock);
+	}
+
 	while (find_next_entry_inc(iter) != NULL) {
 		int len = iter->seq.len;
  
  
@@ -1974,8 +1990,13 @@
 	for_each_cpu_mask(cpu, mask) {
 		data = iter->tr->data[cpu];
 		spin_unlock(&data->lock);
+	}
+
+	for_each_cpu_mask(cpu, mask) {
+		data = iter->tr->data[cpu];
 		atomic_dec(&data->disabled);
 	}
+	ftrace_enabled = ftrace_save;
 	local_irq_restore(flags);
  
 	/* Now copy what we have to the user */
@@ -9,10 +9,10 @@
  *  Copyright (C) 2004-2006 Ingo Molnar
  *  Copyright (C) 2004 William Lee Irwin III
  */
-#include <linux/fs.h>
 #include <linux/debugfs.h>
 #include <linux/uaccess.h>
 #include <linux/ftrace.h>
+#include <linux/fs.h>
  
 #include "trace.h"
...	...	@@ -432,47 +432,6 @@
432	432	data->trace_tail_idx = 0;
433	433	}
434	434
435		-#ifdef CONFIG_FTRACE
436		-static notrace void
437		-function_trace_call(unsigned long ip, unsigned long parent_ip)
438		-{
439		- struct trace_array *tr = &global_trace;
440		- struct trace_array_cpu *data;
441		- unsigned long flags;
442		- long disabled;
443		- int cpu;
444		-
445		- if (unlikely(!tracer_enabled))
446		- return;
447		-
448		- local_irq_save(flags);
449		- cpu = raw_smp_processor_id();
450		- data = tr->data[cpu];
451		- disabled = atomic_inc_return(&data->disabled);
452		-
453		- if (likely(disabled == 1))
454		- ftrace(tr, data, ip, parent_ip, flags);
455		-
456		- atomic_dec(&data->disabled);
457		- local_irq_restore(flags);
458		-}
459		-
460		-static struct ftrace_ops trace_ops __read_mostly =
461		-{
462		- .func = function_trace_call,
463		-};
464		-#endif
465		-
466		-notrace void tracing_start_function_trace(void)
467		-{
468		- register_ftrace_function(&trace_ops);
469		-}
470		-
471		-notrace void tracing_stop_function_trace(void)
472		-{
473		- unregister_ftrace_function(&trace_ops);
474		-}
475		-
476	435	#define SAVED_CMDLINES 128
477	436	static unsigned map_pid_to_cmdline[PID_MAX_DEFAULT+1];
478	437	static unsigned map_cmdline_to_pid[SAVED_CMDLINES];
...	...	@@ -635,8 +594,8 @@
635	594	}
636	595
637	596	notrace void
638		-ftrace(struct trace_array tr, struct trace_array_cpu data,
639		- unsigned long ip, unsigned long parent_ip, unsigned long flags)
	597	+__ftrace(struct trace_array tr, struct trace_array_cpu data,
	598	+ unsigned long ip, unsigned long parent_ip, unsigned long flags)
640	599	{
641	600	struct trace_entry *entry;
642	601	unsigned long irq_flags;
...	...	@@ -651,6 +610,14 @@
651	610	}
652	611
653	612	notrace void
	613	+ftrace(struct trace_array tr, struct trace_array_cpu data,
	614	+ unsigned long ip, unsigned long parent_ip, unsigned long flags)
	615	+{
	616	+ if (likely(!atomic_read(&data->disabled)))
	617	+ __ftrace(tr, data, ip, parent_ip, flags);
	618	+}
	619	+
	620	+notrace void
654	621	trace_special(struct trace_array tr, struct trace_array_cpu data,
655	622	unsigned long arg1, unsigned long arg2, unsigned long arg3)
656	623	{
...	...	@@ -688,6 +655,47 @@
688	655	spin_unlock_irqrestore(&data->lock, irq_flags);
689	656	}
690	657
	658	+#ifdef CONFIG_FTRACE
	659	+static notrace void
	660	+function_trace_call(unsigned long ip, unsigned long parent_ip)
	661	+{
	662	+ struct trace_array *tr = &global_trace;
	663	+ struct trace_array_cpu *data;
	664	+ unsigned long flags;
	665	+ long disabled;
	666	+ int cpu;
	667	+
	668	+ if (unlikely(!tracer_enabled))
	669	+ return;
	670	+
	671	+ local_irq_save(flags);
	672	+ cpu = raw_smp_processor_id();
	673	+ data = tr->data[cpu];
	674	+ disabled = atomic_inc_return(&data->disabled);
	675	+
	676	+ if (likely(disabled == 1))
	677	+ __ftrace(tr, data, ip, parent_ip, flags);
	678	+
	679	+ atomic_dec(&data->disabled);
	680	+ local_irq_restore(flags);
	681	+}
	682	+
	683	+static struct ftrace_ops trace_ops __read_mostly =
	684	+{
	685	+ .func = function_trace_call,
	686	+};
	687	+
	688	+notrace void tracing_start_function_trace(void)
	689	+{
	690	+ register_ftrace_function(&trace_ops);
	691	+}
	692	+
	693	+notrace void tracing_stop_function_trace(void)
	694	+{
	695	+ unregister_ftrace_function(&trace_ops);
	696	+}
	697	+#endif
	698	+
691	699	enum trace_file_type {
692	700	TRACE_FILE_LAT_FMT = 1,
693	701	};
...	...	@@ -722,7 +730,7 @@
722	730	return &array[iter->next_page_idx[cpu]];
723	731	}
724	732
725		-static struct notrace trace_entry *
	733	+static struct trace_entry * notrace
726	734	find_next_entry(struct trace_iterator iter, int ent_cpu)
727	735	{
728	736	struct trace_array *tr = iter->tr;
...	...	@@ -1866,6 +1874,7 @@
1866	1874	static cpumask_t mask;
1867	1875	static int start;
1868	1876	unsigned long flags;
	1877	+ int ftrace_save;
1869	1878	int read = 0;
1870	1879	int cpu;
1871	1880	int len;
...	...	@@ -1944,6 +1953,9 @@
1944	1953
1945	1954	cpus_clear(mask);
1946	1955	local_irq_save(flags);
	1956	+ ftrace_save = ftrace_enabled;
	1957	+ ftrace_enabled = 0;
	1958	+ smp_wmb();
1947	1959	for_each_possible_cpu(cpu) {
1948	1960	data = iter->tr->data[cpu];
1949	1961
1950	1962
...	...	@@ -1951,10 +1963,14 @@
1951	1963	continue;
1952	1964
1953	1965	atomic_inc(&data->disabled);
1954		- spin_lock(&data->lock);
1955	1966	cpu_set(cpu, mask);
1956	1967	}
1957	1968
	1969	+ for_each_cpu_mask(cpu, mask) {
	1970	+ data = iter->tr->data[cpu];
	1971	+ spin_lock(&data->lock);
	1972	+ }
	1973	+
1958	1974	while (find_next_entry_inc(iter) != NULL) {
1959	1975	int len = iter->seq.len;
1960	1976
1961	1977
...	...	@@ -1974,8 +1990,13 @@
1974	1990	for_each_cpu_mask(cpu, mask) {
1975	1991	data = iter->tr->data[cpu];
1976	1992	spin_unlock(&data->lock);
	1993	+ }
	1994	+
	1995	+ for_each_cpu_mask(cpu, mask) {
	1996	+ data = iter->tr->data[cpu];
1977	1997	atomic_dec(&data->disabled);
1978	1998	}
	1999	+ ftrace_enabled = ftrace_save;
1979	2000	local_irq_restore(flags);
1980	2001
1981	2002	/* Now copy what we have to the user */
...	...	@@ -9,10 +9,10 @@
9	9	* Copyright (C) 2004-2006 Ingo Molnar
10	10	* Copyright (C) 2004 William Lee Irwin III
11	11	*/
12		-#include <linux/fs.h>
13	12	#include <linux/debugfs.h>
14	13	#include <linux/uaccess.h>
15	14	#include <linux/ftrace.h>
	15	+#include <linux/fs.h>
16	16
17	17	#include "trace.h"
18	18