From: Sreekanth Reddy <sreekanth.reddy@broadcom.com>
To: Damien Le Moal <Damien.LeMoal@wdc.com>
Cc: Johannes Thumshirn <Johannes.Thumshirn@wdc.com>,
"Martin K . Petersen" <martin.petersen@oracle.com>,
Sathya Prakash <sathya.prakash@broadcom.com>,
Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>,
"linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>
Subject: Re: [PATCH] scsi: mpt3sas: fix error returns in BRM_status_show
Date: Thu, 2 Jul 2020 13:14:17 +0530 [thread overview]
Message-ID: <CAK=zhgozmJ=HJjj1E6i6Y4nLtP=4nCSrMRRU8sF2crfAmatNAg@mail.gmail.com> (raw)
In-Reply-To: <CY4PR04MB3751A35F8324DC1D0B949720E76D0@CY4PR04MB3751.namprd04.prod.outlook.com>
On Thu, Jul 2, 2020 at 6:36 AM Damien Le Moal <Damien.LeMoal@wdc.com> wrote:
>
> On 2020/07/01 22:15, Johannes Thumshirn wrote:
> > BRM_status_show() has several error branches, but none of them record the
> > error in the error return.]
> >
> > Also while at it remove the manual mutex_unlock() of the pci_access_mutex
> > in case of an ongoing pci error recovery or host removal and jump to the
> > cleanup lable instead.
> >
> > Note: we can safely jump to out as from here as io_unit_pg3 is initialized
> > to NULL and if it hasn't been allocated kfree() skips the NULL pointer.
> >
> > Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
> > ---
> > drivers/scsi/mpt3sas/mpt3sas_ctl.c | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
> > index 62e552838565..70d2d0987249 100644
> > --- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c
> > +++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
> > @@ -3149,20 +3149,20 @@ BRM_status_show(struct device *cdev, struct device_attribute *attr,
> > }
> > /* pci_access_mutex lock acquired by sysfs show path */
> > mutex_lock(&ioc->pci_access_mutex);
> > - if (ioc->pci_error_recovery || ioc->remove_host) {
> > - mutex_unlock(&ioc->pci_access_mutex);
> > - return 0;
> > - }
> > + if (ioc->pci_error_recovery || ioc->remove_host)
> > + goto out;
> >
> > /* allocate upto GPIOVal 36 entries */
> > sz = offsetof(Mpi2IOUnitPage3_t, GPIOVal) + (sizeof(u16) * 36);
> > io_unit_pg3 = kzalloc(sz, GFP_KERNEL);
> > if (!io_unit_pg3) {
> > + rc = -ENOMEM;
> > ioc_err(ioc, "%s: failed allocating memory for iounit_pg3: (%d) bytes\n",
> > __func__, sz);
> > goto out;
> > }
> >
> > + rc = -EINVAL;
> > if (mpt3sas_config_get_iounit_pg3(ioc, &mpi_reply, io_unit_pg3, sz) !=
> > 0) {
> > ioc_err(ioc, "%s: failed reading iounit_pg3\n",
> >
>
> Looks good.
>
> Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
Patch looks good.
Acked-by: sreekanth reddy <sreekanth.reddy@broadcom.com>
Thanks,
Sreekanth
>
> --
> Damien Le Moal
> Western Digital Research
next prev parent reply other threads:[~2020-07-02 7:44 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-01 13:14 [PATCH] scsi: mpt3sas: fix error returns in BRM_status_show Johannes Thumshirn
2020-07-02 1:06 ` Damien Le Moal
2020-07-02 7:44 ` Sreekanth Reddy [this message]
2020-07-03 4:02 ` Martin K. Petersen
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='CAK=zhgozmJ=HJjj1E6i6Y4nLtP=4nCSrMRRU8sF2crfAmatNAg@mail.gmail.com' \
--to=sreekanth.reddy@broadcom.com \
--cc=Damien.LeMoal@wdc.com \
--cc=Johannes.Thumshirn@wdc.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=sathya.prakash@broadcom.com \
--cc=suganath-prabu.subramani@broadcom.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).