Commit 3ea19e32 authored by Xuan Zhuo's avatar Xuan Zhuo Committed by Michael S. Tsirkin
Browse files

virtio_ring: extract the logic of freeing vring 



Introduce vring_free() to free the vring of vq.

Subsequent patches will use vring_free() alone.

Signed-off-by: default avatarXuan Zhuo <xuanzhuo@linux.alibaba.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Message-Id: <20220801063902.129329-5-xuanzhuo@linux.alibaba.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent a62eecb3

drivers/virtio/virtio_ring.c

+13 −5
Original line number Diff line number Diff line
@@ -2316,14 +2316,10 @@ struct virtqueue *vring_new_virtqueue(unsigned int index, 
}

EXPORT_SYMBOL_GPL(vring_new_virtqueue);



void vring_del_virtqueue(struct virtqueue *_vq)

static void vring_free(struct virtqueue *_vq)

{

	struct vring_virtqueue *vq = to_vvq(_vq);



	spin_lock(&vq->vq.vdev->vqs_list_lock);

	list_del(&_vq->list);

	spin_unlock(&vq->vq.vdev->vqs_list_lock);



	if (vq->we_own_ring) {

		if (vq->packed_ring) {

			vring_free_queue(vq->vq.vdev,
@@ -2354,6 +2350,18 @@ void vring_del_virtqueue(struct virtqueue *_vq) 
		kfree(vq->split.desc_state);

		kfree(vq->split.desc_extra);

	}

}



void vring_del_virtqueue(struct virtqueue *_vq)

{

	struct vring_virtqueue *vq = to_vvq(_vq);



	spin_lock(&vq->vq.vdev->vqs_list_lock);

	list_del(&_vq->list);

	spin_unlock(&vq->vq.vdev->vqs_list_lock);



	vring_free(_vq);



	kfree(vq);

}

EXPORT_SYMBOL_GPL(vring_del_virtqueue);