[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <c92623d5-6a52-4d82-bc2a-da358ee1339c@huawei.com>
Date: Fri, 5 Dec 2025 17:52:17 +0800
From: Jason Yan <yanaijie@...wei.com>
To: Chaohai Chen <wdhh6@...yun.com>, <john.g.garry@...cle.com>,
<James.Bottomley@...senPartnership.com>, <martin.petersen@...cle.com>
CC: <dlemoal@...nel.org>, <linux-scsi@...r.kernel.org>,
<linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] scsi: libsas: Add error handling in the
sas_register_phys()
在 2025/12/5 16:02, Chaohai Chen 写道:
> If an error is triggered in the loop process, we need to roll back
> the resources that have already been requested.
>
> Signed-off-by: Chaohai Chen <wdhh6@...yun.com>
> ---
> drivers/scsi/libsas/sas_phy.c | 21 ++++++++++++++++++---
> 1 file changed, 18 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/scsi/libsas/sas_phy.c b/drivers/scsi/libsas/sas_phy.c
> index 635835c28ecd..455118c7e889 100644
> --- a/drivers/scsi/libsas/sas_phy.c
> +++ b/drivers/scsi/libsas/sas_phy.c
> @@ -116,6 +116,7 @@ static void sas_phye_shutdown(struct work_struct *work)
> int sas_register_phys(struct sas_ha_struct *sas_ha)
> {
> int i;
> + int ret = 0;
>
> /* Now register the phys. */
> for (i = 0; i < sas_ha->num_phys; i++) {
> @@ -132,8 +133,10 @@ int sas_register_phys(struct sas_ha_struct *sas_ha)
> phy->frame_rcvd_size = 0;
>
> phy->phy = sas_phy_alloc(&sas_ha->shost->shost_gendev, i);
> - if (!phy->phy)
> - return -ENOMEM;
> + if (!phy->phy) {
> + ret = -ENOMEM;
> + goto fail;
> + }
>
> phy->phy->identify.initiator_port_protocols =
> phy->iproto;
> @@ -146,10 +149,22 @@ int sas_register_phys(struct sas_ha_struct *sas_ha)
> phy->phy->maximum_linkrate = SAS_LINK_RATE_UNKNOWN;
> phy->phy->negotiated_linkrate = SAS_LINK_RATE_UNKNOWN;
>
> - sas_phy_add(phy->phy);
> + ret = sas_phy_add(phy->phy);
> + if (ret) {
> + sas_phy_free(phy->phy);
> + goto fail;
> + }
> }
>
> return 0;
> +fail:
> + for (i--; i >= 0; i--) {
> + struct asd_sas_phy *phy = sas_ha->sas_phy[i];
> +
> + sas_phy_delete(phy->phy);
> + sas_phy_free(phy);
> + }
> + return ret;
> }
>
> const work_func_t sas_phy_event_fns[PHY_NUM_EVENTS] = {
Since you are at it, you should also complete Undo_phys label in
sas_register_ha().
Thanks,
祝一切顺利
Powered by blists - more mailing lists