From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424005AbcBQQkz (ORCPT ); Wed, 17 Feb 2016 11:40:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44426 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422903AbcBQQkx (ORCPT ); Wed, 17 Feb 2016 11:40:53 -0500 Subject: Re: [PATCH 1/2] mpt3sas: Deallocate resources before trying reallocation of the same in _base_allocate_memory_pools() To: Johannes Thumshirn , Chaitra P B References: <1455708326-7584-1-git-send-email-chaitra.basappa@broadcom.com> <1455708326-7584-2-git-send-email-chaitra.basappa@broadcom.com> <20160217113639.GK18134@c203.arch.suse.de> Cc: JBottomley@Parallels.com, jejb@kernel.org, hch@infradead.org, martin.petersen@oracle.com, linux-scsi@vger.kernel.org, Sathya.Prakash@avagotech.com, kashyap.desai@avagotech.com, krishnaraddi.mankani@avagotech.com, linux-kernel@vger.kernel.org, suganath-prabu.subramani@broadcom.com, sreekanth.reddy@broadcom.com From: Tomas Henzl Message-ID: <56C4A291.602@redhat.com> Date: Wed, 17 Feb 2016 17:40:49 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 MIME-Version: 1.0 In-Reply-To: <20160217113639.GK18134@c203.arch.suse.de> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 17.2.2016 12:36, Johannes Thumshirn wrote: > On Wed, Feb 17, 2016 at 04:55:25PM +0530, Chaitra P B wrote: >> Deallocates resources before reallocating of the same in retry_allocation >> path of _base_allocate_memory_pools() >> >> Signed-off-by: Chaitra P B >> Suganath prabu Subramani >> --- >> drivers/scsi/mpt3sas/mpt3sas_base.c | 7 +++++-- >> 1 file changed, 5 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c >> index f59495b..60c2e86 100644 >> --- a/drivers/scsi/mpt3sas/mpt3sas_base.c >> +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c >> @@ -3124,8 +3124,10 @@ _base_release_memory_pools(struct MPT3SAS_ADAPTER *ioc) >> free_pages((ulong)ioc->scsi_lookup, ioc->scsi_lookup_pages); >> ioc->scsi_lookup = NULL; >> } >> - kfree(ioc->hpr_lookup); >> - kfree(ioc->internal_lookup); >> + if (ioc->hpr_lookup) >> + kfree(ioc->hpr_lookup); >> + if (ioc->internal_lookup) >> + kfree(ioc->internal_lookup); > kfree() can handle NULL pointers as arguments, so checking isn't needed. In > fact there are coccinelle scripts to check for it (make coccicheck) and it'll > spawn patches from people "fixing" it. So please get rid of the checks. > > Otherwise > > Reviewed-by: Johannes Thumshirn > >> if (ioc->chain_lookup) { >> for (i = 0; i < ioc->chain_depth; i++) { >> if (ioc->chain_lookup[i].chain_buffer) >> @@ -3360,6 +3362,7 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc, int sleep_flag) >> goto out; >> retry_sz += 64; >> ioc->hba_queue_depth = max_request_credit - retry_sz; >> + _base_release_memory_pools(ioc); >> goto retry_allocation; Thanks for posting Reviewed-by: Tomas Henzl