Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

scsi: hisi_sas: Fix SATA devices missing issue during I_T nexus reset

SATA devices on an expander may be removed and not be found again when I_T
nexus reset and revalidation are processed simultaneously.

The issue comes from:

- Revalidation can remove SATA devices in link reset, e.g. in
hisi_sas_clear_nexus_ha().

- However, hisi_sas_debug_I_T_nexus_reset() polls the state of a SATA
device on an expander after sending link_reset, where it calls:
hisi_sas_debug_I_T_nexus_reset
sas_ata_wait_after_reset
ata_wait_after_reset
ata_wait_ready
smp_ata_check_ready
sas_ex_phy_discover
sas_ex_phy_discover_helper
sas_set_ex_phy

The ex_phy's change count is updated in sas_set_ex_phy(), so SATA
devices after a link reset may not be found later through revalidation.

A similar issue was reported in:
commit 0f3fce5cc77e ("[SCSI] libsas: fix ata_eh clobbering ex_phys via
smp_ata_check_ready")
commit 87c8331fcf72 ("[SCSI] libsas: prevent domain rediscovery competing
with ata error handling").

To address this issue, in hisi_sas_debug_I_T_nexus_reset(), we now call
smp_ata_check_ready_type() that only polls the device type while not
updating the ex_phy's data of libsas.

Fixes: 71453bd9d1bf ("scsi: hisi_sas: Use sas_ata_wait_after_reset() in IT nexus reset")
Signed-off-by: Jie Zhan <zhanjie9@hisilicon.com>
Link: https://lore.kernel.org/r/20221118083714.4034612-5-zhanjie9@hisilicon.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Jie Zhan and committed by
Martin K. Petersen
3c2673a0 9181ce3c

+5 -3
+5 -3
drivers/scsi/hisi_sas/hisi_sas_main.c
··· 1694 1694 return rc; 1695 1695 } 1696 1696 1697 + /* Remote phy */ 1697 1698 if (rc) 1698 1699 return rc; 1699 1700 1700 - /* Remote phy */ 1701 1701 if (dev_is_sata(device)) { 1702 - rc = sas_ata_wait_after_reset(device, 1703 - HISI_SAS_WAIT_PHYUP_TIMEOUT); 1702 + struct ata_link *link = &device->sata_dev.ap->link; 1703 + 1704 + rc = ata_wait_after_reset(link, HISI_SAS_WAIT_PHYUP_TIMEOUT, 1705 + smp_ata_check_ready_type); 1704 1706 } else { 1705 1707 msleep(2000); 1706 1708 }