This patch factors out the split core detaching logic that could be
reused by in order feature into a dedicated function.
Acked-by: Eugenio Pérez <eperezma@xxxxxxxxxx>
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 b1f99f8f05e6..e675d8305dbf 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -798,8 +798,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;
@@ -820,8 +821,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++;
@@ -830,6 +829,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.39.5
