* Re: [PATCH][RESEND] tracing: Fix lockdep warning in global_clock()
2010-03-24 2:57 [PATCH][RESEND] tracing: Fix lockdep warning in global_clock() Li Zefan
@ 2010-03-24 3:03 ` Steven Rostedt
2010-03-24 13:01 ` Peter Zijlstra
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Steven Rostedt @ 2010-03-24 3:03 UTC (permalink / raw)
To: Li Zefan; +Cc: Ingo Molnar, Peter Zijlstra, Frederic Weisbecker, LKML
On Wed, 2010-03-24 at 10:57 +0800, Li Zefan wrote:
> # echo 1 > events/enable
> # echo global > trace_clock
>
> ------------[ cut here ]------------
> WARNING: at kernel/lockdep.c:3162 check_flags+0xb2/0x190()
> ...
> ---[ end trace 3f86734a89416623 ]---
> possible reason: unannotated irqs-on.
> ...
>
Peter,
I see no problem with this patch, but I do want your Acked-by for it.
Thanks,
-- Steve
> Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
> ---
> kernel/trace/trace_clock.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
> index 6fbfb8f..9d589d8 100644
> --- a/kernel/trace/trace_clock.c
> +++ b/kernel/trace/trace_clock.c
> @@ -84,7 +84,7 @@ u64 notrace trace_clock_global(void)
> int this_cpu;
> u64 now;
>
> - raw_local_irq_save(flags);
> + local_irq_save(flags);
>
> this_cpu = raw_smp_processor_id();
> now = cpu_clock(this_cpu);
> @@ -110,7 +110,7 @@ u64 notrace trace_clock_global(void)
> arch_spin_unlock(&trace_clock_struct.lock);
>
> out:
> - raw_local_irq_restore(flags);
> + local_irq_restore(flags);
>
> return now;
> }
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH][RESEND] tracing: Fix lockdep warning in global_clock()
2010-03-24 2:57 [PATCH][RESEND] tracing: Fix lockdep warning in global_clock() Li Zefan
2010-03-24 3:03 ` Steven Rostedt
@ 2010-03-24 13:01 ` Peter Zijlstra
2010-03-27 2:03 ` [tip:tracing/urgent] " tip-bot for Li Zefan
2010-04-03 9:27 ` tip-bot for Li Zefan
3 siblings, 0 replies; 5+ messages in thread
From: Peter Zijlstra @ 2010-03-24 13:01 UTC (permalink / raw)
To: Li Zefan; +Cc: Steven Rostedt, Ingo Molnar, Frederic Weisbecker, LKML
On Wed, 2010-03-24 at 10:57 +0800, Li Zefan wrote:
> # echo 1 > events/enable
> # echo global > trace_clock
>
> ------------[ cut here ]------------
> WARNING: at kernel/lockdep.c:3162 check_flags+0xb2/0x190()
> ...
> ---[ end trace 3f86734a89416623 ]---
> possible reason: unannotated irqs-on.
> ...
>
> Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
> ---
> kernel/trace/trace_clock.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
> index 6fbfb8f..9d589d8 100644
> --- a/kernel/trace/trace_clock.c
> +++ b/kernel/trace/trace_clock.c
> @@ -84,7 +84,7 @@ u64 notrace trace_clock_global(void)
> int this_cpu;
> u64 now;
>
> - raw_local_irq_save(flags);
> + local_irq_save(flags);
>
> this_cpu = raw_smp_processor_id();
> now = cpu_clock(this_cpu);
> @@ -110,7 +110,7 @@ u64 notrace trace_clock_global(void)
> arch_spin_unlock(&trace_clock_struct.lock);
>
> out:
> - raw_local_irq_restore(flags);
> + local_irq_restore(flags);
>
> return now;
> }
^ permalink raw reply [flat|nested] 5+ messages in thread
* [tip:tracing/urgent] tracing: Fix lockdep warning in global_clock()
2010-03-24 2:57 [PATCH][RESEND] tracing: Fix lockdep warning in global_clock() Li Zefan
2010-03-24 3:03 ` Steven Rostedt
2010-03-24 13:01 ` Peter Zijlstra
@ 2010-03-27 2:03 ` tip-bot for Li Zefan
2010-04-03 9:27 ` tip-bot for Li Zefan
3 siblings, 0 replies; 5+ messages in thread
From: tip-bot for Li Zefan @ 2010-03-27 2:03 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, rostedt, a.p.zijlstra, lizf, tglx
Commit-ID: 581fe9449d181f6bd5afc5dcae37526eeee02b1d
Gitweb: http://git.kernel.org/tip/581fe9449d181f6bd5afc5dcae37526eeee02b1d
Author: Li Zefan <lizf@cn.fujitsu.com>
AuthorDate: Wed, 24 Mar 2010 10:57:37 +0800
Committer: Steven Rostedt <rostedt@goodmis.org>
CommitDate: Fri, 26 Mar 2010 15:41:59 -0400
tracing: Fix lockdep warning in global_clock()
# echo 1 > events/enable
# echo global > trace_clock
------------[ cut here ]------------
WARNING: at kernel/lockdep.c:3162 check_flags+0xb2/0x190()
...
---[ end trace 3f86734a89416623 ]---
possible reason: unannotated irqs-on.
...
There's no reason to use the raw_local_irq_save() in trace_clock_global.
The local_irq_save() version is fine, and does not cause the bug in lockdep.
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
LKML-Reference: <4BA97FA1.7030606@cn.fujitsu.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
kernel/trace/trace_clock.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
index 6fbfb8f..9d589d8 100644
--- a/kernel/trace/trace_clock.c
+++ b/kernel/trace/trace_clock.c
@@ -84,7 +84,7 @@ u64 notrace trace_clock_global(void)
int this_cpu;
u64 now;
- raw_local_irq_save(flags);
+ local_irq_save(flags);
this_cpu = raw_smp_processor_id();
now = cpu_clock(this_cpu);
@@ -110,7 +110,7 @@ u64 notrace trace_clock_global(void)
arch_spin_unlock(&trace_clock_struct.lock);
out:
- raw_local_irq_restore(flags);
+ local_irq_restore(flags);
return now;
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [tip:tracing/urgent] tracing: Fix lockdep warning in global_clock()
2010-03-24 2:57 [PATCH][RESEND] tracing: Fix lockdep warning in global_clock() Li Zefan
` (2 preceding siblings ...)
2010-03-27 2:03 ` [tip:tracing/urgent] " tip-bot for Li Zefan
@ 2010-04-03 9:27 ` tip-bot for Li Zefan
3 siblings, 0 replies; 5+ messages in thread
From: tip-bot for Li Zefan @ 2010-04-03 9:27 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, rostedt, a.p.zijlstra, lizf, tglx
Commit-ID: e36673ec5126f15a8cddf6049aede7bdcf484c26
Gitweb: http://git.kernel.org/tip/e36673ec5126f15a8cddf6049aede7bdcf484c26
Author: Li Zefan <lizf@cn.fujitsu.com>
AuthorDate: Wed, 24 Mar 2010 10:57:37 +0800
Committer: Steven Rostedt <rostedt@goodmis.org>
CommitDate: Mon, 29 Mar 2010 15:16:44 -0400
tracing: Fix lockdep warning in global_clock()
# echo 1 > events/enable
# echo global > trace_clock
------------[ cut here ]------------
WARNING: at kernel/lockdep.c:3162 check_flags+0xb2/0x190()
...
---[ end trace 3f86734a89416623 ]---
possible reason: unannotated irqs-on.
...
There's no reason to use the raw_local_irq_save() in trace_clock_global.
The local_irq_save() version is fine, and does not cause the bug in lockdep.
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
LKML-Reference: <4BA97FA1.7030606@cn.fujitsu.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
kernel/trace/trace_clock.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
index 6fbfb8f..9d589d8 100644
--- a/kernel/trace/trace_clock.c
+++ b/kernel/trace/trace_clock.c
@@ -84,7 +84,7 @@ u64 notrace trace_clock_global(void)
int this_cpu;
u64 now;
- raw_local_irq_save(flags);
+ local_irq_save(flags);
this_cpu = raw_smp_processor_id();
now = cpu_clock(this_cpu);
@@ -110,7 +110,7 @@ u64 notrace trace_clock_global(void)
arch_spin_unlock(&trace_clock_struct.lock);
out:
- raw_local_irq_restore(flags);
+ local_irq_restore(flags);
return now;
}
^ permalink raw reply related [flat|nested] 5+ messages in thread