perf, tracing: add missing __percpu markups
PATCH 1/1 perf, tracing: add missing __percpu markups
ftrace_event_call->perf_events, perf_trace_buf, fgraph_data->cpu_data and some local variables are percpu pointers but were missing __percpu markup. Add it.
--- include/linux/ftrace_event.h | 4 ++-- kernel/trace/trace_event_perf.c | 15 ++++++++------- kernel/trace/trace_functions_graph.c | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-)
include/linux/ftrace_event.h +2 -2
@@ -184,8 +184,8 @@ struct ftrace_event_call {unsigned int flags;#ifdef CONFIG_PERF_EVENTS -int perf_refcount; -struct hlist_head *perf_events; +int perf_refcount; +struct hlist_head __percpu *perf_events;#endif };
kernel/trace/trace_event_perf.c +8 -7
@@ -11,7 +11,7 @@EXPORT_SYMBOL_GPL (perf_arch_fetch_caller_regs); -static char *perf_trace_buf[4 ]; +static char __percpu *perf_trace_buf[4 ];/* * Force it to be aligned to unsigned long to avoid misaligned accesses
@@ -26,7 +26,7 @@ static int total_ref_count;static int perf_trace_event_init (struct ftrace_event_call *tp_event,struct perf_event *p_event) { -struct hlist_head *list; +struct hlist_head __percpu *list;int ret = -ENOMEM ;int cpu;
@@ -44,11 +44,11 @@ static int perf_trace_event_init(struct ftrace_event_call *tp_event, tp_event->perf_events = list;if (!total_ref_count) { -char *buf; +char __percpu *buf;int i;for (i =0 ; i <4 ; i++) { - buf = (char *)alloc_percpu (perf_trace_t); + buf = (char __percpu *)alloc_percpu (perf_trace_t);if (!buf) goto fail;
@@ -112,13 +112,14 @@ int perf_trace_init(struct perf_event *p_event)int perf_trace_enable (struct perf_event *p_event) {struct ftrace_event_call *tp_event = p_event->tp_event; +struct hlist_head __percpu *pcpu_list;struct hlist_head *list; - list = tp_event->perf_events; -if (WARN_ON_ONCE (!list)) + pcpu_list = tp_event->perf_events; +if (WARN_ON_ONCE (!pcpu_list))return -EINVAL ; - list =this_cpu_ptr (list); + list =this_cpu_ptr (pcpu_list);hlist_add_head_rcu (&p_event->hlist_entry, list);return 0 ;
kernel/trace/trace_functions_graph.c +1 -1
@@ -23,7 +23,7 @@ struct fgraph_cpu_data { };struct fgraph_data { -struct fgraph_cpu_data *cpu_data; +struct fgraph_cpu_data __percpu *cpu_data;/* Place to preserve last processed entry. */ struct ftrace_graph_ent_entry ent;
Signature · 1 line
1.7.0.4
Quoted 5 lines · Namhyung Kim
ftrace_event_call->perf_events,perf_trace_buf,fgraph_data->cpu_dataand some local variables are percpu pointers but were missing__percpumarkup. Add it.Signed-off-by Namhyung Kim <[email protected]>
Thanks.
Signature · 6 lines
tejun -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a mersage to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Frederic Weisbecker
AppliedQuoted 8 lines · Tejun Heo
Quoted 5 lines · Namhyung Kim
ftrace_event_call->perf_events,perf_trace_buf,fgraph_data->cpu_dataand some local variables are percpu pointers but were missing__percpumarkup. Add it.Signed-off-by Namhyung Kim <[email protected]>Acked-by Tejun Heo <[email protected]>
Queued, thanks!
Commit-ID: 6016ee13db518ab1cd0cbf43fc2ad5712021e338 Gitweb: http://git.kernel.org/tip/6016ee13db518ab1cd0cbf43fc2ad5712021e338 Author: Namhyung Kim <[email protected]> AuthorDate: Wed, 11 Aug 2010 12:47:59 +0900 Committer: Frederic Weisbecker <[email protected]> CommitDate: Thu, 19 Aug 2010 01:33:05 +0200
perf, tracing: add missing __percpu markups
ftrace_event_call->perf_events, perf_trace_buf, fgraph_data->cpu_data and some local variables are percpu pointers missing __percpu markups. Add them.
LKML-Reference: <[email protected]>
--- include/linux/ftrace_event.h | 4 ++-- kernel/trace/trace_event_perf.c | 15 ++++++++------- kernel/trace/trace_functions_graph.c | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-)
include/linux/ftrace_event.h +2 -2
@@ -191,8 +191,8 @@ struct ftrace_event_call {unsigned int flags;#ifdef CONFIG_PERF_EVENTS -int perf_refcount; -struct hlist_head *perf_events; +int perf_refcount; +struct hlist_head __percpu *perf_events;#endif };
kernel/trace/trace_event_perf.c +8 -7
@@ -9,7 +9,7 @@#include <linux/kprobes.h> #include "trace.h" -static char *perf_trace_buf[PERF_NR_CONTEXTS ]; +static char __percpu *perf_trace_buf[PERF_NR_CONTEXTS ];/* * Force it to be aligned to unsigned long to avoid misaligned accesses
@@ -24,7 +24,7 @@ static int total_ref_count;static int perf_trace_event_init (struct ftrace_event_call *tp_event,struct perf_event *p_event) { -struct hlist_head *list; +struct hlist_head __percpu *list;int ret = -ENOMEM ;int cpu;
@@ -42,11 +42,11 @@ static int perf_trace_event_init(struct ftrace_event_call *tp_event, tp_event->perf_events = list;if (!total_ref_count) { -char *buf; +char __percpu *buf;int i;for (i =0 ; i <PERF_NR_CONTEXTS ; i++) { - buf = (char *)alloc_percpu (perf_trace_t); + buf = (char __percpu *)alloc_percpu (perf_trace_t);if (!buf) goto fail;
@@ -102,13 +102,14 @@ int perf_trace_init(struct perf_event *p_event)int perf_trace_enable (struct perf_event *p_event) {struct ftrace_event_call *tp_event = p_event->tp_event; +struct hlist_head __percpu *pcpu_list;struct hlist_head *list; - list = tp_event->perf_events; -if (WARN_ON_ONCE (!list)) + pcpu_list = tp_event->perf_events; +if (WARN_ON_ONCE (!pcpu_list))return -EINVAL ; - list =this_cpu_ptr (list); + list =this_cpu_ptr (pcpu_list);hlist_add_head_rcu (&p_event->hlist_entry, list);return 0 ;
kernel/trace/trace_functions_graph.c +1 -1
@@ -23,7 +23,7 @@ struct fgraph_cpu_data { };struct fgraph_data { -struct fgraph_cpu_data *cpu_data; +struct fgraph_cpu_data __percpu *cpu_data;/* Place to preserve last processed entry. */ struct ftrace_graph_ent_entry ent;