Commit ef775b26 authored by Jiri Pirko's avatar Jiri Pirko Committed by Michael S. Tsirkin
Browse files

virtio_pci: pass vector policy enum to vp_find_vqs_msix() 



In preparation for another irq allocation fallback,
introduce vector policy enum and pass the values
to vp_find_vqs_msix() instead of bool arg.

Signed-off-by: default avatarJiri Pirko <jiri@nvidia.com>
Message-Id: <20240716113552.80599-4-jiri@resnulli.us>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 572864d4

drivers/virtio/virtio_pci_common.c

+13 −3
Original line number Diff line number Diff line
@@ -287,6 +287,11 @@ void vp_del_vqs(struct virtio_device *vdev) 
	vp_dev->vqs = NULL;

}



enum vp_vq_vector_policy {

	VP_VQ_VECTOR_POLICY_EACH,

	VP_VQ_VECTOR_POLICY_SHARED,

};



static struct virtqueue *vp_find_one_vq_msix(struct virtio_device *vdev,

					     int queue_idx,

					     vq_callback_t *callback,
@@ -328,17 +333,20 @@ static struct virtqueue *vp_find_one_vq_msix(struct virtio_device *vdev, 
static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned int nvqs,

			    struct virtqueue *vqs[],

			    struct virtqueue_info vqs_info[],

			    bool per_vq_vectors,

			    enum vp_vq_vector_policy vector_policy,

			    struct irq_affinity *desc)

{

	struct virtio_pci_device *vp_dev = to_vp_device(vdev);

	struct virtqueue_info *vqi;

	int i, err, nvectors, allocated_vectors, queue_idx = 0;

	bool per_vq_vectors;



	vp_dev->vqs = kcalloc(nvqs, sizeof(*vp_dev->vqs), GFP_KERNEL);

	if (!vp_dev->vqs)

		return -ENOMEM;



	per_vq_vectors = vector_policy != VP_VQ_VECTOR_POLICY_SHARED;



	if (per_vq_vectors) {

		/* Best option: one for change interrupt, one per vq. */

		nvectors = 1;
@@ -427,11 +435,13 @@ int vp_find_vqs(struct virtio_device *vdev, unsigned int nvqs, 
	int err;



	/* Try MSI-X with one vector per queue. */

	err = vp_find_vqs_msix(vdev, nvqs, vqs, vqs_info, true, desc);

	err = vp_find_vqs_msix(vdev, nvqs, vqs, vqs_info,

			       VP_VQ_VECTOR_POLICY_EACH, desc);

	if (!err)

		return 0;

	/* Fallback: MSI-X with one vector for config, one shared for queues. */

	err = vp_find_vqs_msix(vdev, nvqs, vqs, vqs_info, false, desc);

	err = vp_find_vqs_msix(vdev, nvqs, vqs, vqs_info,

			       VP_VQ_VECTOR_POLICY_SHARED, desc);

	if (!err)

		return 0;

	/* Is there an interrupt? If not give up. */