qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Nicholas Piggin <npiggin@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Nicholas Piggin" <npiggin@gmail.com>,
	"Pavel Dovgalyuk" <Pavel.Dovgalyuk@ispras.ru>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"John Snow" <jsnow@redhat.com>, "Cleber Rosa" <crosa@redhat.com>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Beraldo Leal" <bleal@redhat.com>,
	"Michael Tokarev" <mjt@tls.msk.ru>
Subject: [PATCH v6 09/10] virtio-net: Use virtual time for RSC timers
Date: Tue, 13 Aug 2024 15:06:36 +1000	[thread overview]
Message-ID: <20240813050638.446172-10-npiggin@gmail.com> (raw)
In-Reply-To: <20240813050638.446172-1-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>
---
 hw/net/virtio-net.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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.45.2



  parent reply	other threads:[~2024-08-13  5:10 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-13  5:06 [PATCH v6 00/10] replay: fixes and new test cases Nicholas Piggin
2024-08-13  5:06 ` [PATCH v6 01/10] scripts/replay-dump.py: Update to current rr record format Nicholas Piggin
2024-08-13  5:06 ` [PATCH v6 02/10] scripts/replay-dump.py: rejig decoders in event number order Nicholas Piggin
2024-08-13  5:06 ` [PATCH v6 03/10] tests/avocado: excercise scripts/replay-dump.py in replay tests Nicholas Piggin
2024-08-13  5:06 ` [PATCH v6 04/10] replay: allow runstate shutdown->running when replaying trace Nicholas Piggin
2024-08-13  5:06 ` [PATCH v6 05/10] Revert "replay: stop us hanging in rr_wait_io_event" Nicholas Piggin
2024-08-13  5:06 ` [PATCH v6 06/10] tests/avocado: replay_kernel.py add x86-64 q35 machine test Nicholas Piggin
2024-08-13  5:06 ` [PATCH v6 07/10] chardev: set record/replay on the base device of a muxed device Nicholas Piggin
2024-08-13  5:06 ` [PATCH v6 08/10] virtio-net: Use replay_schedule_bh_event for bhs that affect machine state Nicholas Piggin
2024-08-13  5:06 ` Nicholas Piggin [this message]
2024-08-13  5:06 ` [PATCH v6 10/10] savevm: Fix load_snapshot error path crash Nicholas Piggin
2024-08-13 14:12 ` [PATCH v6 00/10] replay: fixes and new test cases 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=20240813050638.446172-10-npiggin@gmail.com \
    --to=npiggin@gmail.com \
    --cc=Pavel.Dovgalyuk@ispras.ru \
    --cc=alex.bennee@linaro.org \
    --cc=bleal@redhat.com \
    --cc=crosa@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=mjt@tls.msk.ru \
    --cc=pbonzini@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=wainersm@redhat.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 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).