[PATCH v11 18/40] virtio_ring: packed: extract the logic of attach vring

Xuan Zhuo
2022-06-29T06:58:56Z

Separate the logic of attach vring, the subsequent patch will call it
separately.

Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
---
drivers/virtio/virtio_ring.c | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 0c4109eb6c6c..91ac99f99bff 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -1929,6 +1929,22 @@ static int vring_alloc_state_extra_packed(struct vring_virtqueue_packed *vring)
return -ENOMEM;
}

+static void virtqueue_vring_attach_packed(struct vring_virtqueue *vq,
+ struct vring_virtqueue_packed *vring)
+{
+ vq->packed.ring_dma_addr = vring->ring_dma_addr;
+ vq->packed.driver_event_dma_addr = vring->driver_event_dma_addr;
+ vq->packed.device_event_dma_addr = vring->device_event_dma_addr;
+
+ vq->packed.ring_size_in_bytes = vring->ring_size_in_bytes;
+ vq->packed.event_size_in_bytes = vring->event_size_in_bytes;
+
+ vq->packed.vring = vring->vring;
+
+ vq->packed.desc_state = vring->desc_state;
+ vq->packed.desc_extra = vring->desc_extra;
+}
+
static struct virtqueue *vring_create_virtqueue_packed(
unsigned int index,
unsigned int num,
@@ -1969,15 +1985,6 @@ static struct virtqueue *vring_create_virtqueue_packed(
vq->indirect = virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC) &&
!context;

- vq->packed.ring_dma_addr = vring.ring_dma_addr;
- vq->packed.driver_event_dma_addr = vring.driver_event_dma_addr;
- vq->packed.device_event_dma_addr = vring.device_event_dma_addr;
-
- vq->packed.ring_size_in_bytes = vring.ring_size_in_bytes;
- vq->packed.event_size_in_bytes = vring.event_size_in_bytes;
-
- vq->packed.vring = vring.vring;
-
vq->packed.next_avail_idx = 0;
vq->packed.avail_wrap_counter = 1;
vq->packed.event_flags_shadow = 0;
@@ -1987,10 +1994,8 @@ static struct virtqueue *vring_create_virtqueue_packed(
if (err)
goto err_state_extra;

- vq->packed.desc_state = vring.desc_state;
- vq->packed.desc_extra = vring.desc_extra;
-
virtqueue_init(vq, num);
+ virtqueue_vring_attach_packed(vq, &vring);

/* No callback? Tell other side not to bother us. */
if (!callback) {
--
2.31.0