On Mon, Jun 16, 2025 at 04:25:16PM +0800, Jason Wang wrote:
> This patch factors out the split core detaching logic that could be
> reused by in order feature into a dedicated function.
you mean
Factor out the split core detaching logic into a dedicated function
so it cn be reused by the in order feature
>
> Reviewed-by: Xuan Zhuo <xuanzhuo@xxxxxxxxxxxxxxxxx>
> Signed-off-by: Jason Wang <jasowang@xxxxxxxxxx>
> ---
> drivers/virtio/virtio_ring.c | 18 ++++++++++++++----
> 1 file changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
> index 259380797ec4..27a9459a0555 100644
> --- a/drivers/virtio/virtio_ring.c
> +++ b/drivers/virtio/virtio_ring.c
> @@ -804,8 +804,9 @@ static void detach_indirect_split(struct vring_virtqueue *vq,
> vq->split.desc_state[head].indir_desc = NULL;
> }
>
> -static void detach_buf_split(struct vring_virtqueue *vq, unsigned int head,
> - void **ctx)
> +static unsigned detach_buf_split_in_order(struct vring_virtqueue *vq,
> + unsigned int head,
> + void **ctx)
> {
> struct vring_desc_extra *extra;
> unsigned int i;
> @@ -826,8 +827,6 @@ static void detach_buf_split(struct vring_virtqueue *vq, unsigned int head,
> }
>
> vring_unmap_one_split(vq, &extra[i]);
> - vq->split.desc_extra[i].next = vq->free_head;
> - vq->free_head = head;
>
> /* Plus final descriptor */
> vq->vq.num_free++;
> @@ -836,6 +835,17 @@ static void detach_buf_split(struct vring_virtqueue *vq, unsigned int head,
> detach_indirect_split(vq, head);
> else if (ctx)
> *ctx = vq->split.desc_state[head].indir_desc;
> +
> + return i;
> +}
> +
> +static void detach_buf_split(struct vring_virtqueue *vq, unsigned int head,
> + void **ctx)
> +{
> + unsigned int i = detach_buf_split_in_order(vq, head, ctx);
> +
> + vq->split.desc_extra[i].next = vq->free_head;
> + vq->free_head = head;
> }
>
> static bool virtqueue_poll_split(const struct vring_virtqueue *vq,
> --
> 2.34.1
