[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 05/12] vhost: stop transfer elem ownership in vhost_handle_gu
From: |
Eugenio Pérez |
Subject: |
[RFC PATCH 05/12] vhost: stop transfer elem ownership in vhost_handle_guest_kick |
Date: |
Sat, 16 Jul 2022 13:34:00 +0200 |
It was easier to allow vhost_svq_add to handle the memory. Now that we
will move SVQDesc to an opaque context, it's better to handle it in the
caller.
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
hw/virtio/vhost-shadow-virtqueue.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/virtio/vhost-shadow-virtqueue.c
b/hw/virtio/vhost-shadow-virtqueue.c
index a21b0b1bf6..29633b7a29 100644
--- a/hw/virtio/vhost-shadow-virtqueue.c
+++ b/hw/virtio/vhost-shadow-virtqueue.c
@@ -233,9 +233,6 @@ static void vhost_svq_kick(VhostShadowVirtqueue *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
*/
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);
if (unlikely(!ok)) {
- g_free(elem);
return -EINVAL;
}
@@ -293,7 +289,7 @@ static void vhost_handle_guest_kick(VhostShadowVirtqueue
*svq)
virtio_queue_set_notification(svq->vq, false);
while (true) {
- VirtQueueElement *elem;
+ g_autofree VirtQueueElement *elem;
int r;
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
* 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 */
return;
}
+ /* elem belongs to SVQ or external caller now */
+ elem = NULL;
}
virtio_queue_set_notification(svq->vq, true);
--
2.31.1
- [RFC PATCH 02/12] vhost: Move SVQ queue rewind to the destination, (continued)
- [RFC PATCH 02/12] vhost: Move SVQ queue rewind to the destination, Eugenio Pérez, 2022/07/16
- [RFC PATCH 03/12] vdpa: Small rename of error labels, Eugenio Pérez, 2022/07/16
- [RFC PATCH 04/12] vdpa: delay set_vring_ready after DRIVER_OK, Eugenio Pérez, 2022/07/16
- [RFC PATCH 06/12] vhost: Use opaque data in SVQDescState, Eugenio Pérez, 2022/07/16
- [RFC PATCH 05/12] vhost: stop transfer elem ownership in vhost_handle_guest_kick,
Eugenio Pérez <=
- [RFC PATCH 07/12] vhost: Add VhostVDPAStartOp operation, Eugenio Pérez, 2022/07/16
- [RFC PATCH 08/12] vdpa: Add vhost_vdpa_start_control_svq, Eugenio Pérez, 2022/07/16
- [RFC PATCH 09/12] vdpa: Extract vhost_vdpa_net_svq_add from vhost_vdpa_net_handle_ctrl_avail, Eugenio Pérez, 2022/07/16
- [RFC PATCH 10/12] vdpa: Make vhost_vdpa_net_cvq_map_elem accept any out sg, Eugenio Pérez, 2022/07/16
- [RFC PATCH 11/12] vdpa: Add virtio-net mac address via CVQ at start, Eugenio Pérez, 2022/07/16