From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
qemu-block@nongnu.org, "Juan Quintela" <quintela@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Max Reitz" <mreitz@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PATCH 2/5] softmmu: add trace point when bdrv_flush_all fails
Date: Thu, 15 Apr 2021 14:58:48 +0100 [thread overview]
Message-ID: <20210415135851.862406-3-berrange@redhat.com> (raw)
In-Reply-To: <20210415135851.862406-1-berrange@redhat.com>
The VM stop process has to flush outstanding I/O and this is a critical
failure scenario that is hard to diagnose. Add a probe point that
records the flush return code.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
softmmu/cpus.c | 7 ++++++-
softmmu/trace-events | 3 +++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/softmmu/cpus.c b/softmmu/cpus.c
index a7ee431187..c3caaeb26e 100644
--- a/softmmu/cpus.c
+++ b/softmmu/cpus.c
@@ -44,6 +44,7 @@
#include "sysemu/whpx.h"
#include "hw/boards.h"
#include "hw/hw.h"
+#include "trace.h"
#ifdef CONFIG_LINUX
@@ -266,6 +267,7 @@ static int do_vm_stop(RunState state, bool send_stop)
bdrv_drain_all();
ret = bdrv_flush_all();
+ trace_vm_stop_flush_all(ret);
return ret;
}
@@ -704,12 +706,15 @@ int vm_stop_force_state(RunState state)
if (runstate_is_running()) {
return vm_stop(state);
} else {
+ int ret;
runstate_set(state);
bdrv_drain_all();
/* Make sure to return an error if the flush in a previous vm_stop()
* failed. */
- return bdrv_flush_all();
+ ret = bdrv_flush_all();
+ trace_vm_stop_flush_all(ret);
+ return ret;
}
}
diff --git a/softmmu/trace-events b/softmmu/trace-events
index b80ca042e1..f11b427544 100644
--- a/softmmu/trace-events
+++ b/softmmu/trace-events
@@ -19,6 +19,9 @@ flatview_new(void *view, void *root) "%p (root %p)"
flatview_destroy(void *view, void *root) "%p (root %p)"
flatview_destroy_rcu(void *view, void *root) "%p (root %p)"
+# softmmu.c
+vm_stop_flush_all(int ret) "ret %d"
+
# vl.c
vm_state_notify(int running, int reason, const char *reason_str) "running %d reason %d (%s)"
load_file(const char *name, const char *path) "name %s location %s"
--
2.30.2
next prev parent reply other threads:[~2021-04-15 14:06 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-15 13:58 [PATCH 0/5] block, migration: improve debugging of migration bdrv_flush failure Daniel P. Berrangé
2021-04-15 13:58 ` [PATCH 1/5] migration: add trace point when vm_stop_force_state fails Daniel P. Berrangé
2021-04-15 16:30 ` Dr. David Alan Gilbert
2021-04-15 13:58 ` Daniel P. Berrangé [this message]
2021-04-15 16:31 ` [PATCH 2/5] softmmu: add trace point when bdrv_flush_all fails Dr. David Alan Gilbert
2021-04-15 13:58 ` [PATCH 3/5] block: preserve errno from fdatasync failures Daniel P. Berrangé
2021-04-15 13:58 ` [PATCH 4/5] block: add trace point when fdatasync fails Daniel P. Berrangé
2021-04-15 16:34 ` Dr. David Alan Gilbert
2021-04-15 13:58 ` [PATCH 5/5] block: remove duplicate trace.h include Daniel P. Berrangé
2021-04-15 16:37 ` Dr. David Alan Gilbert
2021-04-15 19:33 ` [PATCH 0/5] block, migration: improve debugging of migration bdrv_flush failure Connor Kuehl
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=20210415135851.862406-3-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=richard.henderson@linaro.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 NNTP newsgroup(s).