[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/21] virtio-net: Use virtual time for RSC timers
|
From: |
Alex Bennée |
|
Subject: |
[PULL 17/21] virtio-net: Use virtual time for RSC timers |
|
Date: |
Thu, 15 Aug 2024 15:49:07 +0100 |
From: Nicholas Piggin <npiggin@gmail.com>
Receive coalescing is visible to the target machine, so its timers
should use virtual time like other timers in virtio-net, to be
compatible with record-replay.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Message-Id: <20240813050638.446172-10-npiggin@gmail.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20240813202329.1237572-18-alex.bennee@linaro.org>
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 10ebaae5e2..ed33a32877 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -2124,7 +2124,7 @@ static void virtio_net_rsc_purge(void *opq)
chain->stat.timer++;
if (!QTAILQ_EMPTY(&chain->buffers)) {
timer_mod(chain->drain_timer,
- qemu_clock_get_ns(QEMU_CLOCK_HOST) + chain->n->rsc_timeout);
+ qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + chain->n->rsc_timeout);
}
}
@@ -2360,7 +2360,7 @@ static size_t
virtio_net_rsc_do_coalesce(VirtioNetRscChain *chain,
chain->stat.empty_cache++;
virtio_net_rsc_cache_buf(chain, nc, buf, size);
timer_mod(chain->drain_timer,
- qemu_clock_get_ns(QEMU_CLOCK_HOST) + chain->n->rsc_timeout);
+ qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + chain->n->rsc_timeout);
return size;
}
@@ -2598,7 +2598,7 @@ static VirtioNetRscChain
*virtio_net_rsc_lookup_chain(VirtIONet *n,
chain->max_payload = VIRTIO_NET_MAX_IP6_PAYLOAD;
chain->gso_type = VIRTIO_NET_HDR_GSO_TCPV6;
}
- chain->drain_timer = timer_new_ns(QEMU_CLOCK_HOST,
+ chain->drain_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL,
virtio_net_rsc_purge, chain);
memset(&chain->stat, 0, sizeof(chain->stat));
--
2.39.2
- [PULL 15/21] chardev: set record/replay on the base device of a muxed device, (continued)
- [PULL 15/21] chardev: set record/replay on the base device of a muxed device, Alex Bennée, 2024/08/15
- [PULL 09/21] scripts/replay-dump.py: Update to current rr record format, Alex Bennée, 2024/08/15
- [PULL 16/21] virtio-net: Use replay_schedule_bh_event for bhs that affect machine state, Alex Bennée, 2024/08/15
- [PULL 19/21] docs: Fix some typos (found by typos) and grammar issues, Alex Bennée, 2024/08/15
- [PULL 10/21] scripts/replay-dump.py: rejig decoders in event number order, Alex Bennée, 2024/08/15
- [PULL 12/21] replay: allow runstate shutdown->running when replaying trace, Alex Bennée, 2024/08/15
- [PULL 13/21] Revert "replay: stop us hanging in rr_wait_io_event", Alex Bennée, 2024/08/15
- [PULL 11/21] tests/avocado: excercise scripts/replay-dump.py in replay tests, Alex Bennée, 2024/08/15
- [PULL 08/21] buildsys: Fix building without plugins on Darwin, Alex Bennée, 2024/08/15
- [PULL 18/21] savevm: Fix load_snapshot error path crash, Alex Bennée, 2024/08/15
- [PULL 17/21] virtio-net: Use virtual time for RSC timers,
Alex Bennée <=
- [PULL 20/21] docs/devel: update tcg-plugins page, Alex Bennée, 2024/08/15
- Re: [PULL for 9.1 00/21] Some fixes for 9.1-rc3 (build, replay, docs, plugins), Richard Henderson, 2024/08/15