From: Eric B Munson <emunson@mgebm.net>
To: kvm-ia64@vger.kernel.org
Subject: [PATCH 4/4] Add check for suspended vm in softlockup detector
Date: Mon, 29 Aug 2011 23:27:15 +0000 [thread overview]
Message-ID: <1314660435-23293-5-git-send-email-emunson@mgebm.net> (raw)
A suspended VM can cause spurious soft lockup warnings. To avoid these, the
watchdog now checks if the kernel knows it was stopped by the host and skips
the warning if so.
Signed-off-by: Eric B Munson <emunson@mgebm.net>
---
kernel/watchdog.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 36491cd..4cbb69f 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -25,6 +25,7 @@
#include <linux/sysctl.h>
#include <asm/irq_regs.h>
+#include <asm/pvclock.h>
#include <linux/perf_event.h>
int watchdog_enabled = 1;
@@ -292,6 +293,17 @@ static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer)
*/
duration = is_softlockup(touch_ts);
if (unlikely(duration)) {
+ /*
+ * If a virtual machine is stopped by the host it can look to
+ * the watchdog like a soft lockup, check to see if the host
+ * stopped the vm before we issue the warning
+ */
+ if (kvm_check_and_clear_host_stopped(get_cpu())) {
+ put_cpu();
+ return HRTIMER_RESTART;
+ }
+ put_cpu();
+
/* only warn once */
if (__this_cpu_read(soft_watchdog_warn) = true)
return HRTIMER_RESTART;
--
1.7.4.1
reply other threads:[~2011-08-29 23:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1314660435-23293-5-git-send-email-emunson@mgebm.net \
--to=emunson@mgebm.net \
--cc=kvm-ia64@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 read-only IMAP folder(s) and NNTP newsgroup(s).