From nobody Sat May 18 15:08:21 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=fail(p=none dis=none) header.from=ispras.ru ARC-Seal: i=1; a=rsa-sha256; t=1621256855; cv=none; d=zohomail.com; s=zohoarc; b=X3/3KZ+ZXapU8WfjSOjzmFdq+hooKi4tjCAkYcXsMXRFZnHyVyrHmg7dAUaYE3dXEy25J4eRDOHiGLkuP6/DtfMAWGI0Kx7DSBuFiMnggt4dsxNH36YvJN+NwOYoQ7Ei9xZcHRSNZxUYuVSeUq3a+BrmAujq/yWe0JUJadWmh4k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621256855; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=tc0JNc0P7w68EJP+rcLsA2q292ygWFzRzJjjJm3C1/A=; b=UdVynQlVCZ9/LGrw8GNwh0FkTcT7FkahRLdM5i0nJJzktxcmvc9miZ8mDYUtXLdr3yPK6SwW1ASx5RQbyt0UZUcI9IzZBYRFMBcsOhbvvmoLzNoL53r6pqGaDfSgKMKbpqPcfB7867ifeGbvpjW+VcwmFX4E0WVHWkoQQFDUOXo= ARC-Authentication-Results: i=1; mx.zohomail.com; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1621256855440786.194797846543; Mon, 17 May 2021 06:07:35 -0700 (PDT) Received: from localhost ([::1]:58868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1licy5-0001l5-9K for importer@patchew.org; Mon, 17 May 2021 09:07:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1licx6-0007zO-Bq for qemu-devel@nongnu.org; Mon, 17 May 2021 09:06:32 -0400 Received: from mail.ispras.ru ([83.149.199.84]:50170) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1licx4-0003GO-Dk for qemu-devel@nongnu.org; Mon, 17 May 2021 09:06:32 -0400 Received: from [127.0.1.1] (unknown [85.142.117.224]) by mail.ispras.ru (Postfix) with ESMTPSA id E93164076B5F; Mon, 17 May 2021 13:06:28 +0000 (UTC) Subject: [PATCH] virtio: disable ioeventfd for record/replay From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Mon, 17 May 2021 16:06:28 +0300 Message-ID: <162125678869.1252810.4317416444097392406.stgit@pasha-ThinkPad-X280> User-Agent: StGit/0.23 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=83.149.199.84; envelope-from=pavel.dovgalyuk@ispras.ru; helo=mail.ispras.ru X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, 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: alex.bennee@linaro.org, pbonzini@redhat.com, pavel.dovgalyuk@ispras.ru, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" virtio devices support separate iothreads waiting for events from file descriptors. These are asynchronous events that can't be recorded and replayed, therefore this patch disables ioeventfd for all devices when record or replay is enabled. Signed-off-by: Pavel Dovgalyuk --- hw/s390x/virtio-ccw.c | 6 ++++++ hw/virtio/virtio-mmio.c | 6 ++++++ hw/virtio/virtio-pci.c | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 92b950e09a..bd8b9c5755 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -31,6 +31,7 @@ #include "trace.h" #include "hw/s390x/css-bridge.h" #include "hw/s390x/s390-virtio-ccw.h" +#include "sysemu/replay.h" =20 #define NR_CLASSIC_INDICATOR_BITS 64 =20 @@ -769,6 +770,11 @@ static void virtio_ccw_device_realize(VirtioCcwDevice = *dev, Error **errp) dev->flags &=3D ~VIRTIO_CCW_FLAG_USE_IOEVENTFD; } =20 + /* fd-based ioevents can't be synchronized in record/replay */ + if (replay_mode !=3D REPLAY_MODE_NONE) { + dev->flags &=3D ~VIRTIO_CCW_FLAG_USE_IOEVENTFD; + } + if (k->realize) { k->realize(dev, &err); if (err) { diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index 5952471b38..1af48a1b04 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -29,6 +29,7 @@ #include "qemu/host-utils.h" #include "qemu/module.h" #include "sysemu/kvm.h" +#include "sysemu/replay.h" #include "hw/virtio/virtio-mmio.h" #include "qemu/error-report.h" #include "qemu/log.h" @@ -740,6 +741,11 @@ static void virtio_mmio_realizefn(DeviceState *d, Erro= r **errp) proxy->flags &=3D ~VIRTIO_IOMMIO_FLAG_USE_IOEVENTFD; } =20 + /* fd-based ioevents can't be synchronized in record/replay */ + if (replay_mode !=3D REPLAY_MODE_NONE) { + proxy->flags &=3D ~VIRTIO_IOMMIO_FLAG_USE_IOEVENTFD; + } + if (proxy->legacy) { memory_region_init_io(&proxy->iomem, OBJECT(d), &virtio_legacy_mem_ops, proxy, diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index b321604d9b..f1e105fa52 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -37,6 +37,7 @@ #include "qemu/range.h" #include "hw/virtio/virtio-bus.h" #include "qapi/visitor.h" +#include "sysemu/replay.h" =20 #define VIRTIO_PCI_REGION_SIZE(dev) VIRTIO_PCI_CONFIG_OFF(msix_present= (dev)) =20 @@ -1760,6 +1761,11 @@ static void virtio_pci_realize(PCIDevice *pci_dev, E= rror **errp) proxy->flags &=3D ~VIRTIO_PCI_FLAG_USE_IOEVENTFD; } =20 + /* fd-based ioevents can't be synchronized in record/replay */ + if (replay_mode !=3D REPLAY_MODE_NONE) { + proxy->flags &=3D ~VIRTIO_PCI_FLAG_USE_IOEVENTFD; + } + /* * virtio pci bar layout used by default. * subclasses can re-arrange things if needed.