[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 12/15] virtio: add vhost-net migration for packed
From: |
wexu |
Subject: |
[Qemu-devel] [PATCH v2 12/15] virtio: add vhost-net migration for packed ring |
Date: |
Wed, 16 Jan 2019 13:31:17 -0500 |
From: Wei Xu <address@hidden>
Signed-off-by: Wei Xu <address@hidden>
---
hw/virtio/virtio.c | 27 ++++++++++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 722a4fd..0cb912e 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -2991,17 +2991,34 @@ hwaddr virtio_queue_get_used_size(VirtIODevice *vdev,
int n)
uint16_t virtio_queue_get_last_avail_idx(VirtIODevice *vdev, int n)
{
- return vdev->vq[n].last_avail_idx;
+ uint16_t idx;
+
+ if (virtio_vdev_has_feature(vdev, VIRTIO_F_RING_PACKED)) {
+ idx = vdev->vq[n].last_avail_idx;
+ idx |= ((int)vdev->vq[n].avail_wrap_counter) << 15;
+ } else {
+ idx = (int)vdev->vq[n].last_avail_idx;
+ }
+ return idx;
}
void virtio_queue_set_last_avail_idx(VirtIODevice *vdev, int n, uint16_t idx)
{
- vdev->vq[n].last_avail_idx = idx;
- vdev->vq[n].shadow_avail_idx = idx;
+ if (virtio_vdev_has_feature(vdev, VIRTIO_F_RING_PACKED)) {
+ vdev->vq[n].last_avail_idx = idx & 0x7fff;
+ vdev->vq[n].avail_wrap_counter = !!(idx & 0x8000);
+ } else {
+ vdev->vq[n].last_avail_idx = idx;
+ vdev->vq[n].shadow_avail_idx = idx;
+ }
}
void virtio_queue_restore_last_avail_idx(VirtIODevice *vdev, int n)
{
+ if (virtio_vdev_has_feature(vdev, VIRTIO_F_RING_PACKED)) {
+ return;
+ }
+
rcu_read_lock();
if (vdev->vq[n].vring.desc) {
vdev->vq[n].last_avail_idx = vring_used_idx(&vdev->vq[n]);
@@ -3012,6 +3029,10 @@ void virtio_queue_restore_last_avail_idx(VirtIODevice
*vdev, int n)
void virtio_queue_update_used_idx(VirtIODevice *vdev, int n)
{
+ if (virtio_vdev_has_feature(vdev, VIRTIO_F_RING_PACKED)) {
+ return;
+ }
+
rcu_read_lock();
if (vdev->vq[n].vring.desc) {
vdev->vq[n].used_idx = vring_used_idx(&vdev->vq[n]);
--
1.8.3.1
- [Qemu-devel] [PATCH v2 00/15] packed ring virtio-net backends support, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 01/15] virtio: introduce packed ring definitions, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 02/15] virtio: redefine structure & memory cache for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 03/15] virtio: expand offset calculation for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 05/15] virtio: init wrap counter for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 04/15] virtio: add memory region init for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 06/15] virtio: init and desc empty check for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 08/15] virtio: fill/flush/pop for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 10/15] virtio-net: fill head desc after done all in a chain, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 12/15] virtio: add vhost-net migration for packed ring,
wexu <=
- [Qemu-devel] [PATCH v2 07/15] virtio: get avail bytes check for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 13/15] virtio: packed ring feature bit for userspace backend, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 09/15] virtio: event suppression support for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 11/15] virtio: add userspace migration for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 14/15] vhost: enable packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 15/15] virtio: enable packed ring via a new command line, wexu, 2019/01/16