summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Liu <feliu@nvidia.com>2023-03-15 20:54:56 +0200
committerMichael S. Tsirkin <mst@redhat.com>2023-04-21 03:02:31 -0400
commita084983dcd4e75616fe4102c690d2fc922ac32b5 (patch)
tree0c0aa11f34f9a85384a6a623a2fe077d20b61d13
parentbea273c7a8712a055cd504a2bb7d76d8d713ba6e (diff)
downloadlinux-stable-a084983dcd4e75616fe4102c690d2fc922ac32b5.tar.gz
linux-stable-a084983dcd4e75616fe4102c690d2fc922ac32b5.tar.bz2
linux-stable-a084983dcd4e75616fe4102c690d2fc922ac32b5.zip
virtio_ring: Allow non power of 2 sizes for packed virtqueue
According to the Virtio Specification, the Queue Size parameter of a virtqueue corresponds to the maximum number of descriptors in that queue, and it does not have to be a power of 2 for packed virtqueues. However, the virtio_pci_modern driver enforced a power of 2 check for virtqueue sizes, which is unnecessary and restrictive for packed virtuqueue. Split virtqueue still needs to check the virtqueue size is power_of_2 which has been done in vring_alloc_queue_split of the virtio_ring layer. To validate this change, we tested various virtqueue sizes for packed rings, including 128, 256, 512, 100, 200, 500, and 1000, with CONFIG_PAGE_POISONING enabled, and all tests passed successfully. Signed-off-by: Feng Liu <feliu@nvidia.com> Reviewed-by: Jiri Pirko <jiri@nvidia.com> Message-Id: <20230315185458.11638-2-feliu@nvidia.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r--drivers/virtio/virtio_pci_modern.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index 9e496e288cfa..6e713904d8e8 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -310,11 +310,6 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,
if (!num || vp_modern_get_queue_enable(mdev, index))
return ERR_PTR(-ENOENT);
- if (!is_power_of_2(num)) {
- dev_warn(&vp_dev->pci_dev->dev, "bad queue size %u", num);
- return ERR_PTR(-EINVAL);
- }
-
info->msix_vector = msix_vec;
/* create the vring */