* [PATCH] ftrace: prevent recursion
@ 2008-11-27 2:21 Lai Jiangshan
2008-11-27 2:36 ` Steven Rostedt
0 siblings, 1 reply; 2+ messages in thread
From: Lai Jiangshan @ 2008-11-27 2:21 UTC (permalink / raw)
To: Ingo Molnar, Steven Rostedt, Linux Kernel Mailing List
if the resched flag was set before we entered, then don't reschedule.
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---
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;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] ftrace: prevent recursion
2008-11-27 2:21 [PATCH] ftrace: prevent recursion Lai Jiangshan
@ 2008-11-27 2:36 ` Steven Rostedt
0 siblings, 0 replies; 2+ messages in thread
From: Steven Rostedt @ 2008-11-27 2:36 UTC (permalink / raw)
To: Lai Jiangshan; +Cc: Ingo Molnar, Linux Kernel Mailing List
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@cn.fujitsu.com>
> ---
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-11-27 2:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-11-27 2:21 [PATCH] ftrace: prevent recursion Lai Jiangshan
2008-11-27 2:36 ` Steven Rostedt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®