From nobody Sat May 18 23:14:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1626860513; cv=none; d=zohomail.com; s=zohoarc; b=KaO09OWYSaW6N27kLHgH7H66FfC6qRHyZHs8xflFKxHobWfYI6ux2VvCU91ABDejYymYpLaBAyGlSmctZN4a9MlYFgWKdMQpDmoL2EnmIE+XqqhZYXdOz7Cd8je6YWeXrK2VZFIhPjEWwBAjRpGFywtkJCTusMe539GT9yvpVKg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626860513; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0wdBB01ZYqT+b15CQDkjK/qGLoNvPPFNhR+T1tcSMxo=; b=Fg5WVSx2h+xfrSLlUcspKBnY3PyVz8pzm3Aj0SQvn+/GuYL7LKC968SEI1Hd3OiUna+iDORFPMiSFRoDcQ/DJQbdp7+h/Hsm9e1bOS1eLvRmkh+S9FpljgWSnXv9PO4xs4iGFPg/jxdudWfIsmLpzErzAADUJq4CQ3KC2CWOnX4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1626860513555451.04956794926125; Wed, 21 Jul 2021 02:41:53 -0700 (PDT) Received: from localhost ([::1]:58050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m68jg-0003t1-Ex for importer@patchew.org; Wed, 21 Jul 2021 05:41:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42636) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m68c1-0001NQ-5i for qemu-devel@nongnu.org; Wed, 21 Jul 2021 05:33:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:43572) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m68bz-00061M-Nr for qemu-devel@nongnu.org; Wed, 21 Jul 2021 05:33:56 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-121-NUPkRFV6OBKbwFNDr078bg-1; Wed, 21 Jul 2021 05:33:53 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DE949107ACF5 for ; Wed, 21 Jul 2021 09:33:52 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-114-106.ams2.redhat.com [10.36.114.106]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1E5F8781EA; Wed, 21 Jul 2021 09:33:49 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 8500E18000B4; Wed, 21 Jul 2021 11:33:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626860035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0wdBB01ZYqT+b15CQDkjK/qGLoNvPPFNhR+T1tcSMxo=; b=Z6L1u5+yDD4p3pZAPKLvd8bKWbL3m/MxaUpGFFPOvPlFm8tmFYpAvQrTtzhUP6MVR/C7/r h4bppQeOd5WB3ZQkPZnyYGsj+CfRbLvxzob9zGX2mfT8zbPNmiM142XgrWQB94BqtqS2kt bQdU75eUGgEDz3noHSOCGq44KPW3zVc= X-MC-Unique: NUPkRFV6OBKbwFNDr078bg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 1/2] qxl: remove assert in qxl_pre_save. Date: Wed, 21 Jul 2021 11:33:46 +0200 Message-Id: <20210721093347.338536-2-kraxel@redhat.com> In-Reply-To: <20210721093347.338536-1-kraxel@redhat.com> References: <20210721093347.338536-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.474, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: armbru@redhat.com, Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1626860513965100001 Content-Type: text/plain; charset="utf-8" Since commit 551dbd0846d2 ("migration: check pre_save return in vmstate_save_state") the pre_save hook can fail. So lets finally use that to drop the guest-triggerable assert in qxl_pre_save(). Signed-off-by: Gerd Hoffmann Reviewed-by: Marc-Andr=C3=A9 Lureau --- hw/display/qxl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 84f99088e0a0..3867b94fe236 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -2283,7 +2283,9 @@ static int qxl_pre_save(void *opaque) } else { d->last_release_offset =3D (uint8_t *)d->last_release - ram_start; } - assert(d->last_release_offset < d->vga.vram_size); + if (d->last_release_offset < d->vga.vram_size) { + return 1; + } =20 return 0; } --=20 2.31.1 From nobody Sat May 18 23:14:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1626860157; cv=none; d=zohomail.com; s=zohoarc; b=SbBBRLbLkR2JybrZ4Uu/8M99axMSF8FTNAsvd9nIxiOMLGm+eK8HPKA2TinoThJop7PyawXJCq3aFIT8XWiuCYDk6Ej/wnNaLPPA++FfrFIHv/ZpQgQIPiElwWTSv6NkQwnee0KxREJcUSltsDla3rEgOj0x1uwFPVJXTDeo3DU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626860157; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tcsMpfPBGwvlXcHMHCH5R0jAehp06wi47Sm23kfN+Ss=; b=DQ+e0SQBbMc7wIjK7w+IJHn5n90GJLwfpVGduFM1Eh6ukSmON/yEAeocSVH9efbp3oLsMLD4e7CaExb7YOflDa6qTDB5KnYcLg1a+xMjahnutDwXmHO3edUzURZKDB7hk8jgqTGwsEF4Ip8iz44WETViLaKP35DXBfIadzDohEU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1626860157633104.97335822377875; Wed, 21 Jul 2021 02:35:57 -0700 (PDT) Received: from localhost ([::1]:46158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m68dw-0003wl-GZ for importer@patchew.org; Wed, 21 Jul 2021 05:35:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m68c4-0001RV-Qk for qemu-devel@nongnu.org; Wed, 21 Jul 2021 05:34:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:48700) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m68c3-00063G-7x for qemu-devel@nongnu.org; Wed, 21 Jul 2021 05:34:00 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-540-D6GpCrM0MFKBpsw2Io38xA-1; Wed, 21 Jul 2021 05:33:55 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AADCE1084F53 for ; Wed, 21 Jul 2021 09:33:54 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-114-106.ams2.redhat.com [10.36.114.106]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E23C019D7C; Wed, 21 Jul 2021 09:33:50 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 91A0F18000B5; Wed, 21 Jul 2021 11:33:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626860038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tcsMpfPBGwvlXcHMHCH5R0jAehp06wi47Sm23kfN+Ss=; b=ejQx9k2H6iijnP31cdhu8zw4Gdl2uFNEG8imMnXVTVF6c6GsYGNRjNI5jwgCBqHPw0xHBm liQcbnsD7zFpyPgmDRX9uDP428HM/4QATN6judZ3T9/Jbgkc93agmEsLmbNzezx72S7p7D gCVruWVbw9O8+gB4+RmqP4cw09F+1Dg= X-MC-Unique: D6GpCrM0MFKBpsw2Io38xA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 2/2] Revert "qxl: add migration blocker to avoid pre-save assert" Date: Wed, 21 Jul 2021 11:33:47 +0200 Message-Id: <20210721093347.338536-3-kraxel@redhat.com> In-Reply-To: <20210721093347.338536-1-kraxel@redhat.com> References: <20210721093347.338536-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.474, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: armbru@redhat.com, Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1626860158650100001 Content-Type: text/plain; charset="utf-8" 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; =20 uint32_t guest_bug; - Error *migration_blocker; =20 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" =20 @@ -666,30 +665,6 @@ static int interface_get_command(QXLInstance *sin, str= uct 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/commi= t/?id=3Df6e099db39e7d0787f294d5fd0dce328b5210faa - */ - void *msg =3D qxl_phys2virt(qxl, ext->cmd.data, ext->group_id); - 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 load= vm) qemu_spice_create_host_memslot(&d->ssd); qxl_soft_reset(d); =20 - 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(); } --=20 2.31.1