Skip to content

Commit ef775b2

Browse files
Jiri Pirkomstsirkin
authored andcommitted
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: Jiri Pirko <jiri@nvidia.com> Message-Id: <20240716113552.80599-4-jiri@resnulli.us> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
1 parent 572864d commit ef775b2

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

drivers/virtio/virtio_pci_common.c

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,11 @@ void vp_del_vqs(struct virtio_device *vdev)
287287
vp_dev->vqs = NULL;
288288
}
289289

290+
enum vp_vq_vector_policy {
291+
VP_VQ_VECTOR_POLICY_EACH,
292+
VP_VQ_VECTOR_POLICY_SHARED,
293+
};
294+
290295
static struct virtqueue *vp_find_one_vq_msix(struct virtio_device *vdev,
291296
int queue_idx,
292297
vq_callback_t *callback,
@@ -328,17 +333,20 @@ static struct virtqueue *vp_find_one_vq_msix(struct virtio_device *vdev,
328333
static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned int nvqs,
329334
struct virtqueue *vqs[],
330335
struct virtqueue_info vqs_info[],
331-
bool per_vq_vectors,
336+
enum vp_vq_vector_policy vector_policy,
332337
struct irq_affinity *desc)
333338
{
334339
struct virtio_pci_device *vp_dev = to_vp_device(vdev);
335340
struct virtqueue_info *vqi;
336341
int i, err, nvectors, allocated_vectors, queue_idx = 0;
342+
bool per_vq_vectors;
337343

338344
vp_dev->vqs = kcalloc(nvqs, sizeof(*vp_dev->vqs), GFP_KERNEL);
339345
if (!vp_dev->vqs)
340346
return -ENOMEM;
341347

348+
per_vq_vectors = vector_policy != VP_VQ_VECTOR_POLICY_SHARED;
349+
342350
if (per_vq_vectors) {
343351
/* Best option: one for change interrupt, one per vq. */
344352
nvectors = 1;
@@ -427,11 +435,13 @@ int vp_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
427435
int err;
428436

429437
/* Try MSI-X with one vector per queue. */
430-
err = vp_find_vqs_msix(vdev, nvqs, vqs, vqs_info, true, desc);
438+
err = vp_find_vqs_msix(vdev, nvqs, vqs, vqs_info,
439+
VP_VQ_VECTOR_POLICY_EACH, desc);
431440
if (!err)
432441
return 0;
433442
/* Fallback: MSI-X with one vector for config, one shared for queues. */
434-
err = vp_find_vqs_msix(vdev, nvqs, vqs, vqs_info, false, desc);
443+
err = vp_find_vqs_msix(vdev, nvqs, vqs, vqs_info,
444+
VP_VQ_VECTOR_POLICY_SHARED, desc);
435445
if (!err)
436446
return 0;
437447
/* Is there an interrupt? If not give up. */

0 commit comments

Comments
 (0)