From patchwork Fri Aug 11 07:06:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 1820166 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) 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=p6+W2APq; dkim-atps=neutral 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 4RMZf41h8sz1yfH for ; Fri, 11 Aug 2023 17:08:59 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUMFV-00048H-Ui; Fri, 11 Aug 2023 03:07:53 -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 1qUMFP-00047E-PV for qemu-devel@nongnu.org; Fri, 11 Aug 2023 03:07:47 -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 1qUMFL-0008Hm-2s for qemu-devel@nongnu.org; Fri, 11 Aug 2023 03:07:47 -0400 Received: from pasha-ThinkPad-X280.lan02.inno (unknown [188.162.65.26]) by mail.ispras.ru (Postfix) with ESMTPSA id DCE34406BB55; Fri, 11 Aug 2023 07:07:35 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru DCE34406BB55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1691737657; bh=dgIZp3cwFpi0PXZyu8OYHo4xa8pRq0vWZpPkkY0Qxvw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p6+W2APqVrGe2/M0I3GEoXOlQ5qRLy+N7T1QJuxY/UuasNBX8BXWkUF1fOPuAYVDk UEYmg4sSRtyC0ZaIZf0b/ZLVJ/0s6wt1em/W0/mQCBkw+KBIAXq7lU26RO5ZtvRnoB 6cLdKDvId+xg4plnnumZxnE6dd2jatjDuTnH55kI= 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, Pavel Dovgalyuk , Pavel Dovgalyuk Subject: [PATCH 1/3] replay: improve determinism of virtio-net Date: Fri, 11 Aug 2023 10:06:06 +0300 Message-Id: <20230811070608.3383343-2-pavel.dovgalyuk@ispras.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230811070608.3383343-1-pavel.dovgalyuk@ispras.ru> References: <20230811070608.3383343-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 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 7102ec4817..43fd34b0c8 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) { @@ -2799,7 +2800,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) @@ -2882,7 +2883,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; } @@ -2896,7 +2897,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 Aug 11 07:06:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 1820167 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) 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=JalHaRoj; dkim-atps=neutral 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 4RMZf41kDkz1yfs for ; Fri, 11 Aug 2023 17:08:59 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUMFV-00047r-37; Fri, 11 Aug 2023 03:07:53 -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 1qUMFP-00047D-Ox for qemu-devel@nongnu.org; Fri, 11 Aug 2023 03:07:47 -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 1qUMFL-0008IA-23 for qemu-devel@nongnu.org; Fri, 11 Aug 2023 03:07:47 -0400 Received: from pasha-ThinkPad-X280.lan02.inno (unknown [188.162.65.26]) by mail.ispras.ru (Postfix) with ESMTPSA id ABCE640737DA; Fri, 11 Aug 2023 07:07:37 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru ABCE640737DA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1691737659; bh=gbr4lRMthPPnNcEtmOCIUh/yxWtv9rNnzHNZTLTjvds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JalHaRojq1rA4qOnN6K7rZNLAGKDn9f0H1DgAd8ILrG9oTUfMFTh37GiyWNSM9RJM nHe+FAGNYDq8wJKvSzwh9md/NNu1jU8Ch6a0cIeGXfp6XHjd353Df2vFjaurUTKvAR hd3s/l/37wkH6r1acce3UIYzkkZl+lcS/bzJ3mlc= 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, Pavel Dovgalyuk , Pavel Dovgalyuk Subject: [PATCH 2/3] virtio-net: added replay blocker for guest_announce Date: Fri, 11 Aug 2023 10:06:07 +0300 Message-Id: <20230811070608.3383343-3-pavel.dovgalyuk@ispras.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230811070608.3383343-1-pavel.dovgalyuk@ispras.ru> References: <20230811070608.3383343-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 43fd34b0c8..2b6c246efb 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -3580,6 +3580,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 Aug 11 07:06:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 1820168 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) 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=dyc829Ta; dkim-atps=neutral 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 4RMZf427HBz20GC for ; Fri, 11 Aug 2023 17:08:59 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUMFV-00048F-Af; Fri, 11 Aug 2023 03:07:53 -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 1qUMFR-00047h-M3 for qemu-devel@nongnu.org; Fri, 11 Aug 2023 03:07:50 -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 1qUMFM-0008IK-Ua for qemu-devel@nongnu.org; Fri, 11 Aug 2023 03:07:49 -0400 Received: from pasha-ThinkPad-X280.lan02.inno (unknown [188.162.65.26]) by mail.ispras.ru (Postfix) with ESMTPSA id 69EB9407626B; Fri, 11 Aug 2023 07:07:39 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru 69EB9407626B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1691737660; bh=HV+HS4QRZW3hne/qyQQW82szrTm0JKnDcIIOdOfyylA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dyc829Tax84GpIMn+CxR35NLc1n1KClwlNZbuBYJngl1UidMrNbWdsRZ3HJgOMBxW vdWjHD6MDwcvvcwjdHEcH1ohOu8BNdb3qS32PmMordii9qPaQoB5FoqBTNVV08MGXC jYgZ/R0tuYxT3cKspn4XhIRWBY4SqQghpzGkmr0Q= 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, Pavel Dovgalyuk , Pavel Dovgalyuk , John Snow Subject: [PATCH 3/3] tests/avocado: fix waiting for vm shutdown in replay_linux Date: Fri, 11 Aug 2023 10:06:08 +0300 Message-Id: <20230811070608.3383343-4-pavel.dovgalyuk@ispras.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230811070608.3383343-1-pavel.dovgalyuk@ispras.ru> References: <20230811070608.3383343-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 fixes the race condition in waiting for shutdown of the replay linux test. Signed-off-by: Pavel Dovgalyuk Suggested-by: John Snow --- tests/avocado/replay_linux.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/avocado/replay_linux.py b/tests/avocado/replay_linux.py index a76dd507fc..270ccc1eae 100644 --- a/tests/avocado/replay_linux.py +++ b/tests/avocado/replay_linux.py @@ -93,7 +93,7 @@ def launch_and_wait(self, record, args, shift): % os.path.getsize(replay_path)) else: vm.event_wait('SHUTDOWN', self.timeout) - vm.shutdown(True) + vm.wait() logger.info('successfully fihished the replay') elapsed = time.time() - start_time logger.info('elapsed time %.2f sec' % elapsed)