linux-kernel - Re: [PATCH 15/19] virtio_ring: factor out core logic of buffer detaching

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAJaqyWewrOB3bQnL4=2FF-jhK8FhS_eU9TVKRZ0AG-ZY674ffQ@mail.gmail.com>
Date: Wed, 26 Mar 2025 14:59:11 +0100
From: Eugenio Perez Martin <eperezma@...hat.com>
To: Jason Wang <jasowang@...hat.com>
Cc: mst@...hat.com, xuanzhuo@...ux.alibaba.com, virtualization@...ts.linux.dev, 
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH 15/19] virtio_ring: factor out core logic of buffer detaching

On Mon, Mar 24, 2025 at 7:01 AM Jason Wang <jasowang@...hat.com> wrote:
>
> Factor out core logic of buffer detaching and leave the id population
> to the caller so in order can just call the core logic.
>

Acked-by: Eugenio Pérez <eperezma@...hat.com>

> Signed-off-by: Jason Wang <jasowang@...hat.com>
> ---
>  drivers/virtio/virtio_ring.c | 17 +++++++++++++----
>  1 file changed, 13 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
> index 31aa4a935c27..fe3e6f3d0f96 100644
> --- a/drivers/virtio/virtio_ring.c
> +++ b/drivers/virtio/virtio_ring.c
> @@ -1661,8 +1661,8 @@ static bool virtqueue_kick_prepare_packed(struct vring_virtqueue *vq)
>         return needs_kick;
>  }
>
> -static void detach_buf_packed(struct vring_virtqueue *vq,
> -                             unsigned int id, void **ctx)
> +static void __detach_buf_packed(struct vring_virtqueue *vq,
> +                               unsigned int id, void **ctx)
>  {
>         struct vring_desc_state_packed *state = NULL;
>         struct vring_packed_desc *desc;
> @@ -1673,8 +1673,6 @@ static void detach_buf_packed(struct vring_virtqueue *vq,
>         /* Clear data ptr. */
>         state->data = NULL;
>
> -       vq->packed.desc_extra[state->last].next = vq->free_head;
> -       vq->free_head = id;
>         vq->vq.num_free += state->num;
>
>         if (unlikely(vq->use_dma_api)) {
> @@ -1711,6 +1709,17 @@ static void detach_buf_packed(struct vring_virtqueue *vq,
>         }
>  }
>
> +static void detach_buf_packed(struct vring_virtqueue *vq,
> +                             unsigned int id, void **ctx)
> +{
> +       struct vring_desc_state_packed *state = &vq->packed.desc_state[id];
> +
> +       vq->packed.desc_extra[state->last].next = vq->free_head;
> +       vq->free_head = id;
> +
> +       return __detach_buf_packed(vq, id, ctx);
> +}
> +
>  static inline bool is_used_desc_packed(const struct vring_virtqueue *vq,
>                                        u16 idx, bool used_wrap_counter)
>  {
> --
> 2.42.0
>