From: Jason Wang <jasowang@redhat.com>
To: Cornelia Huck <cohuck@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>
Cc: Halil Pasic <pasic@linux.ibm.com>,
virtualization@lists.linux-foundation.org, kvm@vger.kernel.org,
linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: Re: [PATCH] virtio: Honour 'may_reduce_num' in vring_create_virtqueue
Date: Tue, 9 Apr 2019 17:00:59 +0800 [thread overview]
Message-ID: <9b3d1789-33e1-3ad5-18cd-cacefec8bbb2@redhat.com> (raw)
In-Reply-To: <20190408123322.24086-1-cohuck@redhat.com>
On 2019/4/8 下午8:33, Cornelia Huck wrote:
> 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>
> ---
> drivers/virtio/virtio_ring.c | 2 ++
> include/linux/virtio_ring.h | 2 +-
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
> index 18846afb39da..5df92c308286 100644
> --- a/drivers/virtio/virtio_ring.c
> +++ b/drivers/virtio/virtio_ring.c
> @@ -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)
> diff --git a/include/linux/virtio_ring.h b/include/linux/virtio_ring.h
> index fab02133a919..3dc70adfe5f5 100644
> --- a/include/linux/virtio_ring.h
> +++ b/include/linux/virtio_ring.h
> @@ -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,
Acked-by: Jason Wang <jasowang@redhat.com>
prev parent reply other threads:[~2019-04-09 9:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-08 12:33 [PATCH] virtio: Honour 'may_reduce_num' in vring_create_virtqueue Cornelia Huck
2019-04-08 13:32 ` Jens Freimann
2019-04-08 14:12 ` Halil Pasic
2019-04-09 9:00 ` Jason Wang [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9b3d1789-33e1-3ad5-18cd-cacefec8bbb2@redhat.com \
--to=jasowang@redhat.com \
--cc=cohuck@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=stable@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).