| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1313528243-1488-2-git-send-email-zakmagnus@chromium.org>
Date: Tue, 16 Aug 2011 13:57:23 -0700
From: Alex Neronskiy <zakmagnus@...omium.org>
To: linux-kernel@...r.kernel.org
Cc: peterz@...radead.org, Ingo Molnar <mingo@...e.hu>,
Don Zickus <dzickus@...hat.com>,
Mandeep Singh Baines <msb@...omium.org>,
Alex Neronskiy <zakmagnus@...omium.org>
Subject: [PATCH v8 2/2] Use trace events to report stalls
---
A first-pass replacement. It outputs the numbers perfectly well
but I also need it to output stack traces. It would be halfway
there if I could save_stack_trace, but I can't seem to store a
struct stack_trace in the buffer; and either way, I still don't
know how to print it all out. Any simple way to do this?
kernel/trace_watchdog.h | 43 +++++++++++++++++++++++++++++++++++++++++++
kernel/watchdog.c | 27 +++++++++++----------------
2 files changed, 54 insertions(+), 16 deletions(-)
create mode 100644 kernel/trace_watchdog.h
diff --git a/kernel/trace_watchdog.h b/kernel/trace_watchdog.h
new file mode 100644
index 0000000..1401d27f
--- /dev/null
+++ b/kernel/trace_watchdog.h
@@ -0,0 +1,43 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM watchdog
+
+#if !defined(_TRACE_WATCHDOG_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_WATCHDOG_H
+
+#include <linux/tracepoint.h>
+#include <linux/stacktrace.h>
+
+TRACE_EVENT(soft_stall,
+ TP_PROTO(unsigned long stall),
+ TP_ARGS(stall),
+ TP_STRUCT__entry(
+ __field(unsigned long, stall)
+ ),
+ TP_fast_assign(
+ __entry->stall = stall;
+ ),
+ TP_printk("Soft stall: %lums", __entry->stall)
+);
+
+#ifdef CONFIG_HARDLOCKUP_DETECTOR
+TRACE_EVENT(hard_stall,
+ TP_PROTO(unsigned long stall),
+ TP_ARGS(stall),
+ TP_STRUCT__entry(
+ __field(unsigned long, stall)
+ ),
+ TP_fast_assign(
+ __entry->stall = stall;
+ ),
+ TP_printk("Hard stall: %lu", __entry->stall)
+);
+#endif /* CONFIG_HARDLOCKUP_DETECTOR */
+
+#endif /* _TRACE_WATCHDOG_H */
+
+#undef TRACE_INCLUDE_PATH
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_PATH .
+
+#define TRACE_INCLUDE_FILE trace_watchdog
+#include <trace/define_trace.h>
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index d4c51cc..0f16330 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -27,6 +27,9 @@
#include <asm/irq_regs.h>
#include <linux/perf_event.h>
+#define CREATE_TRACE_POINTS
+#include "trace_watchdog.h"
+
int watchdog_enabled = 1;
int __read_mostly watchdog_thresh = 10;
static unsigned long worst_softstall;
@@ -208,7 +211,7 @@ void touch_softlockup_watchdog_sync(void)
#ifdef CONFIG_HARDLOCKUP_DETECTOR
/* watchdog detector functions */
-static void update_hardstall(unsigned long stall, int this_cpu)
+static void update_hardstall(unsigned long stall)
{
int update_stall = 0;
@@ -221,12 +224,8 @@ static void update_hardstall(unsigned long stall, int this_cpu)
spin_unlock_irqrestore(&hardstall_lock, flags);
}
- if (update_stall) {
- printk(KERN_WARNING "LOCKUP may be in progress!"
- "Worst hard stall seen on CPU#%d: %lu interrupts missed\n",
- this_cpu, stall);
- dump_stack();
- }
+ if (update_stall)
+ trace_hard_stall(stall);
}
static int is_hardlockup(int this_cpu)
@@ -245,12 +244,12 @@ static int is_hardlockup(int this_cpu)
if (ints_missed >= hardlockup_thresh)
return 1;
- update_hardstall(ints_missed, this_cpu);
+ update_hardstall(ints_missed);
return 0;
}
#endif
-static void update_softstall(unsigned long stall, int this_cpu)
+static void update_softstall(unsigned long stall)
{
int update_stall = 0;
if (stall > get_softstall_thresh() &&
@@ -263,12 +262,8 @@ static void update_softstall(unsigned long stall, int this_cpu)
spin_unlock_irqrestore(&softstall_lock, flags);
}
- if (update_stall) {
- printk(KERN_WARNING "LOCKUP may be in progress!"
- "Worst soft stall seen on CPU#%d: %lums\n",
- this_cpu, stall);
- dump_stack();
- }
+ if (update_stall)
+ trace_soft_stall(stall);
}
static int is_softlockup(unsigned long touch_ts, int this_cpu)
@@ -280,7 +275,7 @@ static int is_softlockup(unsigned long touch_ts, int this_cpu)
if (time_after(now, touch_ts + 1000 * get_softlockup_thresh()))
return stall;
- update_softstall(stall, this_cpu);
+ update_softstall(stall);
return 0;
}
--
1.7.3.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists