Re: [PATCH v9 08/32] virtio_ring: split: extract the logic of attach vring

Jason Wang
2022-04-12T03:31:25Z

在 2022/4/6 上午11:43, Xuan Zhuo 写道:
> Separate the logic of attach vring, subsequent patches will call it
> separately.
>
> Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> ---
> drivers/virtio/virtio_ring.c | 20 ++++++++++++++------
> 1 file changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
> index 6de67439cb57..083f2992ba0d 100644
> --- a/drivers/virtio/virtio_ring.c
> +++ b/drivers/virtio/virtio_ring.c
> @@ -916,6 +916,19 @@ static void *virtqueue_detach_unused_buf_split(struct virtqueue *_vq)
> return NULL;
> }
>
> +static void vring_virtqueue_attach_split(struct vring_virtqueue *vq,
> + struct vring vring,
> + struct vring_desc_state_split *desc_state,
> + struct vring_desc_extra *desc_extra)
> +{
> + vq->split.vring = vring;
> + vq->split.queue_dma_addr = 0;
> + vq->split.queue_size_in_bytes = 0;

Any reason to add the above two assignment in attach? It seems belong to
free or reset.

Thanks

> +
> + vq->split.desc_state = desc_state;
> + vq->split.desc_extra = desc_extra;
> +}
> +
> static int vring_alloc_state_extra_split(u32 num,
> struct vring_desc_state_split **desc_state,
> struct vring_desc_extra **desc_extra)
> @@ -2262,10 +2275,6 @@ struct virtqueue *__vring_new_virtqueue(unsigned int index,
> if (virtio_has_feature(vdev, VIRTIO_F_ORDER_PLATFORM))
> vq->weak_barriers = false;
>
> - vq->split.queue_dma_addr = 0;
> - vq->split.queue_size_in_bytes = 0;
> -
> - vq->split.vring = vring;
> vq->split.avail_flags_shadow = 0;
> vq->split.avail_idx_shadow = 0;
>
> @@ -2283,8 +2292,7 @@ struct virtqueue *__vring_new_virtqueue(unsigned int index,
> return NULL;
> }
>
> - vq->split.desc_state = state;
> - vq->split.desc_extra = extra;
> + vring_virtqueue_attach_split(vq, vring, state, extra);
>
> /* Put everything in free lists. */
> vq->free_head = 0;