From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83935C07E9B for ; Wed, 21 Jul 2021 10:46:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 246A661009 for ; Wed, 21 Jul 2021 10:46:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 246A661009 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m69kI-0006cY-37 for qemu-devel@archiver.kernel.org; Wed, 21 Jul 2021 06:46:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55692) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m69iO-0003dW-K4 for qemu-devel@nongnu.org; Wed, 21 Jul 2021 06:44:36 -0400 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]:35745) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m69iM-0001Xh-G7 for qemu-devel@nongnu.org; Wed, 21 Jul 2021 06:44:36 -0400 Received: by mail-ed1-x52e.google.com with SMTP id ca14so1829237edb.2 for ; Wed, 21 Jul 2021 03:44:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=E7sy4Jub6F61d/U81anJHHb9P4xyrmY5Kz/iblw13Kk=; b=qTBHdMjRENpE3ubeXcITzPYcNRi9MW/SqKRfOrs5gVgjuGh8RGXx/8bN524xB9BrzQ Pr0zhyQzimKJWOgJbyKI2yLbVdEvqxYXBjXzb5KnZ298lU2/m2AatKcVbwn80ps+Y3lh hRHbB4xttYASwqs87ArC9qATVpqVJ930J6LqTl2HQdtSJQE9REn8MmeflBWLCc3VJns7 fOF5nfMBwHRtfT7t/4svI8f54k7oGSDryKl7gMDnPIS1vbEojALOIVFQZaKmpCC1ooMc H7OQWMT9NW9rOPGDUnqrLwXGKsn6v+2X3PTccN/c2mlseXlPRtLTTHZjLHuFMDmY7gt9 fYJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=E7sy4Jub6F61d/U81anJHHb9P4xyrmY5Kz/iblw13Kk=; b=X+ab/RcYX3xPIMGBF+ZeFJxydC76vYgc1yMVfpb8SBQzfo7HNw3Tt5ZJCejrVeerhS 6dIlbX35aK0Tobl0pIzLJ6bwtXLhL/LUGLSo7I5q6R8/6fuK3iU5TqZPnM5I7+r3yMQ8 uHq91OxwW9h+zv3q5sJdWOlfzHmQiadHWNRFXaNv/NhUVjXRaE1jqzi8AFv69wZ7ABOM KtQjranOBG3d0Juj14KYXoxDcaIPwjCoGkpW3pmmvHa+1etHYCSLlfPlChDYSD6qGX4P GD9Odz8y/wDNclvG/IrugvRUFgg52MC1m5ZTx6l3p7fm0tsk0OdhHj+L3dOX8sctszNb EK4Q== X-Gm-Message-State: AOAM530lyqAN04Ufq9WEErRTRYY/Row1i3TbVCrXbvgchJH5azYQlezj 7e3XiekmIfYoRPpvoa7sNksfZukF3MPkMXxdiMA= X-Google-Smtp-Source: ABdhPJwenhtRpVz2DbKgBkQWfuorvaJFQLTNbCdW3MmJq0lTqTg0DU0xUNG8z0W0u74tiTRyFpeNVl2H9zVNxmqpfBI= X-Received: by 2002:a50:fe95:: with SMTP id d21mr47253228edt.257.1626864273257; Wed, 21 Jul 2021 03:44:33 -0700 (PDT) MIME-Version: 1.0 References: <20210721093347.338536-1-kraxel@redhat.com> <20210721093347.338536-3-kraxel@redhat.com> In-Reply-To: <20210721093347.338536-3-kraxel@redhat.com> From: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Date: Wed, 21 Jul 2021 14:44:20 +0400 Message-ID: Subject: Re: [PATCH 2/2] Revert "qxl: add migration blocker to avoid pre-save assert" To: Gerd Hoffmann Content-Type: multipart/alternative; boundary="0000000000001af90405c79fdb7a" Received-SPF: pass client-ip=2a00:1450:4864:20::52e; envelope-from=marcandre.lureau@gmail.com; helo=mail-ed1-x52e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: QEMU , Markus Armbruster Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --0000000000001af90405c79fdb7a Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Jul 21, 2021 at 1:34 PM Gerd Hoffmann wrote: > This reverts commit 86dbcdd9c7590d06db89ca256c5eaf0b4aba8858. > > The pre-save assert is gone now, so the migration blocker > is not needed any more. > > Signed-off-by: Gerd Hoffmann > Reviewed-by: Marc-Andr=C3=A9 Lureau > --- > hw/display/qxl.h | 1 - > hw/display/qxl.c | 31 ------------------------------- > 2 files changed, 32 deletions(-) > > diff --git a/hw/display/qxl.h b/hw/display/qxl.h > index 379d3304abc1..30d21f4d0bdc 100644 > --- a/hw/display/qxl.h > +++ b/hw/display/qxl.h > @@ -39,7 +39,6 @@ struct PCIQXLDevice { > uint32_t cmdlog; > > uint32_t guest_bug; > - Error *migration_blocker; > > enum qxl_mode mode; > uint32_t cmdflags; > diff --git a/hw/display/qxl.c b/hw/display/qxl.c > index 3867b94fe236..43482d4364ba 100644 > --- a/hw/display/qxl.c > +++ b/hw/display/qxl.c > @@ -30,7 +30,6 @@ > #include "qemu/module.h" > #include "hw/qdev-properties.h" > #include "sysemu/runstate.h" > -#include "migration/blocker.h" > #include "migration/vmstate.h" > #include "trace.h" > > @@ -666,30 +665,6 @@ static int interface_get_command(QXLInstance *sin, > struct QXLCommandExt *ext) > qxl->guest_primary.commands++; > qxl_track_command(qxl, ext); > qxl_log_command(qxl, "cmd", ext); > - { > - /* > - * Windows 8 drivers place qxl commands in the vram > - * (instead of the ram) bar. We can't live migrate such a > - * guest, so add a migration blocker in case we detect > - * this, to avoid triggering the assert in pre_save(). > - * > - * > https://cgit.freedesktop.org/spice/win32/qxl-wddm-dod/commit/?id=3Df6e099= db39e7d0787f294d5fd0dce328b5210faa > - */ > - void *msg =3D qxl_phys2virt(qxl, ext->cmd.data, ext->group_i= d); > - if (msg !=3D NULL && ( > - msg < (void *)qxl->vga.vram_ptr || > - msg > ((void *)qxl->vga.vram_ptr + > qxl->vga.vram_size))) { > - if (!qxl->migration_blocker) { > - Error *local_err =3D NULL; > - error_setg(&qxl->migration_blocker, > - "qxl: guest bug: command not in ram bar")= ; > - migrate_add_blocker(qxl->migration_blocker, > &local_err); > - if (local_err) { > - error_report_err(local_err); > - } > - } > - } > - } > trace_qxl_ring_command_get(qxl->id, > qxl_mode_to_string(qxl->mode)); > return true; > default: > @@ -1283,12 +1258,6 @@ static void qxl_hard_reset(PCIQXLDevice *d, int > loadvm) > qemu_spice_create_host_memslot(&d->ssd); > qxl_soft_reset(d); > > - if (d->migration_blocker) { > - migrate_del_blocker(d->migration_blocker); > - error_free(d->migration_blocker); > - d->migration_blocker =3D NULL; > - } > - > if (startstop) { > qemu_spice_display_start(); > } > -- > 2.31.1 > > > --=20 Marc-Andr=C3=A9 Lureau --0000000000001af90405c79fdb7a Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Wed, Jul 21, 2021 at 1:34 PM Gerd = Hoffmann <kraxel@redhat.com>= wrote:
This rev= erts commit 86dbcdd9c7590d06db89ca256c5eaf0b4aba8858.

The pre-save assert is gone now, so the migration blocker
is not needed any more.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

=
Reviewed-by: Marc-Andr=C3=A9 Lureau <marcandre.lureau@redhat.com>
=C2= =A0
---
=C2=A0hw/display/qxl.h |=C2=A0 1 -
=C2=A0hw/display/qxl.c | 31 -------------------------------
=C2=A02 files changed, 32 deletions(-)

diff --git a/hw/display/qxl.h b/hw/display/qxl.h
index 379d3304abc1..30d21f4d0bdc 100644
--- a/hw/display/qxl.h
+++ b/hw/display/qxl.h
@@ -39,7 +39,6 @@ struct PCIQXLDevice {
=C2=A0 =C2=A0 =C2=A0uint32_t=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0cmdlog= ;

=C2=A0 =C2=A0 =C2=A0uint32_t=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0guest_= bug;
-=C2=A0 =C2=A0 Error=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 *migra= tion_blocker;

=C2=A0 =C2=A0 =C2=A0enum qxl_mode=C2=A0 =C2=A0 =C2=A0 mode;
=C2=A0 =C2=A0 =C2=A0uint32_t=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0cmdfla= gs;
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index 3867b94fe236..43482d4364ba 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -30,7 +30,6 @@
=C2=A0#include "qemu/module.h"
=C2=A0#include "hw/qdev-properties.h"
=C2=A0#include "sysemu/runstate.h"
-#include "migration/blocker.h"
=C2=A0#include "migration/vmstate.h"
=C2=A0#include "trace.h"

@@ -666,30 +665,6 @@ static int interface_get_command(QXLInstance *sin, str= uct QXLCommandExt *ext)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0qxl->guest_primary.commands++;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0qxl_track_command(qxl, ext);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0qxl_log_command(qxl, "cmd", ext= );
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /*
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* Windows 8 drivers place = qxl commands in the vram
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* (instead of the ram) bar= .=C2=A0 We can't live migrate such a
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* guest, so add a migratio= n blocker in case we detect
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* this, to avoid triggerin= g the assert in pre_save().
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* https://cgit.free= desktop.org/spice/win32/qxl-wddm-dod/commit/?id=3Df6e099db39e7d0787f294d5fd= 0dce328b5210faa
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*/
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 void *msg =3D qxl_phys2virt(qxl,= ext->cmd.data, ext->group_id);
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if (msg !=3D NULL && ( -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 msg = < (void *)qxl->vga.vram_ptr ||
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 msg = > ((void *)qxl->vga.vram_ptr + qxl->vga.vram_size))) {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if (!qxl->migra= tion_blocker) {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Erro= r *local_err =3D NULL;
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 erro= r_setg(&qxl->migration_blocker,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"qxl: guest bug: command not in = ram bar");
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 migr= ate_add_blocker(qxl->migration_blocker, &local_err);
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if (= local_err) {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 error_report_err(local_err);
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 } -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 }
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 }
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 }
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0trace_qxl_ring_command_get(qxl->id, qx= l_mode_to_string(qxl->mode));
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return true;
=C2=A0 =C2=A0 =C2=A0default:
@@ -1283,12 +1258,6 @@ static void qxl_hard_reset(PCIQXLDevice *d, int load= vm)
=C2=A0 =C2=A0 =C2=A0qemu_spice_create_host_memslot(&d->ssd);
=C2=A0 =C2=A0 =C2=A0qxl_soft_reset(d);

-=C2=A0 =C2=A0 if (d->migration_blocker) {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 migrate_del_blocker(d->migration_blocker);<= br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 error_free(d->migration_blocker);
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 d->migration_blocker =3D NULL;
-=C2=A0 =C2=A0 }
-
=C2=A0 =C2=A0 =C2=A0if (startstop) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0qemu_spice_display_start();
=C2=A0 =C2=A0 =C2=A0}
--
2.31.1




--
Marc-Andr=C3=A9 Lureau
--0000000000001af90405c79fdb7a--