SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

virtio-net: Use replay_schedule_bh_event for bhs that affect machine state

Browse Source 
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>
Message-Id: <20240813202329.1237572-17-alex.bennee@linaro.org>
This commit is contained in:
Nicholas Piggin 2024-08-13 21:23:24 +01:00 committed by Alex Bennée
parent 4c193bb129
commit a0bf401b8e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/net/virtio-net.c
View File

@ -40,6 +40,7 @@
#include "migration/misc.h" #include "migration/misc.h"
#include "standard-headers/linux/ethtool.h" #include "standard-headers/linux/ethtool.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "sysemu/replay.h"
#include "trace.h" #include "trace.h"
#include "monitor/qdev.h" #include "monitor/qdev.h"
#include "monitor/monitor.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, timer_mod(q->tx_timer,
qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + n->tx_timeout); qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + n->tx_timeout);
} else { } else {
qemu_bh_schedule(q->tx_bh); replay_bh_schedule_event(q->tx_bh);
} }
} else { } else {
if (q->tx_timer) { 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); virtio_queue_set_notification(q->tx_vq, 0);
if (q->tx_bh) { if (q->tx_bh) {
qemu_bh_schedule(q->tx_bh); replay_bh_schedule_event(q->tx_bh);
} else { } else {
timer_mod(q->tx_timer, timer_mod(q->tx_timer,
qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + n->tx_timeout); 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; return;
} }
virtio_queue_set_notification(vq, 0); 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) 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 /* If we flush a full burst of packets, assume there are
* more coming and immediately reschedule */ * more coming and immediately reschedule */
if (ret >= n->tx_burst) { if (ret >= n->tx_burst) {
qemu_bh_schedule(q->tx_bh); replay_bh_schedule_event(q->tx_bh);
q->tx_waiting = 1; q->tx_waiting = 1;
return; return;
} }
@ -2935,7 +2936,7 @@ static void virtio_net_tx_bh(void *opaque)
return; return;
} else if (ret > 0) { } else if (ret > 0) {
virtio_queue_set_notification(q->tx_vq, 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; q->tx_waiting = 1;
} }
} }