virtio: Honour 'may_reduce_num' in vring_create_virtqueue
Subsystems (3)
PATCH 1/1 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.
--- drivers/virtio/virtio_ring.c | 2 ++ include/linux/virtio_ring.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/virtio/virtio_ring.c +2 -0
@@ -882,6 +882,8 @@ static struct virtqueue *vring_create_virtqueue_split( GFP_KERNEL|__GFP_NOWARN|__GFP_ZERO);if (queue)break ; +if (!may_reduce_num) +return NULL ; }if (!num)
include/linux/virtio_ring.h +1 -1
@@ -63,7 +63,7 @@ struct virtqueue;/* * Creates a virtqueue and allocates the descriptor ring. If * 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. */ struct virtqueue *vring_create_virtqueue(unsigned int index,
Signature · 1 line
2.17.2
Quoted 16 lines · Cornelia Huck
vring_create_virtqueue()allows the caller to specify via themay_reduce_numparameter 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_numhas not been specified.While at it, fix a typo in the usage instructions.
Quoted 8 lines
Fixes 2a2d1382fe9d ("virtio: Add improved queue allocation API")Cc [email protected] # v4.6+Signed-off-by Cornelia Huck <[email protected]>---
drivers/virtio/virtio_ring.c| 2 ++include/linux/virtio_ring.h| 2 +-2 files changed, 3 insertions(+), 1 deletion(-)
Quoted 16 lines · Cornelia Huck
vring_create_virtqueue()allows the caller to specify via themay_reduce_numparameter 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_numhas not been specified.While at it, fix a typo in the usage instructions.
Quoted 8 lines
Fixes 2a2d1382fe9d ("virtio: Add improved queue allocation API")Cc [email protected] # v4.6+Signed-off-by Cornelia Huck <[email protected]>---
drivers/virtio/virtio_ring.c| 2 ++include/linux/virtio_ring.h| 2 +-2 files changed, 3 insertions(+), 1 deletion(-)
Quoted 14 lines · On Mon, 8 Apr 2019 14:33:22 +0200 Cornelia Huck <[email protected]> wrote:
vring_create_virtqueue()allows the caller to specify via themay_reduce_numparameter 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_numhas not been specified.
Quoted 5 lines
While at it, fix a typo in the usage instructions.
Fixes 2a2d1382fe9d ("virtio: Add improved queue allocation API")Cc [email protected] # v4.6+Signed-off-by Cornelia Huck <[email protected]>
Quoted 42 lines · Cornelia Huck
vring_create_virtqueue()allows the caller to specify via themay_reduce_numparameter 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_numhas not been specified.While at it, fix a typo in the usage instructions.
Fixes 2a2d1382fe9d ("virtio: Add improved queue allocation API")Cc [email protected] # v4.6+Signed-off-by Cornelia Huck <[email protected]>--- drivers/virtio/virtio_ring.c | 2 ++ include/linux/virtio_ring.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)drivers/virtio/virtio_ring.c +2
-0@@ -882,6 +882,8 @@ static struct virtqueue *vring_create_virtqueue_split( GFP_KERNEL|__GFP_NOWARN|__GFP_ZERO);if (queue)break ; +if (!may_reduce_num) +return NULL ; }if (!num)include/linux/virtio_ring.h +0
-0
include/linux/virtio_ring.h struct virtqueue; · line 69
Quoted 8 lines
include/linux/virtio_ring.h +1
-1@@ -63,7 +63,7 @@ struct virtqueue;/* * Creates a virtqueue and allocates the descriptor ring. If * 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. */ struct virtqueue *vring_create_virtqueue(unsigned int index,
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Quoted 42 lines · Cornelia Huck
vring_create_virtqueue()allows the caller to specify via themay_reduce_numparameter 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_numhas not been specified.While at it, fix a typo in the usage instructions.
Fixes 2a2d1382fe9d ("virtio: Add improved queue allocation API")Cc [email protected] # v4.6+Signed-off-by Cornelia Huck <[email protected]>--- drivers/virtio/virtio_ring.c | 2 ++ include/linux/virtio_ring.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)drivers/virtio/virtio_ring.c +2
-0@@ -882,6 +882,8 @@ static struct virtqueue *vring_create_virtqueue_split( GFP_KERNEL|__GFP_NOWARN|__GFP_ZERO);if (queue)break ; +if (!may_reduce_num) +return NULL ; }if (!num)include/linux/virtio_ring.h +0
-0
include/linux/virtio_ring.h struct virtqueue; · line 69
Quoted 8 lines
include/linux/virtio_ring.h +1
-1@@ -63,7 +63,7 @@ struct virtqueue;/* * Creates a virtqueue and allocates the descriptor ring. If * 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. */ struct virtqueue *vring_create_virtqueue(unsigned int index,