Re: [PATCH 2/2] ftrace: Use local_irq_{save,restore}_nmi() intracers.

[Steven Rostedt]

On Tue, 2010-04-06 at 16:40 -0700, David Miller wrote:
> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
> ---
>  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@xxxxxxxxxxx>

-- 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


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/