ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vhost: Add SVQDescState 

This will allow SVQ to add context to the different queue elements.

This patch only store the actual element, no functional change intended.

Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Eugenio Pérez 2022-07-20 08:59:34 +02:00 committed by Jason Wang
parent 1f46ae65d8
commit 9e87868fca
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/virtio/vhost-shadow-virtqueue.c
View File

@ -256,7 +256,7 @@ static int vhost_svq_add(VhostShadowVirtqueue *svq, const struct iovec *out_sg,
return -EINVAL; return -EINVAL;
} }
svq->ring_id_maps[qemu_head] = elem; svq->desc_state[qemu_head].elem = elem;
vhost_svq_kick(svq); vhost_svq_kick(svq);
return 0; return 0;
} }
@ -411,21 +411,21 @@ static VirtQueueElement *vhost_svq_get_buf(VhostShadowVirtqueue *svq,
return NULL; return NULL;
} }
if (unlikely(!svq->ring_id_maps[used_elem.id])) { if (unlikely(!svq->desc_state[used_elem.id].elem)) {
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
"Device %s says index %u is used, but it was not available", "Device %s says index %u is used, but it was not available",
svq->vdev->name, used_elem.id); svq->vdev->name, used_elem.id);
return NULL; return NULL;
} }
num = svq->ring_id_maps[used_elem.id]->in_num + num = svq->desc_state[used_elem.id].elem->in_num +
svq->ring_id_maps[used_elem.id]->out_num; svq->desc_state[used_elem.id].elem->out_num;
last_used_chain = vhost_svq_last_desc_of_chain(svq, num, used_elem.id); last_used_chain = vhost_svq_last_desc_of_chain(svq, num, used_elem.id);
svq->desc_next[last_used_chain] = svq->free_head; svq->desc_next[last_used_chain] = svq->free_head;
svq->free_head = used_elem.id; svq->free_head = used_elem.id;
*len = used_elem.len; *len = used_elem.len;
return g_steal_pointer(&svq->ring_id_maps[used_elem.id]); return g_steal_pointer(&svq->desc_state[used_elem.id].elem);
} }
static void vhost_svq_flush(VhostShadowVirtqueue *svq, static void vhost_svq_flush(VhostShadowVirtqueue *svq,
@ -595,7 +595,7 @@ void vhost_svq_start(VhostShadowVirtqueue *svq, VirtIODevice *vdev,
memset(svq->vring.desc, 0, driver_size); memset(svq->vring.desc, 0, driver_size);
svq->vring.used = qemu_memalign(qemu_real_host_page_size(), device_size); svq->vring.used = qemu_memalign(qemu_real_host_page_size(), device_size);
memset(svq->vring.used, 0, device_size); memset(svq->vring.used, 0, device_size);
svq->ring_id_maps = g_new0(VirtQueueElement *, svq->vring.num); svq->desc_state = g_new0(SVQDescState, svq->vring.num);
svq->desc_next = g_new0(uint16_t, svq->vring.num); svq->desc_next = g_new0(uint16_t, svq->vring.num);
for (unsigned i = 0; i < svq->vring.num - 1; i++) { for (unsigned i = 0; i < svq->vring.num - 1; i++) {
svq->desc_next[i] = cpu_to_le16(i + 1); svq->desc_next[i] = cpu_to_le16(i + 1);
@ -620,7 +620,7 @@ void vhost_svq_stop(VhostShadowVirtqueue *svq)
for (unsigned i = 0; i < svq->vring.num; ++i) { for (unsigned i = 0; i < svq->vring.num; ++i) {
g_autofree VirtQueueElement *elem = NULL; g_autofree VirtQueueElement *elem = NULL;
elem = g_steal_pointer(&svq->ring_id_maps[i]); elem = g_steal_pointer(&svq->desc_state[i].elem);
if (elem) { if (elem) {
virtqueue_detach_element(svq->vq, elem, 0); virtqueue_detach_element(svq->vq, elem, 0);
} }
@ -632,7 +632,7 @@ void vhost_svq_stop(VhostShadowVirtqueue *svq)
} }
svq->vq = NULL; svq->vq = NULL;
g_free(svq->desc_next); g_free(svq->desc_next);
g_free(svq->ring_id_maps); g_free(svq->desc_state);
qemu_vfree(svq->vring.desc); qemu_vfree(svq->vring.desc);
qemu_vfree(svq->vring.used); qemu_vfree(svq->vring.used);
} }

8
hw/virtio/vhost-shadow-virtqueue.h
View File

@ -15,6 +15,10 @@
#include "standard-headers/linux/vhost_types.h" #include "standard-headers/linux/vhost_types.h"
#include "hw/virtio/vhost-iova-tree.h" #include "hw/virtio/vhost-iova-tree.h"
typedef struct SVQDescState {
VirtQueueElement *elem;
} SVQDescState;
/* Shadow virtqueue to relay notifications */ /* Shadow virtqueue to relay notifications */
typedef struct VhostShadowVirtqueue { typedef struct VhostShadowVirtqueue {
/* Shadow vring */ /* Shadow vring */
@ -47,8 +51,8 @@ typedef struct VhostShadowVirtqueue {
/* IOVA mapping */ /* IOVA mapping */
VhostIOVATree *iova_tree; VhostIOVATree *iova_tree;
/* Map for use the guest's descriptors */ /* SVQ vring descriptors state */
VirtQueueElement **ring_id_maps; SVQDescState *desc_state;
/* Next VirtQueue element that guest made available */ /* Next VirtQueue element that guest made available */
VirtQueueElement *next_guest_avail_elem; VirtQueueElement *next_guest_avail_elem;