From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752135AbcGRQSt (ORCPT <rfc822;w@1wt.eu>);
	Mon, 18 Jul 2016 12:18:49 -0400
Received: from mail-pf0-f193.google.com ([209.85.192.193]:36756 "EHLO
	mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751563AbcGRQSn (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 18 Jul 2016 12:18:43 -0400
From: Minfei Huang <mnfhuang@gmail.com>
X-Google-Original-From: Minfei Huang <mnghuan@gmail.com>
Date: Tue, 19 Jul 2016 00:18:32 +0800
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
Message-ID: <20160718160421.GA20047@huangminfeis-MacBook-Pro.local>
References: <1468850489-40157-1-git-send-email-mnghuan@gmail.com>
 <20160718172128.5b8c10b1.cornelia.huck@de.ibm.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20160718172128.5b8c10b1.cornelia.huck@de.ibm.com>
User-Agent: Mutt/1.5.24 (2015-08-30)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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