* [PATCH 2/2] ftrace: Use local_irq_{save,restore}_nmi() in tracers.
@ 2010-04-06 23:40 David Miller
2010-04-07 1:14 ` Steven Rostedt
2010-04-07 10:28 ` David Miller
0 siblings, 2 replies; 6+ messages in thread
From: David Miller @ 2010-04-06 23:40 UTC (permalink / raw)
To: a.p.zijlstra
Cc: mingo, acme, paulus, efault, fweisbec, tglx, linux-kernel,
sparclinux, linux-arch
Signed-off-by: David S. Miller <davem@davemloft.net>
---
kernel/trace/ftrace.c | 4 ++--
kernel/trace/trace_functions.c | 8 ++++----
kernel/trace/trace_sched_wakeup.c | 4 ++--
kernel/trace/trace_stack.c | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index d9062f5..41d4282 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -612,7 +612,7 @@ function_profile_call(unsigned long ip, unsigned long parent_ip)
if (!ftrace_profile_enabled)
return;
- local_irq_save(flags);
+ local_irq_save_nmi(flags);
stat = &__get_cpu_var(ftrace_profile_stats);
if (!stat->hash || !ftrace_profile_enabled)
@@ -627,7 +627,7 @@ function_profile_call(unsigned long ip, unsigned long parent_ip)
rec->counter++;
out:
- local_irq_restore(flags);
+ local_irq_restore_nmi(flags);
}
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c
index b3f3776..cac3f8d 100644
--- a/kernel/trace/trace_functions.c
+++ b/kernel/trace/trace_functions.c
@@ -91,7 +91,7 @@ function_trace_call(unsigned long ip, unsigned long parent_ip)
* Need to use raw, since this must be called before the
* recursive protection is performed.
*/
- local_irq_save(flags);
+ local_irq_save_nmi(flags);
cpu = raw_smp_processor_id();
data = tr->data[cpu];
disabled = atomic_inc_return(&data->disabled);
@@ -102,7 +102,7 @@ function_trace_call(unsigned long ip, unsigned long parent_ip)
}
atomic_dec(&data->disabled);
- local_irq_restore(flags);
+ local_irq_restore_nmi(flags);
}
static void
@@ -122,7 +122,7 @@ function_stack_trace_call(unsigned long ip, unsigned long parent_ip)
* Need to use raw, since this must be called before the
* recursive protection is performed.
*/
- local_irq_save(flags);
+ local_irq_save_nmi(flags);
cpu = raw_smp_processor_id();
data = tr->data[cpu];
disabled = atomic_inc_return(&data->disabled);
@@ -142,7 +142,7 @@ function_stack_trace_call(unsigned long ip, unsigned long parent_ip)
}
atomic_dec(&data->disabled);
- local_irq_restore(flags);
+ local_irq_restore_nmi(flags);
}
diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.c
index 0271742..891d3a0 100644
--- a/kernel/trace/trace_sched_wakeup.c
+++ b/kernel/trace/trace_sched_wakeup.c
@@ -65,11 +65,11 @@ wakeup_tracer_call(unsigned long ip, unsigned long parent_ip)
if (unlikely(disabled != 1))
goto out;
- local_irq_save(flags);
+ local_irq_save_nmi(flags);
trace_function(tr, ip, parent_ip, flags, pc);
- local_irq_restore(flags);
+ local_irq_restore_nmi(flags);
out:
atomic_dec(&data->disabled);
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
index f4bc9b2..14fa61c 100644
--- a/kernel/trace/trace_stack.c
+++ b/kernel/trace/trace_stack.c
@@ -53,7 +53,7 @@ static inline void check_stack(void)
if (!object_is_on_stack(&this_size))
return;
- local_irq_save(flags);
+ local_irq_save_nmi(flags);
arch_spin_lock(&max_stack_lock);
/* a race could have already updated it */
@@ -104,7 +104,7 @@ static inline void check_stack(void)
out:
arch_spin_unlock(&max_stack_lock);
- local_irq_restore(flags);
+ local_irq_restore_nmi(flags);
}
static void
--
1.6.6.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] ftrace: Use local_irq_{save,restore}_nmi() in tracers.
2010-04-06 23:40 [PATCH 2/2] ftrace: Use local_irq_{save,restore}_nmi() in tracers David Miller
@ 2010-04-07 1:14 ` Steven Rostedt
2010-04-07 1:14 ` Steven Rostedt
2010-04-07 1:17 ` David Miller
2010-04-07 10:28 ` David Miller
1 sibling, 2 replies; 6+ messages in thread
From: Steven Rostedt @ 2010-04-07 1:14 UTC (permalink / raw)
To: David Miller
Cc: a.p.zijlstra, mingo, acme, paulus, efault, fweisbec, tglx,
linux-kernel, sparclinux, linux-arch
On Tue, 2010-04-06 at 16:40 -0700, David Miller wrote:
> Signed-off-by: David S. Miller <davem@davemloft.net>
> ---
> kernel/trace/ftrace.c | 4 ++--
> kernel/trace/trace_functions.c | 8 ++++----
> kernel/trace/trace_sched_wakeup.c | 4 ++--
> kernel/trace/trace_stack.c | 4 ++--
> 4 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
> index d9062f5..41d4282 100644
> --- a/kernel/trace/ftrace.c
> +++ b/kernel/trace/ftrace.c
> @@ -612,7 +612,7 @@ function_profile_call(unsigned long ip, unsigned long parent_ip)
> if (!ftrace_profile_enabled)
> return;
>
> - local_irq_save(flags);
> + local_irq_save_nmi(flags);
These are equivalent for non sparc archs, correct?
If so,
Acked-by: Steven Rostedt <rostedt@goodmis.org>
-- Steve
>
> stat = &__get_cpu_var(ftrace_profile_stats);
> if (!stat->hash || !ftrace_profile_enabled)
> @@ -627,7 +627,7 @@ function_profile_call(unsigned long ip, unsigned long parent_ip)
>
> rec->counter++;
> out:
> - local_irq_restore(flags);
> + local_irq_restore_nmi(flags);
> }
>
> #ifdef CONFIG_FUNCTION_GRAPH_TRACER
> diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c
> index b3f3776..cac3f8d 100644
> --- a/kernel/trace/trace_functions.c
> +++ b/kernel/trace/trace_functions.c
> @@ -91,7 +91,7 @@ function_trace_call(unsigned long ip, unsigned long parent_ip)
> * Need to use raw, since this must be called before the
> * recursive protection is performed.
> */
> - local_irq_save(flags);
> + local_irq_save_nmi(flags);
> cpu = raw_smp_processor_id();
> data = tr->data[cpu];
> disabled = atomic_inc_return(&data->disabled);
> @@ -102,7 +102,7 @@ function_trace_call(unsigned long ip, unsigned long parent_ip)
> }
>
> atomic_dec(&data->disabled);
> - local_irq_restore(flags);
> + local_irq_restore_nmi(flags);
> }
>
> static void
> @@ -122,7 +122,7 @@ function_stack_trace_call(unsigned long ip, unsigned long parent_ip)
> * Need to use raw, since this must be called before the
> * recursive protection is performed.
> */
> - local_irq_save(flags);
> + local_irq_save_nmi(flags);
> cpu = raw_smp_processor_id();
> data = tr->data[cpu];
> disabled = atomic_inc_return(&data->disabled);
> @@ -142,7 +142,7 @@ function_stack_trace_call(unsigned long ip, unsigned long parent_ip)
> }
>
> atomic_dec(&data->disabled);
> - local_irq_restore(flags);
> + local_irq_restore_nmi(flags);
> }
>
>
> diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.c
> index 0271742..891d3a0 100644
> --- a/kernel/trace/trace_sched_wakeup.c
> +++ b/kernel/trace/trace_sched_wakeup.c
> @@ -65,11 +65,11 @@ wakeup_tracer_call(unsigned long ip, unsigned long parent_ip)
> if (unlikely(disabled != 1))
> goto out;
>
> - local_irq_save(flags);
> + local_irq_save_nmi(flags);
>
> trace_function(tr, ip, parent_ip, flags, pc);
>
> - local_irq_restore(flags);
> + local_irq_restore_nmi(flags);
>
> out:
> atomic_dec(&data->disabled);
> diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
> index f4bc9b2..14fa61c 100644
> --- a/kernel/trace/trace_stack.c
> +++ b/kernel/trace/trace_stack.c
> @@ -53,7 +53,7 @@ static inline void check_stack(void)
> if (!object_is_on_stack(&this_size))
> return;
>
> - local_irq_save(flags);
> + local_irq_save_nmi(flags);
> arch_spin_lock(&max_stack_lock);
>
> /* a race could have already updated it */
> @@ -104,7 +104,7 @@ static inline void check_stack(void)
>
> out:
> arch_spin_unlock(&max_stack_lock);
> - local_irq_restore(flags);
> + local_irq_restore_nmi(flags);
> }
>
> static void
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] ftrace: Use local_irq_{save,restore}_nmi() in tracers.
2010-04-07 1:14 ` Steven Rostedt
@ 2010-04-07 1:14 ` Steven Rostedt
2010-04-07 1:17 ` David Miller
1 sibling, 0 replies; 6+ messages in thread
From: Steven Rostedt @ 2010-04-07 1:14 UTC (permalink / raw)
To: David Miller
Cc: a.p.zijlstra, mingo, acme, paulus, efault, fweisbec, tglx,
linux-kernel, sparclinux, linux-arch
On Tue, 2010-04-06 at 16:40 -0700, David Miller wrote:
> Signed-off-by: David S. Miller <davem@davemloft.net>
> ---
> kernel/trace/ftrace.c | 4 ++--
> kernel/trace/trace_functions.c | 8 ++++----
> kernel/trace/trace_sched_wakeup.c | 4 ++--
> kernel/trace/trace_stack.c | 4 ++--
> 4 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
> index d9062f5..41d4282 100644
> --- a/kernel/trace/ftrace.c
> +++ b/kernel/trace/ftrace.c
> @@ -612,7 +612,7 @@ function_profile_call(unsigned long ip, unsigned long parent_ip)
> if (!ftrace_profile_enabled)
> return;
>
> - local_irq_save(flags);
> + local_irq_save_nmi(flags);
These are equivalent for non sparc archs, correct?
If so,
Acked-by: Steven Rostedt <rostedt@goodmis.org>
-- Steve
>
> stat = &__get_cpu_var(ftrace_profile_stats);
> if (!stat->hash || !ftrace_profile_enabled)
> @@ -627,7 +627,7 @@ function_profile_call(unsigned long ip, unsigned long parent_ip)
>
> rec->counter++;
> out:
> - local_irq_restore(flags);
> + local_irq_restore_nmi(flags);
> }
>
> #ifdef CONFIG_FUNCTION_GRAPH_TRACER
> diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c
> index b3f3776..cac3f8d 100644
> --- a/kernel/trace/trace_functions.c
> +++ b/kernel/trace/trace_functions.c
> @@ -91,7 +91,7 @@ function_trace_call(unsigned long ip, unsigned long parent_ip)
> * Need to use raw, since this must be called before the
> * recursive protection is performed.
> */
> - local_irq_save(flags);
> + local_irq_save_nmi(flags);
> cpu = raw_smp_processor_id();
> data = tr->data[cpu];
> disabled = atomic_inc_return(&data->disabled);
> @@ -102,7 +102,7 @@ function_trace_call(unsigned long ip, unsigned long parent_ip)
> }
>
> atomic_dec(&data->disabled);
> - local_irq_restore(flags);
> + local_irq_restore_nmi(flags);
> }
>
> static void
> @@ -122,7 +122,7 @@ function_stack_trace_call(unsigned long ip, unsigned long parent_ip)
> * Need to use raw, since this must be called before the
> * recursive protection is performed.
> */
> - local_irq_save(flags);
> + local_irq_save_nmi(flags);
> cpu = raw_smp_processor_id();
> data = tr->data[cpu];
> disabled = atomic_inc_return(&data->disabled);
> @@ -142,7 +142,7 @@ function_stack_trace_call(unsigned long ip, unsigned long parent_ip)
> }
>
> atomic_dec(&data->disabled);
> - local_irq_restore(flags);
> + local_irq_restore_nmi(flags);
> }
>
>
> diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.c
> index 0271742..891d3a0 100644
> --- a/kernel/trace/trace_sched_wakeup.c
> +++ b/kernel/trace/trace_sched_wakeup.c
> @@ -65,11 +65,11 @@ wakeup_tracer_call(unsigned long ip, unsigned long parent_ip)
> if (unlikely(disabled != 1))
> goto out;
>
> - local_irq_save(flags);
> + local_irq_save_nmi(flags);
>
> trace_function(tr, ip, parent_ip, flags, pc);
>
> - local_irq_restore(flags);
> + local_irq_restore_nmi(flags);
>
> out:
> atomic_dec(&data->disabled);
> diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
> index f4bc9b2..14fa61c 100644
> --- a/kernel/trace/trace_stack.c
> +++ b/kernel/trace/trace_stack.c
> @@ -53,7 +53,7 @@ static inline void check_stack(void)
> if (!object_is_on_stack(&this_size))
> return;
>
> - local_irq_save(flags);
> + local_irq_save_nmi(flags);
> arch_spin_lock(&max_stack_lock);
>
> /* a race could have already updated it */
> @@ -104,7 +104,7 @@ static inline void check_stack(void)
>
> out:
> arch_spin_unlock(&max_stack_lock);
> - local_irq_restore(flags);
> + local_irq_restore_nmi(flags);
> }
>
> static void
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] ftrace: Use local_irq_{save,restore}_nmi() in tracers.
2010-04-07 1:14 ` Steven Rostedt
2010-04-07 1:14 ` Steven Rostedt
@ 2010-04-07 1:17 ` David Miller
2010-04-07 1:17 ` David Miller
1 sibling, 1 reply; 6+ messages in thread
From: David Miller @ 2010-04-07 1:17 UTC (permalink / raw)
To: rostedt
Cc: a.p.zijlstra, mingo, acme, paulus, efault, fweisbec, tglx,
linux-kernel, sparclinux, linux-arch
From: Steven Rostedt <rostedt@goodmis.org>
Date: Tue, 06 Apr 2010 21:14:10 -0400
> On Tue, 2010-04-06 at 16:40 -0700, David Miller wrote:
>> Signed-off-by: David S. Miller <davem@davemloft.net>
>> ---
>> kernel/trace/ftrace.c | 4 ++--
>> kernel/trace/trace_functions.c | 8 ++++----
>> kernel/trace/trace_sched_wakeup.c | 4 ++--
>> kernel/trace/trace_stack.c | 4 ++--
>> 4 files changed, 10 insertions(+), 10 deletions(-)
>>
>> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
>> index d9062f5..41d4282 100644
>> --- a/kernel/trace/ftrace.c
>> +++ b/kernel/trace/ftrace.c
>> @@ -612,7 +612,7 @@ function_profile_call(unsigned long ip, unsigned long parent_ip)
>> if (!ftrace_profile_enabled)
>> return;
>>
>> - local_irq_save(flags);
>> + local_irq_save_nmi(flags);
>
> These are equivalent for non sparc archs, correct?
Yes.
> If so,
>
> Acked-by: Steven Rostedt <rostedt@goodmis.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] ftrace: Use local_irq_{save,restore}_nmi() in tracers.
2010-04-07 1:17 ` David Miller
@ 2010-04-07 1:17 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2010-04-07 1:17 UTC (permalink / raw)
To: rostedt
Cc: a.p.zijlstra, mingo, acme, paulus, efault, fweisbec, tglx,
linux-kernel, sparclinux, linux-arch
From: Steven Rostedt <rostedt@goodmis.org>
Date: Tue, 06 Apr 2010 21:14:10 -0400
> On Tue, 2010-04-06 at 16:40 -0700, David Miller wrote:
>> Signed-off-by: David S. Miller <davem@davemloft.net>
>> ---
>> kernel/trace/ftrace.c | 4 ++--
>> kernel/trace/trace_functions.c | 8 ++++----
>> kernel/trace/trace_sched_wakeup.c | 4 ++--
>> kernel/trace/trace_stack.c | 4 ++--
>> 4 files changed, 10 insertions(+), 10 deletions(-)
>>
>> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
>> index d9062f5..41d4282 100644
>> --- a/kernel/trace/ftrace.c
>> +++ b/kernel/trace/ftrace.c
>> @@ -612,7 +612,7 @@ function_profile_call(unsigned long ip, unsigned long parent_ip)
>> if (!ftrace_profile_enabled)
>> return;
>>
>> - local_irq_save(flags);
>> + local_irq_save_nmi(flags);
>
> These are equivalent for non sparc archs, correct?
Yes.
> If so,
>
> Acked-by: Steven Rostedt <rostedt@goodmis.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] ftrace: Use local_irq_{save,restore}_nmi() in tracers.
2010-04-06 23:40 [PATCH 2/2] ftrace: Use local_irq_{save,restore}_nmi() in tracers David Miller
2010-04-07 1:14 ` Steven Rostedt
@ 2010-04-07 10:28 ` David Miller
1 sibling, 0 replies; 6+ messages in thread
From: David Miller @ 2010-04-07 10:28 UTC (permalink / raw)
To: a.p.zijlstra
Cc: mingo, acme, paulus, efault, fweisbec, tglx, linux-kernel,
sparclinux, linux-arch
From: David Miller <davem@davemloft.net>
Date: Tue, 06 Apr 2010 16:40:02 -0700 (PDT)
>
> Signed-off-by: David S. Miller <davem@davemloft.net>
Peter, I found one more file that needs this annotation while
implementing function graph tracing support on sparc64.
Please add this to the original patch when you queue it up, thanks.
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index e6989d9..67fbdf1 100644
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -220,7 +220,7 @@ int trace_graph_entry(struct ftrace_graph_ent *trace)
if (!(trace->depth || ftrace_graph_addr(trace->func)))
return 0;
- local_irq_save(flags);
+ local_irq_save_nmi(flags);
cpu = raw_smp_processor_id();
data = tr->data[cpu];
disabled = atomic_inc_return(&data->disabled);
@@ -232,7 +232,7 @@ int trace_graph_entry(struct ftrace_graph_ent *trace)
}
atomic_dec(&data->disabled);
- local_irq_restore(flags);
+ local_irq_restore_nmi(flags);
return ret;
}
@@ -277,7 +277,7 @@ void trace_graph_return(struct ftrace_graph_ret *trace)
int cpu;
int pc;
- local_irq_save(flags);
+ local_irq_save_nmi(flags);
cpu = raw_smp_processor_id();
data = tr->data[cpu];
disabled = atomic_inc_return(&data->disabled);
@@ -286,7 +286,7 @@ void trace_graph_return(struct ftrace_graph_ret *trace)
__trace_graph_return(tr, trace, flags, pc);
}
atomic_dec(&data->disabled);
- local_irq_restore(flags);
+ local_irq_restore_nmi(flags);
}
void set_graph_array(struct trace_array *tr)
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-04-07 10:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-06 23:40 [PATCH 2/2] ftrace: Use local_irq_{save,restore}_nmi() in tracers David Miller
2010-04-07 1:14 ` Steven Rostedt
2010-04-07 1:14 ` Steven Rostedt
2010-04-07 1:17 ` David Miller
2010-04-07 1:17 ` David Miller
2010-04-07 10:28 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).