From patchwork Fri Sep 29 08:51:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 1841204 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=ispras.ru header.i=@ispras.ru header.a=rsa-sha256 header.s=default header.b=CUiAd7Eg; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rxkkw72R4z1yng for ; Fri, 29 Sep 2023 18:57:44 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9EW-0006t8-O7; Fri, 29 Sep 2023 04:52:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qm9EU-0006p3-Sw for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:52:22 -0400 Received: from mail.ispras.ru ([83.149.199.84]) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qm9EB-0005nk-3I for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:52:21 -0400 Received: from pasha-ThinkPad-X280.intra.ispras.ru (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id BEC82407673F; Fri, 29 Sep 2023 08:51:43 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru BEC82407673F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1695977504; bh=dKFFm7R6+Axa7i1r/YbkWjpTqQuk5V/90c16FzzK0OQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CUiAd7Eg4XWgntOpa1f6m5E6TC4BTVDiKTWYDHOy5oTJzBTa8eCYqGPJzxbBTiTJT A529btiFgWLd0CndcyPaJYlIDjL1b+6NRlBx/OgOTrZWS2dwtpsxlx8omPtzockJAY mvfwgslSoTA5B7NDB3Cae4jDxXqOLDh4ibWC2XWE= From: pavel.dovgalyuk@ispras.ru To: qemu-devel@nongnu.org Cc: philmd@linaro.org, crosa@redhat.com, wainersm@redhat.com, bleal@redhat.com, alex.bennee@linaro.org, mst@redhat.com, rafael.pizarrosolar@epfl.ch, jasowang@redhat.com, Pavel Dovgalyuk , Pavel Dovgalyuk Subject: [PATCH 1/3] replay: improve determinism of virtio-net Date: Fri, 29 Sep 2023 11:51:19 +0300 Message-Id: <20230929085121.848482-2-pavel.dovgalyuk@ispras.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230929085121.848482-1-pavel.dovgalyuk@ispras.ru> References: <20230929085121.848482-1-pavel.dovgalyuk@ispras.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=83.149.199.84; envelope-from=pavel.dovgalyuk@ispras.ru; helo=mail.ispras.ru X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Pavel Dovgalyuk 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. Signed-off-by: Pavel Dovgalyuk --- hw/net/virtio-net.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 5a0201c423..50156e8002 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -46,6 +46,7 @@ #include "net_rx_pkt.h" #include "hw/virtio/vhost.h" #include "sysemu/qtest.h" +#include "sysemu/replay.h" #define VIRTIO_NET_VM_VERSION 11 @@ -417,7 +418,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) { @@ -2822,7 +2823,7 @@ static void virtio_net_handle_tx_bh(VirtIODevice *vdev, VirtQueue *vq) return; } virtio_queue_set_notification(vq, 0); - qemu_bh_schedule(q->tx_bh); + replay_bh_schedule_event(q->tx_bh); } static void virtio_net_tx_timer(void *opaque) @@ -2905,7 +2906,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 >= n->tx_burst) { - qemu_bh_schedule(q->tx_bh); + replay_bh_schedule_event(q->tx_bh); q->tx_waiting = 1; return; } @@ -2919,7 +2920,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 = 1; } } From patchwork Fri Sep 29 08:51:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 1841191 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=ispras.ru header.i=@ispras.ru header.a=rsa-sha256 header.s=default header.b=RwszhbkK; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rxkjk3nC7z1ypT for ; Fri, 29 Sep 2023 18:56:42 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9EM-0006M7-0j; Fri, 29 Sep 2023 04:52:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qm9EF-0006A8-QO for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:52:07 -0400 Received: from mail.ispras.ru ([83.149.199.84]) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qm9EB-0005o6-7q for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:52:06 -0400 Received: from pasha-ThinkPad-X280.intra.ispras.ru (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id BED7C4076742; Fri, 29 Sep 2023 08:51:44 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru BED7C4076742 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1695977505; bh=bSykyvCv+UImIyNEEnq+8pfBQ8xwbQKTxoM4yyTd63M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RwszhbkKS1p288zdamBUfh0UGakwUye0WTfde3pP8J8nq8roUxpdJveWKpmoaQ+Ym WebT7koKj85Kled/r90INscd+8aK9ElxOYLiFv+Ca3tSk3llcxVR2SPOcVc86Gsa+U lF1PRjkRbZ1E47pFHB6BzXXdNL3rf9pO12qW4TMc= From: pavel.dovgalyuk@ispras.ru To: qemu-devel@nongnu.org Cc: philmd@linaro.org, crosa@redhat.com, wainersm@redhat.com, bleal@redhat.com, alex.bennee@linaro.org, mst@redhat.com, rafael.pizarrosolar@epfl.ch, jasowang@redhat.com, Pavel Dovgalyuk , Pavel Dovgalyuk Subject: [PATCH 2/3] virtio-net: added replay blocker for guest_announce Date: Fri, 29 Sep 2023 11:51:20 +0300 Message-Id: <20230929085121.848482-3-pavel.dovgalyuk@ispras.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230929085121.848482-1-pavel.dovgalyuk@ispras.ru> References: <20230929085121.848482-1-pavel.dovgalyuk@ispras.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=83.149.199.84; envelope-from=pavel.dovgalyuk@ispras.ru; helo=mail.ispras.ru 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, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Pavel Dovgalyuk This patch blocks record/replay when guest_announce is enabled, because this flag breaks loading the snapshots in deterministic execution mode. Signed-off-by: Pavel Dovgalyuk --- hw/net/virtio-net.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 50156e8002..eb50b7e030 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -3603,6 +3603,10 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp) n->host_features |= (1ULL << VIRTIO_NET_F_MTU); } + if (n->host_features & (1ULL << VIRTIO_NET_F_GUEST_ANNOUNCE)) { + replay_add_blocker("-device virtio-net-device,guest_announce=true"); + } + if (n->net_conf.duplex_str) { if (strncmp(n->net_conf.duplex_str, "half", 5) == 0) { n->net_conf.duplex = DUPLEX_HALF; From patchwork Fri Sep 29 08:51:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 1841179 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=ispras.ru header.i=@ispras.ru header.a=rsa-sha256 header.s=default header.b=qBxehL3/; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RxkgT3ztdz1yp8 for ; Fri, 29 Sep 2023 18:54:45 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9EQ-0006VB-BU; Fri, 29 Sep 2023 04:52:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qm9EI-0006Fv-8e for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:52:10 -0400 Received: from mail.ispras.ru ([83.149.199.84]) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qm9EB-0005oC-8L for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:52:09 -0400 Received: from pasha-ThinkPad-X280.intra.ispras.ru (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id 8DCA74076749; Fri, 29 Sep 2023 08:51:45 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru 8DCA74076749 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1695977505; bh=baCpMjxJgDmEAn3Ne00ctKK+RUYSBlKNzGAMXkeLkGo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qBxehL3/uYlvH03CS4EWyb/nivbsPKOhxao1pm7JaWSl7uFczoxAC2ZzRPjOoQHPO 5HD2QOIt5h8BYtIpdjiKunhqGxkHu+/1W+4aa2KUMeVx7kndVJ5tJRgbXLd/J71rxu Qxqitwrpg484g0gzNvNMpHZ2qP/oxB8wEwJsuDPI= From: pavel.dovgalyuk@ispras.ru To: qemu-devel@nongnu.org Cc: philmd@linaro.org, crosa@redhat.com, wainersm@redhat.com, bleal@redhat.com, alex.bennee@linaro.org, mst@redhat.com, rafael.pizarrosolar@epfl.ch, jasowang@redhat.com, Pavel Dovgalyuk , Pavel Dovgalyuk Subject: [PATCH 3/3] replay: fix for loading non-replay snapshots Date: Fri, 29 Sep 2023 11:51:21 +0300 Message-Id: <20230929085121.848482-4-pavel.dovgalyuk@ispras.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230929085121.848482-1-pavel.dovgalyuk@ispras.ru> References: <20230929085121.848482-1-pavel.dovgalyuk@ispras.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=83.149.199.84; envelope-from=pavel.dovgalyuk@ispras.ru; helo=mail.ispras.ru 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, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Pavel Dovgalyuk Snapshots created in regular icount execution mode can't be loaded in recording mode, because icount value advances only by 32-bit value. This patch initializes replay icount initial value after loading the snapshot. Cc: Pizarro Solar Rafael Ulises Luzius Signed-off-by: Pavel Dovgalyuk --- replay/replay-snapshot.c | 1 + 1 file changed, 1 insertion(+) diff --git a/replay/replay-snapshot.c b/replay/replay-snapshot.c index 10a7cf7992..1e32ada1f6 100644 --- a/replay/replay-snapshot.c +++ b/replay/replay-snapshot.c @@ -75,6 +75,7 @@ void replay_vmstate_init(void) if (replay_snapshot) { if (replay_mode == REPLAY_MODE_RECORD) { + replay_state.current_icount = replay_get_current_icount(); if (!save_snapshot(replay_snapshot, true, NULL, false, NULL, &err)) { error_report_err(err);