From: "Michael S. Tsirkin" <mst@redhat.com>
To: "Alex Bennée" <alex.bennee@linaro.org>
Cc: qemu-devel@nongnu.org,
"Alistair Francis" <alistair.francis@wdc.com>,
"Michael Roth" <michael.roth@amd.com>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Mahmoud Mandour" <ma.mandourr@gmail.com>,
"Pavel Dovgalyuk" <pavel.dovgaluk@ispras.ru>,
"Yoshinori Sato" <ysato@users.sourceforge.jp>,
"Weiwei Li" <liwei1518@gmail.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"David Hildenbrand" <david@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>,
"Liu Zhiwei" <zhiwei_liu@linux.alibaba.com>,
"Eric Auger" <eric.auger@redhat.com>,
"Song Gao" <gaosong@loongson.cn>,
qemu-arm@nongnu.org, "Peter Xu" <peterx@redhat.com>,
"Jiri Pirko" <jiri@resnulli.us>, "Eric Blake" <eblake@redhat.com>,
"Fabiano Rosas" <farosas@suse.de>,
qemu-s390x@nongnu.org, "Peter Maydell" <peter.maydell@linaro.org>,
"Daniel Henrique Barboza" <dbarboza@ventanamicro.com>,
"John Snow" <jsnow@redhat.com>,
"Alexandre Iooss" <erdnaxe@crans.org>,
"Konstantin Kostiuk" <kkostiuk@redhat.com>,
"Pierrick Bouvier" <pierrick.bouvier@linaro.org>,
"Cleber Rosa" <crosa@redhat.com>,
"Ilya Leoshkevich" <iii@linux.ibm.com>,
qemu-riscv@nongnu.org, "Thomas Huth" <thuth@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Jason Wang" <jasowang@redhat.com>,
"Bin Meng" <bmeng.cn@gmail.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Nicholas Piggin" <npiggin@gmail.com>,
"Pavel Dovgalyuk" <Pavel.Dovgalyuk@ispras.ru>
Subject: Re: [PATCH v2 16/21] virtio-net: Use replay_schedule_bh_event for bhs that affect machine state
Date: Tue, 13 Aug 2024 16:48:34 -0400 [thread overview]
Message-ID: <20240813164631-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20240813202329.1237572-17-alex.bennee@linaro.org>
On Tue, Aug 13, 2024 at 09:23:24PM +0100, Alex Bennée wrote:
> From: Nicholas Piggin <npiggin@gmail.com>
>
> The regular qemu_bh_schedule() calls result in non-deterministic
> execution of the bh in record-replay mode, which causes replay failure.
>
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> Reviewed-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
> Message-Id: <20240813050638.446172-9-npiggin@gmail.com>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> hw/net/virtio-net.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
> index 08aa0b65e3..10ebaae5e2 100644
> --- a/hw/net/virtio-net.c
> +++ b/hw/net/virtio-net.c
> @@ -40,6 +40,7 @@
> #include "migration/misc.h"
> #include "standard-headers/linux/ethtool.h"
> #include "sysemu/sysemu.h"
> +#include "sysemu/replay.h"
> #include "trace.h"
> #include "monitor/qdev.h"
> #include "monitor/monitor.h"
> @@ -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) {
> @@ -2672,7 +2673,7 @@ static void virtio_net_tx_complete(NetClientState *nc, ssize_t len)
> */
> virtio_queue_set_notification(q->tx_vq, 0);
> if (q->tx_bh) {
> - qemu_bh_schedule(q->tx_bh);
> + replay_bh_schedule_event(q->tx_bh);
> } else {
> timer_mod(q->tx_timer,
> qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + n->tx_timeout);
> @@ -2838,7 +2839,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)
> @@ -2921,7 +2922,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;
> }
> @@ -2935,7 +2936,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;
> }
> }
> --
> 2.39.2
Is this really the only way to fix this? I do not think
virtio has any business knowing about replay.
What does this API do, even? BH but not broken with replay?
Do we ever want replay broken? Why not fix qemu_bh_schedule?
And when we add another feature which we do not want to break
will we do foo_bar_replay_bh_schedule_event or what?
--
MST
next prev parent reply other threads:[~2024-08-13 20:49 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-13 20:23 [PATCH v2 00/21] Various fixes and tweaks for 9.1-rc2/3 Alex Bennée
2024-08-13 20:23 ` [PATCH v2 01/21] tests/avocado: Re-enable gdbsim-r5f562n8 testing U-Boot Alex Bennée
2024-08-13 20:23 ` [PATCH v2 02/21] Makefile: trigger re-configure on updated pythondeps Alex Bennée
2024-08-13 20:23 ` [PATCH v2 03/21] configure: Fix arch detection for GDB_HAS_MTE Alex Bennée
2024-08-13 20:23 ` [PATCH v2 04/21] configure: Avoid use of param. expansion when using gdb_version Alex Bennée
2024-08-13 20:23 ` [PATCH v2 05/21] configure: Fix GDB version detection for GDB_HAS_MTE Alex Bennée
2024-08-13 20:23 ` [PATCH v2 06/21] scripts/checkpatch: more checks on files imported from Linux Alex Bennée
2024-08-13 20:23 ` [PATCH v2 07/21] target/i386: allow access_ptr to force slow path on failed probe Alex Bennée
2024-08-14 1:55 ` Richard Henderson
2024-08-13 20:23 ` [PATCH v2 08/21] buildsys: Fix building without plugins on Darwin Alex Bennée
2024-08-14 8:29 ` Philippe Mathieu-Daudé
2024-08-13 20:23 ` [PATCH v2 09/21] scripts/replay-dump.py: Update to current rr record format Alex Bennée
2024-08-13 20:23 ` [PATCH v2 10/21] scripts/replay-dump.py: rejig decoders in event number order Alex Bennée
2024-08-13 20:23 ` [PATCH v2 11/21] tests/avocado: excercise scripts/replay-dump.py in replay tests Alex Bennée
2024-08-13 20:23 ` [PATCH v2 12/21] replay: allow runstate shutdown->running when replaying trace Alex Bennée
2024-08-13 20:23 ` [PATCH v2 13/21] Revert "replay: stop us hanging in rr_wait_io_event" Alex Bennée
2024-08-13 20:23 ` [PATCH v2 14/21] tests/avocado: replay_kernel.py add x86-64 q35 machine test Alex Bennée
2024-08-13 20:23 ` [PATCH v2 15/21] chardev: set record/replay on the base device of a muxed device Alex Bennée
2024-08-13 20:23 ` [PATCH v2 16/21] virtio-net: Use replay_schedule_bh_event for bhs that affect machine state Alex Bennée
2024-08-13 20:48 ` Michael S. Tsirkin [this message]
2024-08-14 6:05 ` Nicholas Piggin
2024-08-14 7:06 ` Michael S. Tsirkin
2024-08-14 17:25 ` Alex Bennée
2024-08-15 7:12 ` Nicholas Piggin
2024-08-15 14:28 ` Michael S. Tsirkin
2024-08-16 2:26 ` Nicholas Piggin
2024-08-16 2:31 ` Jason Wang
2024-08-16 12:58 ` Alex Bennée
2024-08-13 20:23 ` [PATCH v2 17/21] virtio-net: Use virtual time for RSC timers Alex Bennée
2024-08-13 20:49 ` Michael S. Tsirkin
2024-08-13 20:23 ` [PATCH v2 18/21] savevm: Fix load_snapshot error path crash Alex Bennée
2024-08-13 20:23 ` [PATCH v2 19/21] docs: Fix some typos (found by typos) and grammar issues Alex Bennée
2024-08-13 20:23 ` [PATCH v2 20/21] docs/devel: update tcg-plugins page Alex Bennée
2024-08-13 20:23 ` [PATCH v2 21/21] plugins: fix race condition with scoreboards Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240813164631-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=Pavel.Dovgalyuk@ispras.ru \
--cc=alex.bennee@linaro.org \
--cc=alistair.francis@wdc.com \
--cc=armbru@redhat.com \
--cc=bleal@redhat.com \
--cc=bmeng.cn@gmail.com \
--cc=crosa@redhat.com \
--cc=david@redhat.com \
--cc=dbarboza@ventanamicro.com \
--cc=eblake@redhat.com \
--cc=eduardo@habkost.net \
--cc=erdnaxe@crans.org \
--cc=eric.auger@redhat.com \
--cc=farosas@suse.de \
--cc=gaosong@loongson.cn \
--cc=iii@linux.ibm.com \
--cc=jasowang@redhat.com \
--cc=jiri@resnulli.us \
--cc=jsnow@redhat.com \
--cc=kkostiuk@redhat.com \
--cc=liwei1518@gmail.com \
--cc=ma.mandourr@gmail.com \
--cc=marcandre.lureau@redhat.com \
--cc=michael.roth@amd.com \
--cc=npiggin@gmail.com \
--cc=palmer@dabbelt.com \
--cc=pavel.dovgaluk@ispras.ru \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=philmd@linaro.org \
--cc=pierrick.bouvier@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
--cc=ysato@users.sourceforge.jp \
--cc=zhiwei_liu@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.