59 lines
2.2 KiB
Diff
59 lines
2.2 KiB
Diff
|
From 8f6c35e3acb54208564fcb773cf79809d7412cf5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: qihao <qihao_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Tue, 20 Aug 2024 09:48:42 +0800
|
||
|
|
Subject: [PATCH] virtio-net: Use virtual time for RSC timers
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
cheery-pick from 44bc14fa1e78f01bfddcb265fc41c29204ebbfd8
|
||
|
|
|
||
|
|
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>
|
||
|
|
Signed-off-by: qihao_yewu <qihao_yewu@cmss.chinamobile.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 c0a54f2d61..91c1504544 100644
|
||
|
|
--- a/hw/net/virtio-net.c
|
||
|
|
+++ b/hw/net/virtio-net.c
|
||
|
|
@@ -2141,7 +2141,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);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -2377,7 +2377,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;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -2615,7 +2615,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.41.0.windows.1
|
||
|
|
|