]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit - include/linux/virtio_ring.h
virtio: Honour 'may_reduce_num' in vring_create_virtqueue
authorCornelia Huck <cohuck@redhat.com>
Mon, 8 Apr 2019 12:33:22 +0000 (14:33 +0200)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 14 Aug 2019 09:18:49 +0000 (11:18 +0200)
commit3b835c7c1df6c8fa3e77e43c382038c8a1fa4933
tree99651bd83b43dc8444d7403ec04246ea746fb693
parentfaa3c657ad08e871cbe615f8d6a56ad2700f6c35
virtio: Honour 'may_reduce_num' in vring_create_virtqueue

BugLink: https://bugs.launchpad.net/bugs/1838116
commit cf94db21905333e610e479688add629397a4b384 upstream.

vring_create_virtqueue() allows the caller to specify via the
may_reduce_num parameter whether the vring code is allowed to
allocate a smaller ring than specified.

However, the split ring allocation code tries to allocate a
smaller ring on allocation failure regardless of what the
caller specified. This may cause trouble for e.g. virtio-pci
in legacy mode, which does not support ring resizing. (The
packed ring code does not resize in any case.)

Let's fix this by bailing out immediately in the split ring code
if the requested size cannot be allocated and may_reduce_num has
not been specified.

While at it, fix a typo in the usage instructions.

Fixes: 2a2d1382fe9d ("virtio: Add improved queue allocation API")
Cc: stable@vger.kernel.org # v4.6+
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Halil Pasic <pasic@linux.ibm.com>
Reviewed-by: Jens Freimann <jfreimann@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/virtio/virtio_ring.c
include/linux/virtio_ring.h