From: Minfei Huang <mnfhuang@gmail.com>
To: Cornelia Huck <cornelia.huck@de.ibm.com>
Cc: Minfei Huang <mnfhuang@gmail.com>,
mst@redhat.com, virtualization@lists.linux-foundation.org,
linux-kernel@vger.kernel.org, fanc.fnst@cn.fujitsu.com,
Minfei Huang <minfei.hmf@alibaba-inc.com>
Subject: Re: [PATCH v2] virtio_blk: Fix a slient kernel panic
Date: Tue, 19 Jul 2016 00:18:32 +0800 [thread overview]
Message-ID: <20160718160421.GA20047@huangminfeis-MacBook-Pro.local> (raw)
In-Reply-To: <20160718172128.5b8c10b1.cornelia.huck@de.ibm.com>
On 07/18/16 at 05:21P, Cornelia Huck wrote:
> On Mon, 18 Jul 2016 22:01:29 +0800
> Minfei Huang <mnfhuang@gmail.com> wrote:
> > diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
> > index 42758b5..d920512 100644
> > --- a/drivers/block/virtio_blk.c
> > +++ b/drivers/block/virtio_blk.c
> > @@ -381,9 +381,9 @@ static int init_vq(struct virtio_blk *vblk)
> > {
> > int err = 0;
> > int i;
> > - vq_callback_t **callbacks;
> > - const char **names;
> > - struct virtqueue **vqs;
> > + vq_callback_t **callbacks = NULL;
> > + const char **names = NULL;
> > + struct virtqueue **vqs = NULL;
>
> If you init the variables to NULL anyway...
Hi, Cornelia.
Thanks for reviewing this patch.
Seems there is no need to init these variables to NULL. I will remove
them laster.
>
> > unsigned short num_vqs;
> > struct virtio_device *vdev = vblk->vdev;
> >
> > @@ -394,22 +394,16 @@ static int init_vq(struct virtio_blk *vblk)
> > num_vqs = 1;
> >
>
> ...just do
>
> err = -ENOMEM;
>
> here and...
>
> > vblk->vqs = kmalloc(sizeof(*vblk->vqs) * num_vqs, GFP_KERNEL);
> > - if (!vblk->vqs) {
> > - err = -ENOMEM;
> > - goto out;
> > - }
> > + if (!vblk->vqs)
> > + return -ENOMEM;
> >
> > names = kmalloc(sizeof(*names) * num_vqs, GFP_KERNEL);
> > - if (!names)
> > - goto err_names;
> > -
> > callbacks = kmalloc(sizeof(*callbacks) * num_vqs, GFP_KERNEL);
> > - if (!callbacks)
> > - goto err_callbacks;
> > -
> > vqs = kmalloc(sizeof(*vqs) * num_vqs, GFP_KERNEL);
> > - if (!vqs)
> > - goto err_vqs;
> > + if (!names || !callbacks || !vqs) {
> > + err = -ENOMEM;
> > + goto out;
> > + }
>
> ...you could use the
>
> foo = kmalloc(...);
> if (!foo)
> goto out;
>
> sequence in any case. This avoids trying again and again if e.g. the
> names allocation already failed.
For this implementation, I have referred others which calls
vdev->config->find_vqs as well. Yes, this continues trying to allocate
memory, although memory allocation failed before.
>
> Alternatively, you should be fine if you don't init the variables to
> NULL: The code is now either taking an early exit or setting all of the
> variables anyway.
>
It's a big change if we refactor the helper ->find_vqs, since other
devices also call it.
Thanks
Minfei
next prev parent reply other threads:[~2016-07-18 16:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-18 14:01 [PATCH v2] virtio_blk: Fix a slient kernel panic Minfei Huang
2016-07-18 15:21 ` Cornelia Huck
2016-07-18 16:18 ` Minfei Huang [this message]
2016-07-18 16:25 ` Cornelia Huck
2016-07-19 0:37 ` Minfei Huang
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=20160718160421.GA20047@huangminfeis-MacBook-Pro.local \
--to=mnfhuang@gmail.com \
--cc=cornelia.huck@de.ibm.com \
--cc=fanc.fnst@cn.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=minfei.hmf@alibaba-inc.com \
--cc=mst@redhat.com \
--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).