Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753021AbbF1Xlp (ORCPT ); Sun, 28 Jun 2015 19:41:45 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:36516 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752822AbbF1Xlj (ORCPT ); Sun, 28 Jun 2015 19:41:39 -0400 Subject: Re: [PATCH 2/2] vfio: powerpc/spapr: One function call less in tce_iommu_attach_group() after kzalloc() failure To: SF Markus Elfring , Alex Williamson , kvm@vger.kernel.org References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> <55901E68.80205@users.sourceforge.net> <55901FAC.1090109@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall , Michael Ellerman From: Alexey Kardashevskiy Message-ID: <5590862A.3010603@ozlabs.ru> Date: Mon, 29 Jun 2015 09:41:30 +1000 User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0.1 MIME-Version: 1.0 In-Reply-To: <55901FAC.1090109@users.sourceforge.net> Content-Type: text/plain; charset=koi8-r; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1807 Lines: 55 On 06/29/2015 02:24 AM, SF Markus Elfring wrote: > From: Markus Elfring > Date: Sun, 28 Jun 2015 17:58:42 +0200 > > The kfree() function was called even if a previous memory allocation > try failed. tcegrp will be NULL and kfree() can handle this just fine (is not it the whole point of this patchset - remove the check and just call kfree() even if the pointer is NULL?). And if you wanted another label, than the existing one should have been renamed to "free_exit" or "free_unlock_exit" and new one would be "unlock_exit". > This implementation detail could be improved by the introduction > of another jump label. > > Signed-off-by: Markus Elfring > --- > drivers/vfio/vfio_iommu_spapr_tce.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/vfio/vfio_iommu_spapr_tce.c b/drivers/vfio/vfio_iommu_spapr_tce.c > index 50ddfac..2523075 100644 > --- a/drivers/vfio/vfio_iommu_spapr_tce.c > +++ b/drivers/vfio/vfio_iommu_spapr_tce.c > @@ -1200,7 +1200,7 @@ static int tce_iommu_attach_group(void *iommu_data, > tcegrp = kzalloc(sizeof(*tcegrp), GFP_KERNEL); > if (!tcegrp) { > ret = -ENOMEM; > - goto unlock_exit; > + goto unlock_container; > } > > if (!table_group->ops || !table_group->ops->take_ownership || > @@ -1217,7 +1217,7 @@ static int tce_iommu_attach_group(void *iommu_data, > unlock_exit: > if (ret) > kfree(tcegrp); > - > +unlock_container: > mutex_unlock(&container->lock); > > return ret; > -- Alexey -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/