OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vhost: stop transfer elem ownership in vhost_handle_guest_kick 

It was easier to allow vhost_svq_add to handle the memory. Now that we
will allow qemu to add elements to a SVQ without the guest's knowledge,
it's better to handle it in the caller.

Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Eugenio Pérez 2022-08-23 20:30:26 +02:00 committed by Jason Wang
parent 8b6d6119ad
commit 9c2ab2f1ec
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -233,9 +233,6 @@ static void vhost_svq_kick(VhostShadowVirtqueue *svq)
/** /**
* Add an element to a SVQ. * Add an element to a SVQ.
* *
* The caller must check that there is enough slots for the new element. It
* takes ownership of the element: In case of failure not ENOSPC, it is free.
*
* Return -EINVAL if element is invalid, -ENOSPC if dev queue is full * Return -EINVAL if element is invalid, -ENOSPC if dev queue is full
*/ */
int vhost_svq_add(VhostShadowVirtqueue *svq, const struct iovec *out_sg, int vhost_svq_add(VhostShadowVirtqueue *svq, const struct iovec *out_sg,
@ -252,7 +249,6 @@ int vhost_svq_add(VhostShadowVirtqueue *svq, const struct iovec *out_sg,
ok = vhost_svq_add_split(svq, out_sg, out_num, in_sg, in_num, &qemu_head); ok = vhost_svq_add_split(svq, out_sg, out_num, in_sg, in_num, &qemu_head);
if (unlikely(!ok)) { if (unlikely(!ok)) {
g_free(elem);
return -EINVAL; return -EINVAL;
} }
@ -293,7 +289,7 @@ static void vhost_handle_guest_kick(VhostShadowVirtqueue *svq)
virtio_queue_set_notification(svq->vq, false); virtio_queue_set_notification(svq->vq, false);
while (true) { while (true) {
VirtQueueElement *elem; g_autofree VirtQueueElement *elem;
int r; int r;
if (svq->next_guest_avail_elem) { if (svq->next_guest_avail_elem) {
@ -324,12 +320,14 @@ static void vhost_handle_guest_kick(VhostShadowVirtqueue *svq)
* queue the current guest descriptor and ignore kicks * queue the current guest descriptor and ignore kicks
* until some elements are used. * until some elements are used.
*/ */
svq->next_guest_avail_elem = elem; svq->next_guest_avail_elem = g_steal_pointer(&elem);
} }
/* VQ is full or broken, just return and ignore kicks */ /* VQ is full or broken, just return and ignore kicks */
return; return;
} }
/* elem belongs to SVQ or external caller now */
elem = NULL;
} }
virtio_queue_set_notification(svq->vq, true); virtio_queue_set_notification(svq->vq, true);