On Mon, 24 Jun 2024 11:04:44 +0200, Jiri Pirko <[email protected]> wrote:
> From: Jiri Pirko <[email protected]>
>
> In order to be reused for admin queue setup, push out common code to
> setup and configure irq for one vq into a separate helper.
>
> Signed-off-by: Jiri Pirko <[email protected]>
> ---
> drivers/virtio/virtio_pci_common.c | 69 ++++++++++++++++++------------
> 1 file changed, 41 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/virtio/virtio_pci_common.c
> b/drivers/virtio/virtio_pci_common.c
> index f6b0b00e4599..1fb2183e409b 100644
> --- a/drivers/virtio/virtio_pci_common.c
> +++ b/drivers/virtio/virtio_pci_common.c
> @@ -284,6 +284,44 @@ void vp_del_vqs(struct virtio_device *vdev)
> vp_dev->vqs = NULL;
> }
>
> +static struct virtqueue *vp_find_one_vq_msix(struct virtio_device *vdev,
> + int queue_idx,
> + vq_callback_t *callback,
> + const char *name, bool ctx,
> + int *allocated_vectors)
> +{
> + struct virtio_pci_device *vp_dev = to_vp_device(vdev);
> + struct virtqueue *vq;
> + u16 msix_vec;
> + int err;
> +
> + if (!callback)
> + msix_vec = VIRTIO_MSI_NO_VECTOR;
> + else if (vp_dev->per_vq_vectors)
> + msix_vec = (*allocated_vectors)++;
> + else
> + msix_vec = VP_MSIX_VQ_VECTOR;
> + vq = vp_setup_vq(vdev, queue_idx++, callback, name, ctx, msix_vec);
Looks like we don't need this ++.
Thanks.
> + if (IS_ERR(vq))
> + return vq;
> +
> + if (!vp_dev->per_vq_vectors || msix_vec == VIRTIO_MSI_NO_VECTOR)
> + return vq;
> +
> + /* allocate per-vq irq if available and necessary */
> + snprintf(vp_dev->msix_names[msix_vec], sizeof(*vp_dev->msix_names),
> + "%s-%s", dev_name(&vp_dev->vdev.dev), name);
> + err = request_irq(pci_irq_vector(vp_dev->pci_dev, msix_vec),
> + vring_interrupt, 0,
> + vp_dev->msix_names[msix_vec], vq);
> + if (err) {
> + vp_del_vq(vq);
> + return ERR_PTR(err);
> + }
> +
> + return vq;
> +}
> +
> static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned int nvqs,
> struct virtqueue *vqs[], vq_callback_t *callbacks[],
> const char * const names[], bool per_vq_vectors,
> @@ -291,7 +329,6 @@ static int vp_find_vqs_msix(struct virtio_device *vdev,
> unsigned int nvqs,
> struct irq_affinity *desc)
> {
> struct virtio_pci_device *vp_dev = to_vp_device(vdev);
> - u16 msix_vec;
> int i, err, nvectors, allocated_vectors, queue_idx = 0;
>
> vp_dev->vqs = kcalloc(nvqs, sizeof(*vp_dev->vqs), GFP_KERNEL);
> @@ -321,37 +358,13 @@ static int vp_find_vqs_msix(struct virtio_device *vdev,
> unsigned int nvqs,
> vqs[i] = NULL;
> continue;
> }
> -
> - if (!callbacks[i])
> - msix_vec = VIRTIO_MSI_NO_VECTOR;
> - else if (vp_dev->per_vq_vectors)
> - msix_vec = allocated_vectors++;
> - else
> - msix_vec = VP_MSIX_VQ_VECTOR;
> - vqs[i] = vp_setup_vq(vdev, queue_idx++, callbacks[i], names[i],
> - ctx ? ctx[i] : false,
> - msix_vec);
> + vqs[i] = vp_find_one_vq_msix(vdev, queue_idx++, callbacks[i],
> + names[i], ctx ? ctx[i] : false,
> + &allocated_vectors);
> if (IS_ERR(vqs[i])) {
> err = PTR_ERR(vqs[i]);
> goto error_find;
> }
> -
> - if (!vp_dev->per_vq_vectors || msix_vec == VIRTIO_MSI_NO_VECTOR)
> - continue;
> -
> - /* allocate per-vq irq if available and necessary */
> - snprintf(vp_dev->msix_names[msix_vec],
> - sizeof *vp_dev->msix_names,
> - "%s-%s",
> - dev_name(&vp_dev->vdev.dev), names[i]);
> - err = request_irq(pci_irq_vector(vp_dev->pci_dev, msix_vec),
> - vring_interrupt, 0,
> - vp_dev->msix_names[msix_vec],
> - vqs[i]);
> - if (err) {
> - vp_del_vq(vqs[i]);
> - goto error_find;
> - }
> }
> return 0;
>
> --
> 2.45.1
>
>
