[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 01/12] vhost: stop transfer elem ownership in vhost_handle_gue
From: |
Eugenio Pérez |
Subject: |
[PATCH v6 01/12] vhost: stop transfer elem ownership in vhost_handle_guest_kick |
Date: |
Thu, 4 Aug 2022 20:17:11 +0200 |
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>
---
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 e4956728dd..ffd2b2c972 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
- [PATCH v6 00/12] NIC vhost-vdpa state restore via Shadow CVQ, Eugenio Pérez, 2022/08/04
- [PATCH v6 06/12] vhost_net: Add NetClientInfo stop callback, Eugenio Pérez, 2022/08/04
- [PATCH v6 08/12] vdpa: Move command buffers map to start of net device, Eugenio Pérez, 2022/08/04
- [PATCH v6 07/12] vdpa: add net_vhost_vdpa_cvq_info NetClientInfo, Eugenio Pérez, 2022/08/04
- [PATCH v6 02/12] vhost: use SVQ element ndescs instead of opaque data for desc validation, Eugenio Pérez, 2022/08/04
- [PATCH v6 11/12] vdpa: Add virtio-net mac address via CVQ at start, Eugenio Pérez, 2022/08/04
- [PATCH v6 01/12] vhost: stop transfer elem ownership in vhost_handle_guest_kick,
Eugenio Pérez <=
- [PATCH v6 03/12] vhost: Delete useless read memory barrier, Eugenio Pérez, 2022/08/04
- [PATCH v6 05/12] vhost_net: Add NetClientInfo prepare callback, Eugenio Pérez, 2022/08/04
- [PATCH v6 04/12] vhost: Do not depend on !NULL VirtQueueElement on vhost_svq_flush, Eugenio Pérez, 2022/08/04
- [PATCH v6 12/12] vdpa: Delete CVQ migration blocker, Eugenio Pérez, 2022/08/04
- [PATCH v6 10/12] vhost_net: add NetClientState->load() callback, Eugenio Pérez, 2022/08/04
- [PATCH v6 09/12] vdpa: Extract vhost_vdpa_net_cvq_add from vhost_vdpa_net_handle_ctrl_avail, Eugenio Pérez, 2022/08/04