Skip to content

Commit

Permalink
virtio_ring: packed: introduce virtqueue_resize_packed()
Browse files Browse the repository at this point in the history
virtio ring packed supports resize.

Only after the new vring is successfully allocated based on the new num,
we will release the old vring. In any case, an error is returned,
indicating that the vring still points to the old vring.

In the case of an error, re-initialize(by virtqueue_reinit_packed()) the
virtqueue to ensure that the vring can be used.

Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Message-Id: <20220801063902.129329-24-xuanzhuo@linux.alibaba.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
  • Loading branch information
Xuan Zhuo authored and Michael S. Tsirkin committed Aug 11, 2022
1 parent 56775e1 commit 947f9fc
Showing 1 changed file with 30 additions and 0 deletions.
30 changes: 30 additions & 0 deletions drivers/virtio/virtio_ring.c
Original file line number Diff line number Diff line change
Expand Up @@ -2036,6 +2036,36 @@ static struct virtqueue *vring_create_virtqueue_packed(
return NULL;
}

static int virtqueue_resize_packed(struct virtqueue *_vq, u32 num)
{
struct vring_virtqueue_packed vring_packed = {};
struct vring_virtqueue *vq = to_vvq(_vq);
struct virtio_device *vdev = _vq->vdev;
int err;

if (vring_alloc_queue_packed(&vring_packed, vdev, num))
goto err_ring;

err = vring_alloc_state_extra_packed(&vring_packed);
if (err)
goto err_state_extra;

vring_free(&vq->vq);

virtqueue_vring_init_packed(&vring_packed, !!vq->vq.callback);

virtqueue_init(vq, vring_packed.vring.num);
virtqueue_vring_attach_packed(vq, &vring_packed);

return 0;

err_state_extra:
vring_free_packed(&vring_packed, vdev);
err_ring:
virtqueue_reinit_packed(vq);
return -ENOMEM;
}


/*
* Generic functions and exported symbols.
Expand Down

0 comments on commit 947f9fc

Please sign in to comment.