[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/21] vhost: stop transfer elem ownership in vhost_handle_guest_k
From: |
Jason Wang |
Subject: |
[PULL 08/21] vhost: stop transfer elem ownership in vhost_handle_guest_kick |
Date: |
Fri, 2 Sep 2022 14:41:25 +0800 |
From: Eugenio Pérez <eperezma@redhat.com>
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>
---
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 82a784d..a1261d4 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.7.4
- [PULL 00/21] Net patches, Jason Wang, 2022/09/02
- [PULL 01/21] vdpa: Skip the maps not in the iova tree, Jason Wang, 2022/09/02
- [PULL 03/21] util: accept iova_tree_remove_parameter by value, Jason Wang, 2022/09/02
- [PULL 02/21] vdpa: do not save failed dma maps in SVQ iova tree, Jason Wang, 2022/09/02
- [PULL 05/21] vdpa: Make SVQ vring unmapping return void, Jason Wang, 2022/09/02
- [PULL 06/21] vhost: Always store new kick fd on vhost_svq_set_svq_kick_fd, Jason Wang, 2022/09/02
- [PULL 07/21] vdpa: Use ring hwaddr at vhost_vdpa_svq_unmap_ring, Jason Wang, 2022/09/02
- [PULL 08/21] vhost: stop transfer elem ownership in vhost_handle_guest_kick,
Jason Wang <=
- [PULL 10/21] vhost: Delete useless read memory barrier, Jason Wang, 2022/09/02
- [PULL 12/21] vhost_net: Add NetClientInfo start callback, Jason Wang, 2022/09/02
- [PULL 09/21] vhost: use SVQ element ndescs instead of opaque data for desc validation, Jason Wang, 2022/09/02
- [PULL 11/21] vhost: Do not depend on !NULL VirtQueueElement on vhost_svq_flush, Jason Wang, 2022/09/02
- [PULL 13/21] vhost_net: Add NetClientInfo stop callback, Jason Wang, 2022/09/02
- [PULL 16/21] vdpa: extract vhost_vdpa_net_cvq_add from vhost_vdpa_net_handle_ctrl_avail, Jason Wang, 2022/09/02
- [PULL 15/21] vdpa: Move command buffers map to start of net device, Jason Wang, 2022/09/02
- [PULL 14/21] vdpa: add net_vhost_vdpa_cvq_info NetClientInfo, Jason Wang, 2022/09/02
- [PULL 18/21] vdpa: Add virtio-net mac address via CVQ at start, Jason Wang, 2022/09/02
- [PULL 17/21] vhost_net: add NetClientState->load() callback, Jason Wang, 2022/09/02