scsi: libsas: Add rollback handling when an error occurs

In sas_register_phys(), if an error is triggered in the loop process, we
need to roll back the resources that have already been requested.

Add sas_unregister_phys() when an error occurs in sas_register_ha().

[mkp: a few coding style tweaks and address John's comment]

Signed-off-by: Chaohai Chen <wdhh6@aliyun.com>
Reviewed-by: John Garry <john.g.garry@oracle.com>
Link: https://patch.msgid.link/20251206060616.69216-1-wdhh6@aliyun.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c
index 8566bb1208a057b8ac98a7da4878a9256bdd55f9..6b15ad1bcadabe8b2decff098a7f746c8b0eec61 100644 (file)
--- a/drivers/scsi/libsas/sas_init.c
+++ b/drivers/scsi/libsas/sas_init.c
@@ -141,6 +141,7 @@ Undo_event_q:
 Undo_ports:
        sas_unregister_ports(sas_ha);
 Undo_phys:
+       sas_unregister_phys(sas_ha);
 
        return error;
 }

diff --git a/drivers/scsi/libsas/sas_internal.h b/drivers/scsi/libsas/sas_internal.h
index da5408c701cddf0112e495e69e0f6c93287936e8..d104c87f04f5231729efc10d1afeb0ce7c7f74da 100644 (file)
--- a/drivers/scsi/libsas/sas_internal.h
+++ b/drivers/scsi/libsas/sas_internal.h
@@ -54,6 +54,7 @@ void sas_unregister_dev(struct asd_sas_port *port, struct domain_device *dev);
 void sas_scsi_recover_host(struct Scsi_Host *shost);
 
 int  sas_register_phys(struct sas_ha_struct *sas_ha);
+void sas_unregister_phys(struct sas_ha_struct *sas_ha);
 
 struct asd_sas_event *sas_alloc_event(struct asd_sas_phy *phy, gfp_t gfp_flags);
 void sas_free_event(struct asd_sas_event *event);

diff --git a/drivers/scsi/libsas/sas_phy.c b/drivers/scsi/libsas/sas_phy.c
index 635835c28ecd43dfeaaec4b9a5c6f2dd8f2dc651..58f08dc2c1872ce4cba350ff6f15f7064187bc7a 100644 (file)
--- 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 err;
 
        /* 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) {
+                       err = -ENOMEM;
+                       goto rollback;
+               }
 
                phy->phy->identify.initiator_port_protocols =
                        phy->iproto;
@@ -146,10 +149,34 @@ 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);
+               err = sas_phy_add(phy->phy);
+               if (err) {
+                       sas_phy_free(phy->phy);
+                       goto rollback;
+               }
        }
 
        return 0;
+rollback:
+       for (i-- ; i >= 0 ; i--) {
+               struct asd_sas_phy *phy = sas_ha->sas_phy[i];
+
+               sas_phy_delete(phy->phy);
+               sas_phy_free(phy->phy);
+       }
+       return err;
+}
+
+void sas_unregister_phys(struct sas_ha_struct *sas_ha)
+{
+       int i;
+
+       for (i = 0 ; i < sas_ha->num_phys ; i++) {
+               struct asd_sas_phy *phy = sas_ha->sas_phy[i];
+
+               sas_phy_delete(phy->phy);
+               sas_phy_free(phy->phy);
+       }
 }
 
 const work_func_t sas_phy_event_fns[PHY_NUM_EVENTS] = {