From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Nicholas Piggin" <npiggin@gmail.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Jason Wang" <jasowang@redhat.com>
Subject: [PULL 17/21] virtio-net: Use virtual time for RSC timers
Date: Thu, 15 Aug 2024 15:49:07 +0100 [thread overview]
Message-ID: <20240815144911.1931487-18-alex.bennee@linaro.org> (raw)
In-Reply-To: <20240815144911.1931487-1-alex.bennee@linaro.org>
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
next prev parent reply other threads:[~2024-08-15 14:56 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-15 14:48 [PULL for 9.1 00/21] Some fixes for 9.1-rc3 (build, replay, docs, plugins) Alex Bennée
2024-08-15 14:48 ` [PULL 01/21] tests/avocado: Re-enable gdbsim-r5f562n8 testing U-Boot Alex Bennée
2024-08-15 14:48 ` [PULL 02/21] Makefile: trigger re-configure on updated pythondeps Alex Bennée
2024-08-15 14:48 ` [PULL 03/21] configure: Fix arch detection for GDB_HAS_MTE Alex Bennée
2024-08-15 14:48 ` [PULL 04/21] configure: Avoid use of param. expansion when using gdb_version Alex Bennée
2024-08-15 14:48 ` [PULL 05/21] configure: Fix GDB version detection for GDB_HAS_MTE Alex Bennée
2024-08-15 14:48 ` [PULL 06/21] scripts/checkpatch: more checks on files imported from Linux Alex Bennée
2024-08-15 14:48 ` [PULL 07/21] target/i386: allow access_ptr to force slow path on failed probe Alex Bennée
2024-08-15 14:48 ` [PULL 08/21] buildsys: Fix building without plugins on Darwin Alex Bennée
2024-08-15 14:48 ` [PULL 09/21] scripts/replay-dump.py: Update to current rr record format Alex Bennée
2024-08-15 14:49 ` [PULL 10/21] scripts/replay-dump.py: rejig decoders in event number order Alex Bennée
2024-08-15 14:49 ` [PULL 11/21] tests/avocado: excercise scripts/replay-dump.py in replay tests Alex Bennée
2024-08-15 14:49 ` [PULL 12/21] replay: allow runstate shutdown->running when replaying trace Alex Bennée
2024-08-15 14:49 ` [PULL 13/21] Revert "replay: stop us hanging in rr_wait_io_event" Alex Bennée
2024-08-15 14:49 ` [PULL 14/21] tests/avocado: replay_kernel.py add x86-64 q35 machine test Alex Bennée
2024-08-15 14:49 ` [PULL 15/21] chardev: set record/replay on the base device of a muxed device Alex Bennée
2024-08-19 11:46 ` Peter Maydell
2024-08-15 14:49 ` [PULL 16/21] virtio-net: Use replay_schedule_bh_event for bhs that affect machine state Alex Bennée
2024-08-15 14:49 ` Alex Bennée [this message]
2024-08-15 14:49 ` [PULL 18/21] savevm: Fix load_snapshot error path crash Alex Bennée
2024-08-15 14:49 ` [PULL 19/21] docs: Fix some typos (found by typos) and grammar issues Alex Bennée
2024-08-15 14:49 ` [PULL 20/21] docs/devel: update tcg-plugins page Alex Bennée
2024-08-15 14:49 ` [PULL 21/21] plugins: fix race condition with scoreboards Alex Bennée
2024-08-15 22:28 ` [PULL for 9.1 00/21] Some fixes for 9.1-rc3 (build, replay, docs, plugins) Richard Henderson
2024-08-16 12:54 ` Alex Bennée
2024-08-16 13:05 ` Thomas Huth
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=20240815144911.1931487-18-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=jasowang@redhat.com \
--cc=mst@redhat.com \
--cc=npiggin@gmail.com \
--cc=qemu-devel@nongnu.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).