From: Christian Borntraeger <borntraeger@de.ibm.com>
To: Wei Wang <wei.w.wang@intel.com>,
virtio-dev@lists.oasis-open.org, linux-kernel@vger.kernel.org,
virtualization@lists.linux-foundation.org, kvm@vger.kernel.org,
mst@redhat.com, cohuck@redhat.com
Cc: pbonzini@redhat.com, dgilbert@redhat.com
Subject: Re: [PATCH v1 2/2] virtio: don't allocate vqs when names[i] = NULL
Date: Wed, 9 Jan 2019 17:30:17 +0100 [thread overview]
Message-ID: <3b3b43c4-de92-8093-096b-0d3783409391@de.ibm.com> (raw)
In-Reply-To: <1545963986-11280-3-git-send-email-wei.w.wang@intel.com>
Cc: stable@vger.kernel.org
Fixes: 86a559787e6f ("virtio-balloon: VIRTIO_BALLOON_F_FREE_PAGE_HINT")
On 28.12.2018 03:26, Wei Wang wrote:
> Some vqs may not need to be allocated when their related feature bits
> are disabled. So callers may pass in such vqs with "names = NULL".
> Then we skip such vq allocations.
>
> Signed-off-by: Wei Wang <wei.w.wang@intel.com>
> ---
> drivers/misc/mic/vop/vop_main.c | 9 +++++++--
> drivers/remoteproc/remoteproc_virtio.c | 9 +++++++--
> drivers/s390/virtio/virtio_ccw.c | 12 +++++++++---
> drivers/virtio/virtio_mmio.c | 9 +++++++--
> 4 files changed, 30 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/misc/mic/vop/vop_main.c b/drivers/misc/mic/vop/vop_main.c
> index 6b212c8..2bfa3a9 100644
> --- a/drivers/misc/mic/vop/vop_main.c
> +++ b/drivers/misc/mic/vop/vop_main.c
> @@ -394,16 +394,21 @@ static int vop_find_vqs(struct virtio_device *dev, unsigned nvqs,
> struct _vop_vdev *vdev = to_vopvdev(dev);
> struct vop_device *vpdev = vdev->vpdev;
> struct mic_device_ctrl __iomem *dc = vdev->dc;
> - int i, err, retry;
> + int i, err, retry, queue_idx = 0;
>
> /* We must have this many virtqueues. */
> if (nvqs > ioread8(&vdev->desc->num_vq))
> return -ENOENT;
>
> for (i = 0; i < nvqs; ++i) {
> + if (!names[i]) {
> + vqs[i] = NULL;
> + continue;
> + }
> +
> dev_dbg(_vop_dev(vdev), "%s: %d: %s\n",
> __func__, i, names[i]);
> - vqs[i] = vop_find_vq(dev, i, callbacks[i], names[i],
> + vqs[i] = vop_find_vq(dev, queue_idx++, callbacks[i], names[i],
> ctx ? ctx[i] : false);
> if (IS_ERR(vqs[i])) {
> err = PTR_ERR(vqs[i]);
> diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c
> index 183fc42..2d7cd344 100644
> --- a/drivers/remoteproc/remoteproc_virtio.c
> +++ b/drivers/remoteproc/remoteproc_virtio.c
> @@ -153,10 +153,15 @@ static int rproc_virtio_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
> const bool * ctx,
> struct irq_affinity *desc)
> {
> - int i, ret;
> + int i, ret, queue_idx = 0;
>
> for (i = 0; i < nvqs; ++i) {
> - vqs[i] = rp_find_vq(vdev, i, callbacks[i], names[i],
> + if (!names[i]) {
> + vqs[i] = NULL;
> + continue;
> + }
> +
> + vqs[i] = rp_find_vq(vdev, queue_idx++, callbacks[i], names[i],
> ctx ? ctx[i] : false);
> if (IS_ERR(vqs[i])) {
> ret = PTR_ERR(vqs[i]);
> diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c
> index fc9dbad..ae1d56d 100644
> --- a/drivers/s390/virtio/virtio_ccw.c
> +++ b/drivers/s390/virtio/virtio_ccw.c
> @@ -635,7 +635,7 @@ static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs,
> {
> struct virtio_ccw_device *vcdev = to_vc_device(vdev);
> unsigned long *indicatorp = NULL;
> - int ret, i;
> + int ret, i, queue_idx = 0;
> struct ccw1 *ccw;
>
> ccw = kzalloc(sizeof(*ccw), GFP_DMA | GFP_KERNEL);
> @@ -643,8 +643,14 @@ static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs,
> return -ENOMEM;
>
> for (i = 0; i < nvqs; ++i) {
> - vqs[i] = virtio_ccw_setup_vq(vdev, i, callbacks[i], names[i],
> - ctx ? ctx[i] : false, ccw);
> + if (!names[i]) {
> + vqs[i] = NULL;
> + continue;
> + }
> +
> + vqs[i] = virtio_ccw_setup_vq(vdev, queue_idx++, callbacks[i],
> + names[i], ctx ? ctx[i] : false,
> + ccw);
> if (IS_ERR(vqs[i])) {
> ret = PTR_ERR(vqs[i]);
> vqs[i] = NULL;
> diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
> index 4cd9ea5..d9dd0f78 100644
> --- a/drivers/virtio/virtio_mmio.c
> +++ b/drivers/virtio/virtio_mmio.c
> @@ -468,7 +468,7 @@ static int vm_find_vqs(struct virtio_device *vdev, unsigned nvqs,
> {
> struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
> unsigned int irq = platform_get_irq(vm_dev->pdev, 0);
> - int i, err;
> + int i, err, queue_idx = 0;
>
> err = request_irq(irq, vm_interrupt, IRQF_SHARED,
> dev_name(&vdev->dev), vm_dev);
> @@ -476,7 +476,12 @@ static int vm_find_vqs(struct virtio_device *vdev, unsigned nvqs,
> return err;
>
> for (i = 0; i < nvqs; ++i) {
> - vqs[i] = vm_setup_vq(vdev, i, callbacks[i], names[i],
> + if (!names[i]) {
> + vqs[i] = NULL;
> + continue;
> + }
> +
> + vqs[i] = vm_setup_vq(vdev, queue_idx++, callbacks[i], names[i],
> ctx ? ctx[i] : false);
> if (IS_ERR(vqs[i])) {
> vm_del_vqs(vdev);
>
next prev parent reply other threads:[~2019-01-09 16:30 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-28 2:26 [PATCH v1 0/2] Virtio: fix some vq allocation issues Wei Wang
2018-12-28 2:26 ` [PATCH v1 1/2] virtio_pci: use queue idx instead of array idx to set up the vq Wei Wang
2019-01-03 9:57 ` Cornelia Huck
2019-01-09 16:29 ` Christian Borntraeger
2018-12-28 2:26 ` [PATCH v1 2/2] virtio: don't allocate vqs when names[i] = NULL Wei Wang
2019-01-03 9:59 ` Cornelia Huck
2019-01-09 16:30 ` Christian Borntraeger [this message]
2018-12-28 7:57 ` [PATCH v1 0/2] Virtio: fix some vq allocation issues Christian Borntraeger
2018-12-29 2:45 ` Wang, Wei W
2018-12-30 6:06 ` Halil Pasic
2018-12-31 6:03 ` Wang, Wei W
2018-12-31 23:40 ` [virtio-dev] " Halil Pasic
2019-01-02 9:53 ` Cornelia Huck
2019-01-02 13:23 ` Cornelia Huck
2019-01-02 15:59 ` Halil Pasic
2019-01-02 18:02 ` Cornelia Huck
2019-01-02 19:13 ` Halil Pasic
2019-01-02 13:56 ` Halil Pasic
2019-01-03 6:18 ` Wei Wang
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=3b3b43c4-de92-8093-096b-0d3783409391@de.ibm.com \
--to=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=dgilbert@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=virtio-dev@lists.oasis-open.org \
--cc=virtualization@lists.linux-foundation.org \
--cc=wei.w.wang@intel.com \
/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).