scsi: libsas: Set port when ex_phy is added or deleted

We found that when ex_phy was attached and added to the parent wide port,
ex_phy->port was not set, resulting in sas_unregister_devs_sas_addr() not
calling sas_port_delete_phy() when deleting the phy, and the deleted phy
was still on the parent wide port's phy_list.

When we use sas_port_add_ex_phy() to set ex_phy->port to solve the above
problem, we find that after all the phys of the parent_port are removed and
the number of phy becomes 0, the parent_port will not be set to NULL.  This
causes the freed parent port to be used when attaching a new ex_phy in
sas_ex_add_parent_port().

Use sas_port_add_ex_phy() instead of sas_port_add_phy() to set ex_phy->port
when ex_phy is added to the parent port, and set ex_dev->parent_port to
NULL when the number of phy on the port becomes 0.

Signed-off-by: Xingui Yang <yangxingui@huawei.com>
Link: https://lore.kernel.org/r/20240312141103.31358-4-yangxingui@huawei.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index 5f5b261038dbf48dee8d8e61faf6834b11bd7c2f..a4e05dac63d416456fb7b581c604cf44f6c3fdfa 100644 (file)
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -45,7 +45,7 @@ static void sas_ex_add_parent_port(struct domain_device *dev, int phy_id)
                BUG_ON(sas_port_add(ex->parent_port));
                sas_port_mark_backlink(ex->parent_port);
        }
-       sas_port_add_phy(ex->parent_port, ex_phy->phy);
+       sas_port_add_ex_phy(ex->parent_port, ex_phy);
 }
 
 /* ---------- SMP task management ---------- */
@@ -1864,9 +1864,12 @@ static void sas_unregister_devs_sas_addr(struct domain_device *parent,
        if (phy->port) {
                sas_port_delete_phy(phy->port, phy->phy);
                sas_device_set_phy(found, phy->port);
-               if (phy->port->num_phys == 0)
+               if (phy->port->num_phys == 0) {
                        list_add_tail(&phy->port->del_list,
                                &parent->port->sas_port_del_list);
+                       if (ex_dev->parent_port == phy->port)
+                               ex_dev->parent_port = NULL;
+               }
                phy->port = NULL;
        }
 }