* [PATCH] ftrace: fix debug config symbol in stack_tracer_{en,dis}able
@ 2017-08-31 7:01 Zev Weiss
2017-08-31 13:45 ` Steven Rostedt
2017-08-31 13:54 ` Steven Rostedt
0 siblings, 2 replies; 4+ messages in thread
From: Zev Weiss @ 2017-08-31 7:01 UTC (permalink / raw)
To: Steven Rostedt; +Cc: Ingo Molnar, linux-kernel, Zev Weiss
Hello,
It appears stack_tracer_disable()/stack_tracer_enable() have been
using the wrong name for the config symbol to enable their
preempt-debugging checks, which the patch below should fix. (Noticed
when I made the same mistake attempting to grep for
CONFIG_DEBUG_PREEMPT and got two results instead of zero).
Zev Weiss
---
include/linux/ftrace.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 6383115e9d2c..2e028854bac7 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -307,7 +307,7 @@ DECLARE_PER_CPU(int, disable_stack_tracer);
static inline void stack_tracer_disable(void)
{
/* Preemption or interupts must be disabled */
- if (IS_ENABLED(CONFIG_PREEMPT_DEBUG))
+ if (IS_ENABLED(CONFIG_DEBUG_PREEMPT))
WARN_ON_ONCE(!preempt_count() || !irqs_disabled());
this_cpu_inc(disable_stack_tracer);
}
@@ -320,7 +320,7 @@ static inline void stack_tracer_disable(void)
*/
static inline void stack_tracer_enable(void)
{
- if (IS_ENABLED(CONFIG_PREEMPT_DEBUG))
+ if (IS_ENABLED(CONFIG_DEBUG_PREEMPT))
WARN_ON_ONCE(!preempt_count() || !irqs_disabled());
this_cpu_dec(disable_stack_tracer);
}
--
2.14.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ftrace: fix debug config symbol in stack_tracer_{en,dis}able
2017-08-31 7:01 [PATCH] ftrace: fix debug config symbol in stack_tracer_{en,dis}able Zev Weiss
@ 2017-08-31 13:45 ` Steven Rostedt
2017-08-31 13:54 ` Steven Rostedt
1 sibling, 0 replies; 4+ messages in thread
From: Steven Rostedt @ 2017-08-31 13:45 UTC (permalink / raw)
To: Zev Weiss; +Cc: Ingo Molnar, linux-kernel
On Thu, 31 Aug 2017 02:01:08 -0500
Zev Weiss <zev@bewilderbeest.net> wrote:
> Hello,
>
> It appears stack_tracer_disable()/stack_tracer_enable() have been
> using the wrong name for the config symbol to enable their
> preempt-debugging checks, which the patch below should fix. (Noticed
> when I made the same mistake attempting to grep for
> CONFIG_DEBUG_PREEMPT and got two results instead of zero).
>
Thanks! I'll apply it.
-- Steve
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ftrace: fix debug config symbol in stack_tracer_{en,dis}able
2017-08-31 7:01 [PATCH] ftrace: fix debug config symbol in stack_tracer_{en,dis}able Zev Weiss
2017-08-31 13:45 ` Steven Rostedt
@ 2017-08-31 13:54 ` Steven Rostedt
2017-08-31 15:40 ` Zev Weiss
1 sibling, 1 reply; 4+ messages in thread
From: Steven Rostedt @ 2017-08-31 13:54 UTC (permalink / raw)
To: Zev Weiss; +Cc: Ingo Molnar, linux-kernel
On Thu, 31 Aug 2017 02:01:08 -0500
Zev Weiss <zev@bewilderbeest.net> wrote:
> Hello,
>
> It appears stack_tracer_disable()/stack_tracer_enable() have been
> using the wrong name for the config symbol to enable their
> preempt-debugging checks, which the patch below should fix. (Noticed
> when I made the same mistake attempting to grep for
> CONFIG_DEBUG_PREEMPT and got two results instead of zero).
>
>
> Zev Weiss
Can you resend with a proper change log (no "Hello") and add a
Signed-off-by tag?
Thanks!
-- Steve
>
> ---
> include/linux/ftrace.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
> index 6383115e9d2c..2e028854bac7 100644
> --- a/include/linux/ftrace.h
> +++ b/include/linux/ftrace.h
> @@ -307,7 +307,7 @@ DECLARE_PER_CPU(int, disable_stack_tracer);
> static inline void stack_tracer_disable(void)
> {
> /* Preemption or interupts must be disabled */
> - if (IS_ENABLED(CONFIG_PREEMPT_DEBUG))
> + if (IS_ENABLED(CONFIG_DEBUG_PREEMPT))
> WARN_ON_ONCE(!preempt_count() || !irqs_disabled());
> this_cpu_inc(disable_stack_tracer);
> }
> @@ -320,7 +320,7 @@ static inline void stack_tracer_disable(void)
> */
> static inline void stack_tracer_enable(void)
> {
> - if (IS_ENABLED(CONFIG_PREEMPT_DEBUG))
> + if (IS_ENABLED(CONFIG_DEBUG_PREEMPT))
> WARN_ON_ONCE(!preempt_count() || !irqs_disabled());
> this_cpu_dec(disable_stack_tracer);
> }
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ftrace: fix debug config symbol in stack_tracer_{en,dis}able
2017-08-31 13:54 ` Steven Rostedt
@ 2017-08-31 15:40 ` Zev Weiss
0 siblings, 0 replies; 4+ messages in thread
From: Zev Weiss @ 2017-08-31 15:40 UTC (permalink / raw)
To: Steven Rostedt; +Cc: Ingo Molnar, linux-kernel
On Thu, Aug 31, 2017 at 08:54:07AM CDT, Steven Rostedt wrote:
>On Thu, 31 Aug 2017 02:01:08 -0500
>Zev Weiss <zev@bewilderbeest.net> wrote:
>
>> Hello,
>>
>> It appears stack_tracer_disable()/stack_tracer_enable() have been
>> using the wrong name for the config symbol to enable their
>> preempt-debugging checks, which the patch below should fix. (Noticed
>> when I made the same mistake attempting to grep for
>> CONFIG_DEBUG_PREEMPT and got two results instead of zero).
>>
>>
>> Zev Weiss
>
>Can you resend with a proper change log (no "Hello") and add a
>Signed-off-by tag?
>
>Thanks!
>
>-- Steve
>
Ah, sorry about that -- misunderstood what my 'git send-email' flags
were doing...hopefully the below works better.
Zev
>From e916675c65ffcfb953f79c7243e8508efcf13aeb Mon Sep 17 00:00:00 2001
From: Zev Weiss <zev@bewilderbeest.net>
Date: Wed, 30 Aug 2017 05:36:38 -0500
Subject: [PATCH] ftrace: fix debug config symbol in stack_tracer_{en,dis}able
stack_tracer_disable()/stack_tracer_enable() had been using the wrong
name for the config symbol to enable their preempt-debugging checks --
fix with a word swap.
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
---
include/linux/ftrace.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 6383115e9d2c..2e028854bac7 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -307,7 +307,7 @@ DECLARE_PER_CPU(int, disable_stack_tracer);
static inline void stack_tracer_disable(void)
{
/* Preemption or interupts must be disabled */
- if (IS_ENABLED(CONFIG_PREEMPT_DEBUG))
+ if (IS_ENABLED(CONFIG_DEBUG_PREEMPT))
WARN_ON_ONCE(!preempt_count() || !irqs_disabled());
this_cpu_inc(disable_stack_tracer);
}
@@ -320,7 +320,7 @@ static inline void stack_tracer_disable(void)
*/
static inline void stack_tracer_enable(void)
{
- if (IS_ENABLED(CONFIG_PREEMPT_DEBUG))
+ if (IS_ENABLED(CONFIG_DEBUG_PREEMPT))
WARN_ON_ONCE(!preempt_count() || !irqs_disabled());
this_cpu_dec(disable_stack_tracer);
}
--
2.14.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-08-31 15:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-31 7:01 [PATCH] ftrace: fix debug config symbol in stack_tracer_{en,dis}able Zev Weiss
2017-08-31 13:45 ` Steven Rostedt
2017-08-31 13:54 ` Steven Rostedt
2017-08-31 15:40 ` Zev Weiss
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).