* [PATCH 1/3] Add tracing_off_event() to stop tracing when a bug or warning occur
@ 2010-03-18 13:48 Chase Douglas
2010-03-18 13:48 ` [PATCH 2/3] Add tracing_off_event() calls to BUG() and WARN() paths Chase Douglas
` (3 more replies)
0 siblings, 4 replies; 11+ messages in thread
From: Chase Douglas @ 2010-03-18 13:48 UTC (permalink / raw)
To: linux-kernel; +Cc: Steven Rostedt
The tracing_off_event() function calls tracing_off() to stop tracing
when an event occurs. By default, only BUG-type events stop tracing,
while WARNING type events do not. This is controlled through the
tracing_off={none,warn,bug} commandline parameter.
Call this function from bug and warning event handlers to enable a user
to debug their kernel by starting a trace, hitting an event, and then
retrieving trace info knowing that the trace was stopped right after the
event was hit.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
---
include/linux/kernel.h | 5 +++++
kernel/trace/ring_buffer.c | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 7f07074..107091f 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -478,16 +478,21 @@ static inline char *pack_hex_byte(char *buf, u8 byte)
*
* Most likely, you want to use tracing_on/tracing_off.
*/
+#define TRACE_EVENT_BUG 0
+#define TRACE_EVENT_WARN 1
+
#ifdef CONFIG_RING_BUFFER
void tracing_on(void);
void tracing_off(void);
/* trace_off_permanent stops recording with no way to bring it back */
void tracing_off_permanent(void);
+void tracing_off_event(long event);
int tracing_is_on(void);
#else
static inline void tracing_on(void) { }
static inline void tracing_off(void) { }
static inline void tracing_off_permanent(void) { }
+static inline void tracing_off_event(long event) { }
static inline int tracing_is_on(void) { return 0; }
#endif
#ifdef CONFIG_TRACING
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 0287f9f..b148862 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -193,6 +193,40 @@ void tracing_off_permanent(void)
set_bit(RB_BUFFERS_DISABLED_BIT, &ring_buffer_flags);
}
+static long tracing_event_mask = TRACE_EVENT_BUG;
+
+/**
+ * tracing_off_event - turn off tracing depending on event type
+ *
+ * This function checks the event type to determine whether tracing should be
+ * disabled. Useful for disabling tracing on bugs or warnings.
+ */
+void tracing_off_event(long event)
+{
+ if (event <= tracing_event_mask)
+ tracing_off();
+}
+EXPORT_SYMBOL_GPL(tracing_off_event);
+
+static int __init tracing_off_event_setup(char *str)
+{
+ if (!strcmp("none", str))
+ tracing_event_mask = -1;
+ else if (!strcmp("bug", str))
+ tracing_event_mask = TRACE_EVENT_BUG;
+ else if (!strcmp("warn", str))
+ tracing_event_mask = TRACE_EVENT_WARN;
+ else
+ {
+ printk(KERN_NOTICE "Invalid value passed for tracing_off parameter\n");
+ return 1;
+ }
+
+ return 0;
+}
+
+__setup("tracing_off=", tracing_off_event_setup);
+
/**
* tracing_is_on - show state of ring buffers enabled
*/
--
1.6.3.3
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 2/3] Add tracing_off_event() calls to BUG() and WARN() paths
2010-03-18 13:48 [PATCH 1/3] Add tracing_off_event() to stop tracing when a bug or warning occur Chase Douglas
@ 2010-03-18 13:48 ` Chase Douglas
2010-03-18 13:48 ` [PATCH 3/3] Stop tracing on a schedule bug Chase Douglas
` (2 subsequent siblings)
3 siblings, 0 replies; 11+ messages in thread
From: Chase Douglas @ 2010-03-18 13:48 UTC (permalink / raw)
To: linux-kernel; +Cc: Steven Rostedt
This change adds tracing_off_event() calls, which stop debug tracing,
when a BUG() or WARN() function is called. The stoppage depends on
commandline paramenter tracing_off={bug,warn,none}. The default is
"bug", so only the BUG() paths will stop tracing.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
---
kernel/panic.c | 4 +++-
lib/bug.c | 2 ++
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/kernel/panic.c b/kernel/panic.c
index 13d966b..f0ff321 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -319,7 +319,7 @@ int oops_may_print(void)
*/
void oops_enter(void)
{
- tracing_off();
+ tracing_off_event(TRACE_EVENT_BUG);
/* can't trust the integrity of the kernel anymore: */
debug_locks_off();
do_oops_enter_exit();
@@ -369,6 +369,8 @@ static void warn_slowpath_common(const char *file, int line, void *caller, struc
{
const char *board;
+ tracing_off_event(TRACE_EVENT_WARN);
+
printk(KERN_WARNING "------------[ cut here ]------------\n");
printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
board = dmi_get_system_info(DMI_PRODUCT_NAME);
diff --git a/lib/bug.c b/lib/bug.c
index 300e41a..457c1eb 100644
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -154,6 +154,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
warning = (bug->flags & BUGFLAG_WARNING) != 0;
}
+ tracing_off_event(warning ? TRACE_EVENT_WARN : TRACE_EVENT_BUG);
+
if (warning) {
/* this is a WARN_ON rather than BUG/BUG_ON */
if (file)
--
1.6.3.3
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 3/3] Stop tracing on a schedule bug
2010-03-18 13:48 [PATCH 1/3] Add tracing_off_event() to stop tracing when a bug or warning occur Chase Douglas
2010-03-18 13:48 ` [PATCH 2/3] Add tracing_off_event() calls to BUG() and WARN() paths Chase Douglas
@ 2010-03-18 13:48 ` Chase Douglas
2010-03-18 14:56 ` [PATCH 1/3] Add tracing_off_event() to stop tracing when a bug or warning occur Steven Rostedt
2010-03-22 16:14 ` Randy Dunlap
3 siblings, 0 replies; 11+ messages in thread
From: Chase Douglas @ 2010-03-18 13:48 UTC (permalink / raw)
To: linux-kernel; +Cc: Steven Rostedt
This change adds a tracing_off_event() call to stop tracing on schedule
bugs unless tracing_off=none was specified on the commandline.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
---
kernel/sched.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/kernel/sched.c b/kernel/sched.c
index 150b698..bfe4f05 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3589,6 +3589,8 @@ static noinline void __schedule_bug(struct task_struct *prev)
{
struct pt_regs *regs = get_irq_regs();
+ tracing_off_event(TRACE_EVENT_BUG);
+
printk(KERN_ERR "BUG: scheduling while atomic: %s/%d/0x%08x\n",
prev->comm, prev->pid, preempt_count());
--
1.6.3.3
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 1/3] Add tracing_off_event() to stop tracing when a bug or warning occur
2010-03-18 13:48 [PATCH 1/3] Add tracing_off_event() to stop tracing when a bug or warning occur Chase Douglas
2010-03-18 13:48 ` [PATCH 2/3] Add tracing_off_event() calls to BUG() and WARN() paths Chase Douglas
2010-03-18 13:48 ` [PATCH 3/3] Stop tracing on a schedule bug Chase Douglas
@ 2010-03-18 14:56 ` Steven Rostedt
2010-03-18 16:27 ` Chase Douglas
2010-03-22 16:14 ` Randy Dunlap
3 siblings, 1 reply; 11+ messages in thread
From: Steven Rostedt @ 2010-03-18 14:56 UTC (permalink / raw)
To: Chase Douglas
Cc: linux-kernel, Frederic Weisbecker, Ingo Molnar, Thomas Gleixner
[ Expanded the Cc list ]
On Thu, 2010-03-18 at 09:48 -0400, Chase Douglas wrote:
> The tracing_off_event() function calls tracing_off() to stop tracing
> when an event occurs. By default, only BUG-type events stop tracing,
> while WARNING type events do not. This is controlled through the
> tracing_off={none,warn,bug} commandline parameter.
>
> Call this function from bug and warning event handlers to enable a user
> to debug their kernel by starting a trace, hitting an event, and then
> retrieving trace info knowing that the trace was stopped right after the
> event was hit.
>
> Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
> ---
> include/linux/kernel.h | 5 +++++
> kernel/trace/ring_buffer.c | 34 ++++++++++++++++++++++++++++++++++
> 2 files changed, 39 insertions(+), 0 deletions(-)
>
> diff --git a/include/linux/kernel.h b/include/linux/kernel.h
> index 7f07074..107091f 100644
> --- a/include/linux/kernel.h
> +++ b/include/linux/kernel.h
> @@ -478,16 +478,21 @@ static inline char *pack_hex_byte(char *buf, u8 byte)
> *
> * Most likely, you want to use tracing_on/tracing_off.
> */
> +#define TRACE_EVENT_BUG 0
> +#define TRACE_EVENT_WARN 1
This should probably be an enum.
> +
> #ifdef CONFIG_RING_BUFFER
> void tracing_on(void);
> void tracing_off(void);
> /* trace_off_permanent stops recording with no way to bring it back */
> void tracing_off_permanent(void);
> +void tracing_off_event(long event);
> int tracing_is_on(void);
> #else
> static inline void tracing_on(void) { }
> static inline void tracing_off(void) { }
> static inline void tracing_off_permanent(void) { }
> +static inline void tracing_off_event(long event) { }
> static inline int tracing_is_on(void) { return 0; }
> #endif
> #ifdef CONFIG_TRACING
> diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
> index 0287f9f..b148862 100644
> --- a/kernel/trace/ring_buffer.c
> +++ b/kernel/trace/ring_buffer.c
> @@ -193,6 +193,40 @@ void tracing_off_permanent(void)
> set_bit(RB_BUFFERS_DISABLED_BIT, &ring_buffer_flags);
> }
>
> +static long tracing_event_mask = TRACE_EVENT_BUG;
That's a bad name. It does not seem to be a mask but seems to be a
control setting. Maybe call it tracing_event_off_ctrl ?
-- Steve
> +
> +/**
> + * tracing_off_event - turn off tracing depending on event type
> + *
> + * This function checks the event type to determine whether tracing should be
> + * disabled. Useful for disabling tracing on bugs or warnings.
> + */
> +void tracing_off_event(long event)
> +{
> + if (event <= tracing_event_mask)
> + tracing_off();
> +}
> +EXPORT_SYMBOL_GPL(tracing_off_event);
> +
> +static int __init tracing_off_event_setup(char *str)
> +{
> + if (!strcmp("none", str))
> + tracing_event_mask = -1;
> + else if (!strcmp("bug", str))
> + tracing_event_mask = TRACE_EVENT_BUG;
> + else if (!strcmp("warn", str))
> + tracing_event_mask = TRACE_EVENT_WARN;
> + else
> + {
> + printk(KERN_NOTICE "Invalid value passed for tracing_off parameter\n");
> + return 1;
> + }
> +
> + return 0;
> +}
> +
> +__setup("tracing_off=", tracing_off_event_setup);
> +
> /**
> * tracing_is_on - show state of ring buffers enabled
> */
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 1/3] Add tracing_off_event() to stop tracing when a bug or warning occur
2010-03-18 14:56 ` [PATCH 1/3] Add tracing_off_event() to stop tracing when a bug or warning occur Steven Rostedt
@ 2010-03-18 16:27 ` Chase Douglas
0 siblings, 0 replies; 11+ messages in thread
From: Chase Douglas @ 2010-03-18 16:27 UTC (permalink / raw)
To: rostedt; +Cc: linux-kernel, Frederic Weisbecker, Ingo Molnar, Thomas Gleixner
On Thu, Mar 18, 2010 at 10:56 AM, Steven Rostedt <rostedt@goodmis.org> wrote:
> [ Expanded the Cc list ]
>
> On Thu, 2010-03-18 at 09:48 -0400, Chase Douglas wrote:
>> The tracing_off_event() function calls tracing_off() to stop tracing
>> when an event occurs. By default, only BUG-type events stop tracing,
>> while WARNING type events do not. This is controlled through the
>> tracing_off={none,warn,bug} commandline parameter.
>>
>> Call this function from bug and warning event handlers to enable a user
>> to debug their kernel by starting a trace, hitting an event, and then
>> retrieving trace info knowing that the trace was stopped right after the
>> event was hit.
>>
>> Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
>> ---
>> include/linux/kernel.h | 5 +++++
>> kernel/trace/ring_buffer.c | 34 ++++++++++++++++++++++++++++++++++
>> 2 files changed, 39 insertions(+), 0 deletions(-)
>>
>> diff --git a/include/linux/kernel.h b/include/linux/kernel.h
>> index 7f07074..107091f 100644
>> --- a/include/linux/kernel.h
>> +++ b/include/linux/kernel.h
>> @@ -478,16 +478,21 @@ static inline char *pack_hex_byte(char *buf, u8 byte)
>> *
>> * Most likely, you want to use tracing_on/tracing_off.
>> */
>> +#define TRACE_EVENT_BUG 0
>> +#define TRACE_EVENT_WARN 1
>
> This should probably be an enum.
>
>> +
>> #ifdef CONFIG_RING_BUFFER
>> void tracing_on(void);
>> void tracing_off(void);
>> /* trace_off_permanent stops recording with no way to bring it back */
>> void tracing_off_permanent(void);
>> +void tracing_off_event(long event);
>> int tracing_is_on(void);
>> #else
>> static inline void tracing_on(void) { }
>> static inline void tracing_off(void) { }
>> static inline void tracing_off_permanent(void) { }
>> +static inline void tracing_off_event(long event) { }
>> static inline int tracing_is_on(void) { return 0; }
>> #endif
>> #ifdef CONFIG_TRACING
>> diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
>> index 0287f9f..b148862 100644
>> --- a/kernel/trace/ring_buffer.c
>> +++ b/kernel/trace/ring_buffer.c
>> @@ -193,6 +193,40 @@ void tracing_off_permanent(void)
>> set_bit(RB_BUFFERS_DISABLED_BIT, &ring_buffer_flags);
>> }
>>
>> +static long tracing_event_mask = TRACE_EVENT_BUG;
>
> That's a bad name. It does not seem to be a mask but seems to be a
> control setting. Maybe call it tracing_event_off_ctrl ?
I'll fix these two things up and resend.
Thanks,
Chase
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/3] Add tracing_off_event() to stop tracing when a bug or warning occur
2010-03-18 13:48 [PATCH 1/3] Add tracing_off_event() to stop tracing when a bug or warning occur Chase Douglas
` (2 preceding siblings ...)
2010-03-18 14:56 ` [PATCH 1/3] Add tracing_off_event() to stop tracing when a bug or warning occur Steven Rostedt
@ 2010-03-22 16:14 ` Randy Dunlap
3 siblings, 0 replies; 11+ messages in thread
From: Randy Dunlap @ 2010-03-22 16:14 UTC (permalink / raw)
To: Chase Douglas; +Cc: linux-kernel, Steven Rostedt
On Thu, 18 Mar 2010 09:48:50 -0400 Chase Douglas wrote:
> The tracing_off_event() function calls tracing_off() to stop tracing
> when an event occurs. By default, only BUG-type events stop tracing,
> while WARNING type events do not. This is controlled through the
> tracing_off={none,warn,bug} commandline parameter.
>
> Call this function from bug and warning event handlers to enable a user
> to debug their kernel by starting a trace, hitting an event, and then
> retrieving trace info knowing that the trace was stopped right after the
> event was hit.
>
> Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
> ---
> include/linux/kernel.h | 5 +++++
> kernel/trace/ring_buffer.c | 34 ++++++++++++++++++++++++++++++++++
> 2 files changed, 39 insertions(+), 0 deletions(-)
>
> diff --git a/include/linux/kernel.h b/include/linux/kernel.h
> index 7f07074..107091f 100644
> --- a/include/linux/kernel.h
> +++ b/include/linux/kernel.h
> @@ -478,16 +478,21 @@ static inline char *pack_hex_byte(char *buf, u8 byte)
> *
> * Most likely, you want to use tracing_on/tracing_off.
> */
> +#define TRACE_EVENT_BUG 0
> +#define TRACE_EVENT_WARN 1
> +
> #ifdef CONFIG_RING_BUFFER
> void tracing_on(void);
> void tracing_off(void);
> /* trace_off_permanent stops recording with no way to bring it back */
> void tracing_off_permanent(void);
> +void tracing_off_event(long event);
> int tracing_is_on(void);
> #else
> static inline void tracing_on(void) { }
> static inline void tracing_off(void) { }
> static inline void tracing_off_permanent(void) { }
> +static inline void tracing_off_event(long event) { }
> static inline int tracing_is_on(void) { return 0; }
> #endif
> #ifdef CONFIG_TRACING
> diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
> index 0287f9f..b148862 100644
> --- a/kernel/trace/ring_buffer.c
> +++ b/kernel/trace/ring_buffer.c
> @@ -193,6 +193,40 @@ void tracing_off_permanent(void)
> set_bit(RB_BUFFERS_DISABLED_BIT, &ring_buffer_flags);
> }
>
> +static long tracing_event_mask = TRACE_EVENT_BUG;
> +
> +/**
> + * tracing_off_event - turn off tracing depending on event type
Please add the function parameter to the kernel-doc to make it complete
& prevent warnings; something like:
* @event: which event happened
> + *
> + * This function checks the event type to determine whether tracing should be
> + * disabled. Useful for disabling tracing on bugs or warnings.
> + */
> +void tracing_off_event(long event)
> +{
> + if (event <= tracing_event_mask)
> + tracing_off();
> +}
> +EXPORT_SYMBOL_GPL(tracing_off_event);
> +
> +static int __init tracing_off_event_setup(char *str)
> +{
> + if (!strcmp("none", str))
> + tracing_event_mask = -1;
> + else if (!strcmp("bug", str))
> + tracing_event_mask = TRACE_EVENT_BUG;
> + else if (!strcmp("warn", str))
> + tracing_event_mask = TRACE_EVENT_WARN;
> + else
> + {
> + printk(KERN_NOTICE "Invalid value passed for tracing_off parameter\n");
> + return 1;
> + }
> +
> + return 0;
> +}
> +
> +__setup("tracing_off=", tracing_off_event_setup);
> +
> /**
> * tracing_is_on - show state of ring buffers enabled
> */
> --
---
~Randy
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/3 v4] Add tracing_off_event() to stop tracing when a bug or warning occur
@ 2010-04-14 16:20 Chase Douglas
2010-04-14 16:20 ` [PATCH 2/3] Add tracing_off_event() calls to BUG() and WARN() paths Chase Douglas
0 siblings, 1 reply; 11+ messages in thread
From: Chase Douglas @ 2010-04-14 16:20 UTC (permalink / raw)
To: linux-kernel
Cc: Steven Rostedt, Frederic Weisbecker, Ingo Molnar,
Thomas Gleixner, Randy Dunlap
The tracing_off_event() function calls tracing_off() to stop tracing
when an event occurs. By default, only BUG-type events stop tracing,
while WARNING type events do not. This is controlled through the
tracing_off={none,warn,bug} commandline parameter.
Call this function from bug and warning event handlers to enable a user
to debug their kernel by starting a trace, hitting an event, and then
retrieving trace info knowing that the trace was stopped right after the
event was hit.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
---
include/linux/kernel.h | 7 +++++++
kernel/trace/ring_buffer.c | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 9365227..80c67ad 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -478,16 +478,23 @@ static inline char *pack_hex_byte(char *buf, u8 byte)
*
* Most likely, you want to use tracing_on/tracing_off.
*/
+enum trace_off_event {
+ TRACE_EVENT_BUG = 0,
+ TRACE_EVENT_WARN,
+};
+
#ifdef CONFIG_RING_BUFFER
void tracing_on(void);
void tracing_off(void);
/* trace_off_permanent stops recording with no way to bring it back */
void tracing_off_permanent(void);
+void tracing_off_event(enum trace_off_event event);
int tracing_is_on(void);
#else
static inline void tracing_on(void) { }
static inline void tracing_off(void) { }
static inline void tracing_off_permanent(void) { }
+static inline void tracing_off_event(enum trace_off_event event) { }
static inline int tracing_is_on(void) { return 0; }
#endif
#ifdef CONFIG_TRACING
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 41ca394..f6be195 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -194,6 +194,40 @@ void tracing_off_permanent(void)
set_bit(RB_BUFFERS_DISABLED_BIT, &ring_buffer_flags);
}
+static enum trace_off_event tracing_off_event_ctrl = TRACE_EVENT_BUG;
+
+/**
+ * tracing_off_event - turn off tracing depending on event type
+ * @event: type of event that occurred
+ *
+ * This function checks the event type to determine whether tracing should be
+ * disabled. Useful for disabling tracing on bugs or warnings.
+ */
+void tracing_off_event(enum trace_off_event event)
+{
+ if (event <= tracing_off_event_ctrl)
+ tracing_off();
+}
+EXPORT_SYMBOL_GPL(tracing_off_event);
+
+static int __init tracing_off_event_setup(char *str)
+{
+ if (!strcmp("none", str))
+ tracing_off_event_ctrl = -1;
+ else if (!strcmp("bug", str))
+ tracing_off_event_ctrl = TRACE_EVENT_BUG;
+ else if (!strcmp("warn", str))
+ tracing_off_event_ctrl = TRACE_EVENT_WARN;
+ else {
+ printk(KERN_NOTICE "Invalid value passed for tracing_off parameter\n");
+ return 1;
+ }
+
+ return 0;
+}
+
+__setup("tracing_off=", tracing_off_event_setup);
+
/**
* tracing_is_on - show state of ring buffers enabled
*/
--
1.7.0
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 2/3] Add tracing_off_event() calls to BUG() and WARN() paths
2010-04-14 16:20 [PATCH 1/3 v4] " Chase Douglas
@ 2010-04-14 16:20 ` Chase Douglas
2010-04-15 20:57 ` Frederic Weisbecker
0 siblings, 1 reply; 11+ messages in thread
From: Chase Douglas @ 2010-04-14 16:20 UTC (permalink / raw)
To: linux-kernel
Cc: Steven Rostedt, Frederic Weisbecker, Ingo Molnar,
Thomas Gleixner, Randy Dunlap
This change adds tracing_off_event() calls, which stop debug tracing,
when a BUG() or WARN() function is called. The stoppage depends on
commandline paramenter tracing_off={bug,warn,none}. The default is
"bug", so only the BUG() paths will stop tracing.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
---
kernel/panic.c | 4 +++-
lib/bug.c | 2 ++
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/kernel/panic.c b/kernel/panic.c
index 13d966b..f0ff321 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -319,7 +319,7 @@ int oops_may_print(void)
*/
void oops_enter(void)
{
- tracing_off();
+ tracing_off_event(TRACE_EVENT_BUG);
/* can't trust the integrity of the kernel anymore: */
debug_locks_off();
do_oops_enter_exit();
@@ -369,6 +369,8 @@ static void warn_slowpath_common(const char *file, int line, void *caller, struc
{
const char *board;
+ tracing_off_event(TRACE_EVENT_WARN);
+
printk(KERN_WARNING "------------[ cut here ]------------\n");
printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
board = dmi_get_system_info(DMI_PRODUCT_NAME);
diff --git a/lib/bug.c b/lib/bug.c
index 300e41a..457c1eb 100644
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -154,6 +154,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
warning = (bug->flags & BUGFLAG_WARNING) != 0;
}
+ tracing_off_event(warning ? TRACE_EVENT_WARN : TRACE_EVENT_BUG);
+
if (warning) {
/* this is a WARN_ON rather than BUG/BUG_ON */
if (file)
--
1.7.0
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 2/3] Add tracing_off_event() calls to BUG() and WARN() paths
2010-04-14 16:20 ` [PATCH 2/3] Add tracing_off_event() calls to BUG() and WARN() paths Chase Douglas
@ 2010-04-15 20:57 ` Frederic Weisbecker
2010-04-15 21:49 ` Chase Douglas
0 siblings, 1 reply; 11+ messages in thread
From: Frederic Weisbecker @ 2010-04-15 20:57 UTC (permalink / raw)
To: Chase Douglas
Cc: linux-kernel, Steven Rostedt, Ingo Molnar, Thomas Gleixner, Randy Dunlap
On Wed, Apr 14, 2010 at 12:20:15PM -0400, Chase Douglas wrote:
> This change adds tracing_off_event() calls, which stop debug tracing,
> when a BUG() or WARN() function is called. The stoppage depends on
> commandline paramenter tracing_off={bug,warn,none}. The default is
> "bug", so only the BUG() paths will stop tracing.
>
> Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
ACK
But I can't find where we call oops_enter() from panic()
I see it called in x86 from oops_begin() that is called
in various places like die(), but couldn't find how it
ends up beeing called from panic().
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 2/3] Add tracing_off_event() calls to BUG() and WARN() paths
2010-04-15 20:57 ` Frederic Weisbecker
@ 2010-04-15 21:49 ` Chase Douglas
2010-04-15 23:15 ` Frederic Weisbecker
0 siblings, 1 reply; 11+ messages in thread
From: Chase Douglas @ 2010-04-15 21:49 UTC (permalink / raw)
To: Frederic Weisbecker
Cc: linux-kernel, Steven Rostedt, Ingo Molnar, Thomas Gleixner, Randy Dunlap
On Thu, Apr 15, 2010 at 1:57 PM, Frederic Weisbecker <fweisbec@gmail.com> wrote:
> On Wed, Apr 14, 2010 at 12:20:15PM -0400, Chase Douglas wrote:
>> This change adds tracing_off_event() calls, which stop debug tracing,
>> when a BUG() or WARN() function is called. The stoppage depends on
>> commandline paramenter tracing_off={bug,warn,none}. The default is
>> "bug", so only the BUG() paths will stop tracing.
>>
>> Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
>
>
> ACK
>
> But I can't find where we call oops_enter() from panic()
> I see it called in x86 from oops_begin() that is called
> in various places like die(), but couldn't find how it
> ends up beeing called from panic().
I did not test the panic() path, but when that happens the system goes
down anyways. You won't be able to get the ftrace unless you enable
the ftrace on oops option, in which case the end of the trace will
likely be close enough to what you are looking for anyways.
-- Chase
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 2/3] Add tracing_off_event() calls to BUG() and WARN() paths
2010-04-15 21:49 ` Chase Douglas
@ 2010-04-15 23:15 ` Frederic Weisbecker
2010-04-16 4:13 ` Chase Douglas
0 siblings, 1 reply; 11+ messages in thread
From: Frederic Weisbecker @ 2010-04-15 23:15 UTC (permalink / raw)
To: Chase Douglas
Cc: linux-kernel, Steven Rostedt, Ingo Molnar, Thomas Gleixner, Randy Dunlap
On Thu, Apr 15, 2010 at 02:49:05PM -0700, Chase Douglas wrote:
> On Thu, Apr 15, 2010 at 1:57 PM, Frederic Weisbecker <fweisbec@gmail.com> wrote:
> > On Wed, Apr 14, 2010 at 12:20:15PM -0400, Chase Douglas wrote:
> >> This change adds tracing_off_event() calls, which stop debug tracing,
> >> when a BUG() or WARN() function is called. The stoppage depends on
> >> commandline paramenter tracing_off={bug,warn,none}. The default is
> >> "bug", so only the BUG() paths will stop tracing.
> >>
> >> Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
> >
> >
> > ACK
> >
> > But I can't find where we call oops_enter() from panic()
> > I see it called in x86 from oops_begin() that is called
> > in various places like die(), but couldn't find how it
> > ends up beeing called from panic().
>
> I did not test the panic() path, but when that happens the system goes
> down anyways. You won't be able to get the ftrace unless you enable
> the ftrace on oops option, in which case the end of the trace will
> likely be close enough to what you are looking for anyways.
Yeah but there is also a sysrq that can trigger an ftrace dump.
So if you forgot ftrace dump on oops and you want to use the sysrq
then you don't want the tracing to continue between the panic and
the time for your fingers to reach the keyboard (that notwithstanding
the time to remember the right combination...which I always forget).
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 2/3] Add tracing_off_event() calls to BUG() and WARN() paths
2010-04-15 23:15 ` Frederic Weisbecker
@ 2010-04-16 4:13 ` Chase Douglas
0 siblings, 0 replies; 11+ messages in thread
From: Chase Douglas @ 2010-04-16 4:13 UTC (permalink / raw)
To: Frederic Weisbecker
Cc: linux-kernel, Steven Rostedt, Ingo Molnar, Thomas Gleixner, Randy Dunlap
On Thu, Apr 15, 2010 at 4:15 PM, Frederic Weisbecker <fweisbec@gmail.com> wrote:
> On Thu, Apr 15, 2010 at 02:49:05PM -0700, Chase Douglas wrote:
>> On Thu, Apr 15, 2010 at 1:57 PM, Frederic Weisbecker <fweisbec@gmail.com> wrote:
>> > On Wed, Apr 14, 2010 at 12:20:15PM -0400, Chase Douglas wrote:
>> >> This change adds tracing_off_event() calls, which stop debug tracing,
>> >> when a BUG() or WARN() function is called. The stoppage depends on
>> >> commandline paramenter tracing_off={bug,warn,none}. The default is
>> >> "bug", so only the BUG() paths will stop tracing.
>> >>
>> >> Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
>> >
>> >
>> > ACK
>> >
>> > But I can't find where we call oops_enter() from panic()
>> > I see it called in x86 from oops_begin() that is called
>> > in various places like die(), but couldn't find how it
>> > ends up beeing called from panic().
>>
>> I did not test the panic() path, but when that happens the system goes
>> down anyways. You won't be able to get the ftrace unless you enable
>> the ftrace on oops option, in which case the end of the trace will
>> likely be close enough to what you are looking for anyways.
>
>
> Yeah but there is also a sysrq that can trigger an ftrace dump.
> So if you forgot ftrace dump on oops and you want to use the sysrq
> then you don't want the tracing to continue between the panic and
> the time for your fingers to reach the keyboard (that notwithstanding
> the time to remember the right combination...which I always forget).
Ahhh, I can see where this would be useful then. I'll just add an
event to panic() like I did the other paths.
-- Chase
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2010-04-16 4:13 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-03-18 13:48 [PATCH 1/3] Add tracing_off_event() to stop tracing when a bug or warning occur Chase Douglas
2010-03-18 13:48 ` [PATCH 2/3] Add tracing_off_event() calls to BUG() and WARN() paths Chase Douglas
2010-03-18 13:48 ` [PATCH 3/3] Stop tracing on a schedule bug Chase Douglas
2010-03-18 14:56 ` [PATCH 1/3] Add tracing_off_event() to stop tracing when a bug or warning occur Steven Rostedt
2010-03-18 16:27 ` Chase Douglas
2010-03-22 16:14 ` Randy Dunlap
2010-04-14 16:20 [PATCH 1/3 v4] " Chase Douglas
2010-04-14 16:20 ` [PATCH 2/3] Add tracing_off_event() calls to BUG() and WARN() paths Chase Douglas
2010-04-15 20:57 ` Frederic Weisbecker
2010-04-15 21:49 ` Chase Douglas
2010-04-15 23:15 ` Frederic Weisbecker
2010-04-16 4:13 ` Chase Douglas
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®