From nobody Tue Feb 10 01:55:19 2026 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=1621256745; cv=none; d=zohomail.com; s=zohoarc; b=egaXsNf0xEysKanAmii7XoNsjV2/bLtrPPbIKNLo3yHIPWMGHRv145ZcBbYU4dJHzmWwSfwG5LDrPF/k8b1fm5EWdWFx6xqjsIrxNz2pcx9y5imHxY7NcvThnqVnQp3tBH+E0vYmrOavw9MhRp/iYub7b+D4coWmnBleXyob9t0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621256745; 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=Uk3cD0y2ZU9zhEwwDHeeDmUq2uHgHQx8PXHTYhUmKng=; b=mkBgIDYai/GVYPuoLe8Pf2GzV2BEIMXxymQUCDr6Znee0qW5//cFEfaevw413Btf7szl/KdDLBRHM5xKSI6zPVW8mRF0G1PwRn6ty+oZUB+nus/bTfVKrln/moIIcEIpxFHgHnSBE/J4Co7mmJtNFVn70rvkR4ynEIAl+PwmsUw= 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 1621256745173767.6760539696909; Mon, 17 May 2021 06:05:45 -0700 (PDT) Received: from localhost ([::1]:53994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1licwH-0005y0-L4 for importer@patchew.org; Mon, 17 May 2021 09:05:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32846) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1licvB-0004dy-6w for qemu-devel@nongnu.org; Mon, 17 May 2021 09:04:33 -0400 Received: from mail.ispras.ru ([83.149.199.84]:49832) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1licv8-0001yx-E6 for qemu-devel@nongnu.org; Mon, 17 May 2021 09:04:32 -0400 Received: from [127.0.1.1] (unknown [85.142.117.224]) by mail.ispras.ru (Postfix) with ESMTPSA id 77D1F4076B5E; Mon, 17 May 2021 13:04:20 +0000 (UTC) Subject: [PATCH] replay: improve determinism of virtio-net From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Mon, 17 May 2021 16:04:20 +0300 Message-ID: <162125666020.1252655.9997723318921206001.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, jasowang@redhat.com, pavel.dovgalyuk@ispras.ru, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" virtio-net device uses bottom halves for callbacks. These callbacks should be deterministic, because they affect VM state. This patch replaces BH invocations with corresponding replay functions, making them deterministic in record/replay mode. This patch also disables guest announce timers for record/replay, because they break correct loadvm in deterministic mode. Signed-off-by: Pavel Dovgalyuk --- hw/net/virtio-net.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 6b7e8dd04e..e876363236 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -44,6 +44,7 @@ #include "hw/pci/pci.h" #include "net_rx_pkt.h" #include "hw/virtio/vhost.h" +#include "sysemu/replay.h" =20 #define VIRTIO_NET_VM_VERSION 11 =20 @@ -394,7 +395,7 @@ static void virtio_net_set_status(struct VirtIODevice *= vdev, uint8_t status) timer_mod(q->tx_timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + n->= tx_timeout); } else { - qemu_bh_schedule(q->tx_bh); + replay_bh_schedule_event(q->tx_bh); } } else { if (q->tx_timer) { @@ -2546,7 +2547,7 @@ static void virtio_net_handle_tx_bh(VirtIODevice *vde= v, VirtQueue *vq) return; } virtio_queue_set_notification(vq, 0); - qemu_bh_schedule(q->tx_bh); + replay_bh_schedule_event(q->tx_bh); } =20 static void virtio_net_tx_timer(void *opaque) @@ -2602,7 +2603,7 @@ static void virtio_net_tx_bh(void *opaque) /* If we flush a full burst of packets, assume there are * more coming and immediately reschedule */ if (ret >=3D n->tx_burst) { - qemu_bh_schedule(q->tx_bh); + replay_bh_schedule_event(q->tx_bh); q->tx_waiting =3D 1; return; } @@ -2616,7 +2617,7 @@ static void virtio_net_tx_bh(void *opaque) return; } else if (ret > 0) { virtio_queue_set_notification(q->tx_vq, 0); - qemu_bh_schedule(q->tx_bh); + replay_bh_schedule_event(q->tx_bh); q->tx_waiting =3D 1; } } @@ -3206,6 +3207,10 @@ static void virtio_net_device_realize(DeviceState *d= ev, Error **errp) n->host_features |=3D (1ULL << VIRTIO_NET_F_MTU); } =20 + if (replay_mode !=3D REPLAY_MODE_NONE) { + n->host_features &=3D ~(1ULL << VIRTIO_NET_F_GUEST_ANNOUNCE); + } + if (n->net_conf.duplex_str) { if (strncmp(n->net_conf.duplex_str, "half", 5) =3D=3D 0) { n->net_conf.duplex =3D DUPLEX_HALF;