scsi: libsas: Fix disk not being scanned in after being removed
Subsystems (2)
v4 cover scsi: libsas: Fix disk not being scanned in after being removed
This patch series fixes an issue when do discovery on an empty PHY to update PHY info after device unregister could cause newly connected device to not be scanned.
Changes since v3:
- Revert to allocating the resp memory with alloc_smp_resp().
- Optimize goto statement.
Changes since v2:
- Based on John's suggestion, allow smp_execute_task() arguments to be on the stack.
- Based on John's suggestion, add a helper sas_get_sas_addr_and_dev_type.
- Updated comments.
Changes since v1:
- Use sas_get_phy_discover() instead of sas_get_phy_attached_dev() in sas_rediscover_dev() and use disc_resp to update phy info.
Xingui Yang (2):
scsi: libsas: Add a helper sas_get_sas_addr_and_dev_type()
scsi: libsas: Fix disk not being scanned in after being removed
drivers/scsi/libsas/sas_expander.c | 51 ++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 17 deletions(-)
Signature · 1 line
2.17.1
PATCH v4 1/2 scsi: libsas: Add a helper sas_get_sas_addr_and_dev_type()
Add a helper to get attached_sas_addr and device type from disc_resp.
--- drivers/scsi/libsas/sas_expander.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
drivers/scsi/libsas/sas_expander.c +12 -7
@@ -1631,6 +1631,16 @@ int sas_discover_root_expander(struct domain_device *dev)/* ---------- Domain revalidation ---------- */ +static void sas_get_sas_addr_and_dev_type (struct smp_disc_resp *disc_resp, +u8 *sas_addr, +enum sas_device_type *type) +{ +memcpy (sas_addr, disc_resp->disc.attached_sas_addr,SAS_ADDR_SIZE ); + *type =to_dev_type (&disc_resp->disc); +if (*type ==SAS_PHY_UNUSED ) +memset (sas_addr,0 ,SAS_ADDR_SIZE ); +} +static int sas_get_phy_discover (struct domain_device *dev,int phy_id,struct smp_disc_resp *disc_resp) {
@@ -1684,13 +1694,8 @@ int sas_get_phy_attached_dev(struct domain_device *dev, int phy_id,return -ENOMEM ; res =sas_get_phy_discover (dev, phy_id, disc_resp); -if (res ==0 ) { -memcpy (sas_addr, disc_resp->disc.attached_sas_addr, -SAS_ADDR_SIZE ); - *type =to_dev_type (&disc_resp->disc); -if (*type ==0 ) -memset (sas_addr,0 ,SAS_ADDR_SIZE ); - } +if (res ==0 ) +sas_get_sas_addr_and_dev_type (disc_resp, sas_addr, type);kfree (disc_resp);return res; }
Signature · 1 line
2.17.1
PATCH v4 2/2 scsi: libsas: Fix disk not being scanned in after being removed
In reply to Xingui YangAs of commit d8649fc1c5e4 ("scsi: libsas: Do discovery on empty PHY to update PHY info"), do discovery will send a new SMP_DISCOVER and update phy->phy_change_count. We found that if the disk is reconnected and phy change_count changes at this time, the disk scanning process will not be triggered.
Therefore, call sas_set_ex_phy() to update the PHY info with the results of the last query. And because the previous phy info will be used when calling sas_unregister_devs_sas_addr(), sas_unregister_devs_sas_addr() should be called before sas_set_ex_phy().
--- drivers/scsi/libsas/sas_expander.c | 32 ++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-)
drivers/scsi/libsas/sas_expander.c +22 -10
@@ -1955,6 +1955,7 @@ static int sas_rediscover_dev(struct domain_device *dev, int phy_id,struct expander_device *ex = &dev->ex_dev;struct ex_phy *phy = &ex->ex_phy[phy_id];enum sas_device_type type =SAS_PHY_UNUSED ; +struct smp_disc_resp *disc_resp;u8 sas_addr[SAS_ADDR_SIZE ];char msg[80 ] ="" ;int res;
@@ -1966,33 +1967,41 @@ static int sas_rediscover_dev(struct domain_device *dev, int phy_id, SAS_ADDR(dev->sas_addr), phy_id, msg);memset (sas_addr,0 ,SAS_ADDR_SIZE ); - res =sas_get_phy_attached_dev (dev, phy_id, sas_addr, &type); + disc_resp =alloc_smp_resp (DISCOVER_RESP_SIZE ); +if (!disc_resp) +return -ENOMEM ; + + res =sas_get_phy_discover (dev, phy_id, disc_resp);switch (res) {case SMP_RESP_NO_PHY : phy->phy_state =PHY_NOT_PRESENT ;sas_unregister_devs_sas_addr (dev, phy_id, last); -return res; + goto out_free_resp;case SMP_RESP_PHY_VACANT : phy->phy_state =PHY_VACANT ;sas_unregister_devs_sas_addr (dev, phy_id, last); -return res; + goto out_free_resp;case SMP_RESP_FUNC_ACC :break ;case -ECOMM :break ;default : -return res; + goto out_free_resp; } +if (res ==0 ) +sas_get_sas_addr_and_dev_type (disc_resp, sas_addr, &type); +if ((SAS_ADDR (sas_addr) ==0 ) || (res == -ECOMM )) { phy->phy_state =PHY_EMPTY ;sas_unregister_devs_sas_addr (dev, phy_id, last);/* -* Even though the PHY is empty, for convenience we discover -* the PHY to update the PHY info, like negotiated linkrate. +* Even though the PHY is empty, for convenience we update +* the PHY info, like negotiated linkrate. */ -sas_ex_phy_discover (dev, phy_id); -return res; +if (res ==0 ) +sas_set_ex_phy (dev, phy_id, disc_resp); + goto out_free_resp; }else if (SAS_ADDR (sas_addr) ==SAS_ADDR (phy->attached_sas_addr) &&dev_type_flutter (type, phy->attached_dev_type)) {struct domain_device *ata_dev =sas_ex_to_ata (dev, phy_id);
@@ -2004,7 +2013,7 @@ static int sas_rediscover_dev(struct domain_device *dev, int phy_id, action =", needs recovery" ;pr_debug ("ex %016llx phy%02d broadcast flutter%s\n" ,SAS_ADDR (dev->sas_addr), phy_id, action); -return res; + goto out_free_resp; }/* we always have to delete the old device when we went here */
@@ -2013,7 +2022,10 @@ static int sas_rediscover_dev(struct domain_device *dev, int phy_id, SAS_ADDR(phy->attached_sas_addr));sas_unregister_devs_sas_addr (dev, phy_id, last); -return sas_discover_new (dev, phy_id); + res =sas_discover_new (dev, phy_id); +out_free_resp: +kfree (disc_resp); +return res; }/**
Signature · 1 line
2.17.1