Re: [PATCH] ftrace: prevent recursion

[Steven Rostedt]

On Thu, 27 Nov 2008, Lai Jiangshan wrote:

> 
> if the resched flag was set before we entered, then don't reschedule.
> 
> Signed-off-by: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
> ---
> diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
> index f780e95..668bbb5 100644
> --- a/kernel/trace/ring_buffer.c
> +++ b/kernel/trace/ring_buffer.c
> @@ -1215,7 +1215,7 @@ ring_buffer_lock_reserve(struct ring_buffer *buffer,
>  
>   out:
>  	if (resched)
> -		preempt_enable_notrace();
> +		preempt_enable_no_resched_notrace();
>  	else
>  		preempt_enable_notrace();
>  	return NULL;


Ouch! Thanks, this patch should go straight to mainline. The version in 
tip uses the new ftrace_preempt_disable which is not yet in mainline.

-- Steve

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