Commit cf94db21 authored by Cornelia Huck's avatar Cornelia Huck Committed by Michael S. Tsirkin

virtio: Honour 'may_reduce_num' in vring_create_virtqueue

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: 2a2d1382 ("virtio: Add improved queue allocation API")
Cc: stable@vger.kernel.org # v4.6+
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarHalil Pasic <pasic@linux.ibm.com>
Reviewed-by: default avatarJens Freimann <jfreimann@redhat.com>
parent 5e9642a2
...@@ -882,6 +882,8 @@ static struct virtqueue *vring_create_virtqueue_split( ...@@ -882,6 +882,8 @@ static struct virtqueue *vring_create_virtqueue_split(
GFP_KERNEL|__GFP_NOWARN|__GFP_ZERO); GFP_KERNEL|__GFP_NOWARN|__GFP_ZERO);
if (queue) if (queue)
break; break;
if (!may_reduce_num)
return NULL;
} }
if (!num) if (!num)
......
...@@ -63,7 +63,7 @@ struct virtqueue; ...@@ -63,7 +63,7 @@ struct virtqueue;
/* /*
* Creates a virtqueue and allocates the descriptor ring. If * Creates a virtqueue and allocates the descriptor ring. If
* may_reduce_num is set, then this may allocate a smaller ring than * may_reduce_num is set, then this may allocate a smaller ring than
* expected. The caller should query virtqueue_get_ring_size to learn * expected. The caller should query virtqueue_get_vring_size to learn
* the actual size of the ring. * the actual size of the ring.
*/ */
struct virtqueue *vring_create_virtqueue(unsigned int index, struct virtqueue *vring_create_virtqueue(unsigned int index,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment