aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2017-03-15 14:48:25 +0000
committerGerd Hoffmann <kraxel@redhat.com>2017-03-17 10:17:21 +0100
commit8bb93c6f99a42c2e0943bc904b283cd622d302c5 (patch)
treed362ea24ea051fe4264f72180fcd18ebc8c2d567
parent272d7dee5951f926fad1911f2f072e5915cdcba0 (diff)
downloadqemu-arm-8bb93c6f99a42c2e0943bc904b283cd622d302c5.tar.gz
ui/console: ensure graphic updates don't race with TCG vCPUs
Commit 8d04fb55.. tcg: drop global lock during TCG code execution ..broke the assumption that updates to the GUI couldn't happen at the same time as TCG vCPUs where running. As a result the TCG vCPU could still be updating a directly mapped frame-buffer while the display side was updating. This would cause artefacts to appear when the update code assumed that memory block hadn't changed. The simplest solution is to ensure the two things can't happen at the same time like the old BQL locking scheme. Here we use the solution introduced for MTTCG and schedule the update as async_safe_work when we know no vCPUs can be running. Reported-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-id: 20170315144825.3108-1-alex.bennee@linaro.org Cc: BALATON Zoltan <balaton@eik.bme.hu> Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> [ kraxel: updated comment clarifying the display adapters are buggy and this is a temporary workaround ] Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--ui/console.c21
1 files changed, 20 insertions, 1 deletions
diff --git a/ui/console.c b/ui/console.c
index 4c70d8bfda..937c950840 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1575,13 +1575,32 @@ bool dpy_gfx_check_format(QemuConsole *con,
return true;
}
+/*
+ * Safe DPY refresh for TCG guests. This runs when the TCG vCPUs are
+ * quiescent so we can avoid races between dirty page tracking for
+ * direct frame-buffer access by the guest.
+ *
+ * This is a temporary stopgap until we've fixed the dirty tracking
+ * races in display adapters.
+ */
+static void do_safe_dpy_refresh(CPUState *cpu, run_on_cpu_data opaque)
+{
+ DisplayChangeListener *dcl = opaque.host_ptr;
+ dcl->ops->dpy_refresh(dcl);
+}
+
static void dpy_refresh(DisplayState *s)
{
DisplayChangeListener *dcl;
QLIST_FOREACH(dcl, &s->listeners, next) {
if (dcl->ops->dpy_refresh) {
- dcl->ops->dpy_refresh(dcl);
+ if (tcg_enabled()) {
+ async_safe_run_on_cpu(first_cpu, do_safe_dpy_refresh,
+ RUN_ON_CPU_HOST_PTR(dcl));
+ } else {
+ dcl->ops->dpy_refresh(dcl);
+ }
}
}
}