ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

virtio-pci: check name when counting MSI-X vectors

Browse Source 
VQs without a name specified are not valid; they are skipped in the
later loop that assigns MSI-X vectors to queues, but the per_vq_vectors
loop above that counts the required number of vectors previously still
counted any queue with a non-NULL callback as needing a vector.

Add a check to the per_vq_vectors loop so that vectors with no name are
not counted to make the two loops consistent.  This prevents
over-counting unnecessary vectors (e.g. for features which were not
negotiated with the device).

Cc: stable@vger.kernel.org
Fixes: 86a559787e ("virtio-balloon: VIRTIO_BALLOON_F_FREE_PAGE_HINT")
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Wang, Wei W <wei.w.wang@intel.com>
This commit is contained in:
Daniel Verkamp
2020-01-03 10:40:45 -08:00
committed by Michael S. Tsirkin
parent 5790b53390
commit 303090b513
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/virtio/virtio_pci_common.c
View File

@@ -294,7 +294,7 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned nvqs,
/* Best option: one for change interrupt, one per vq. */ /* Best option: one for change interrupt, one per vq. */
nvectors = 1; nvectors = 1;
for (i = 0; i < nvqs; ++i) for (i = 0; i < nvqs; ++i)
if (callbacks[i]) if (names[i] && callbacks[i])
++nvectors; ++nvectors;
} else { } else {
/* Second best: one for change, shared for all vqs. */ /* Second best: one for change, shared for all vqs. */