OSDN Git Service

virtio-pci: check name when counting MSI-X vectors
authorDaniel Verkamp <dverkamp@chromium.org>
Fri, 3 Jan 2020 18:40:45 +0000 (10:40 -0800)
committerMichael S. Tsirkin <mst@redhat.com>
Thu, 6 Feb 2020 08:40:26 +0000 (03:40 -0500)
commit303090b513fd1ee45aa1536b71a3838dc054bc05
tree2b7767288f55fbe821d9eccd7583b13d894892ca
parent5790b53390e18fdd21e70776e46d058c05eda2f2
virtio-pci: check name when counting MSI-X vectors

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: 86a559787e6f ("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>
drivers/virtio/virtio_pci_common.c