diff mbox series

zfcp: report port fc_security as unknown early during remote cable pull

Message ID 20210702160922.2667874-1-maier@linux.ibm.com (mailing list archive)
State Accepted
Headers show
Series zfcp: report port fc_security as unknown early during remote cable pull | expand

Commit Message

Steffen Maier July 2, 2021, 4:09 p.m. UTC 
On remote cable pull, a zfcp_port keeps its status and only gets
ZFCP_STATUS_PORT_LINK_TEST added. Only after an ADISC timeout,
we would actually start port recovery and remove
ZFCP_STATUS_COMMON_UNBLOCKED which zfcp_sysfs_port_fc_security_show()
detected and reported as "unknown" instead of the old and possibly stale
zfcp_port->connection_info.

Add check for ZFCP_STATUS_PORT_LINK_TEST for timely "unknown" report.

Signed-off-by: Steffen Maier <maier@linux.ibm.com>
Fixes: a17c78460093 ("scsi: zfcp: report FC Endpoint Security in sysfs")
Cc: <stable@vger.kernel.org> #5.7+
Reviewed-by: Benjamin Block <bblock@linux.ibm.com>
---

Martin, James, we have a small zfcp bugfix.
Would be nice if it could still make it into v5.14-rc1 merge window,
but I'm probably too late for that. v5.14-rc2 is fine, too.
Applies to 5.14/scsi-staging or 5.14/scsi-queue or James' misc branch,
or to the corresponding fixes branch(es).

 drivers/s390/scsi/zfcp_sysfs.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Martin K. Petersen July 13, 2021, 1:52 a.m. UTC | #1 
Steffen,

> On remote cable pull, a zfcp_port keeps its status and only gets
> ZFCP_STATUS_PORT_LINK_TEST added. Only after an ADISC timeout, we
> would actually start port recovery and remove
> ZFCP_STATUS_COMMON_UNBLOCKED which zfcp_sysfs_port_fc_security_show()
> detected and reported as "unknown" instead of the old and possibly
> stale zfcp_port->connection_info.
>
> Add check for ZFCP_STATUS_PORT_LINK_TEST for timely "unknown" report.

Applied to 5.14/scsi-fixes, thanks!
diff mbox series

Patch

diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c
index 544efd4c42f0..b8cd75a872ee 100644
--- a/drivers/s390/scsi/zfcp_sysfs.c
+++ b/drivers/s390/scsi/zfcp_sysfs.c
@@ -487,6 +487,7 @@  static ssize_t zfcp_sysfs_port_fc_security_show(struct device *dev,
 	if (0 == (status & ZFCP_STATUS_COMMON_OPEN) ||
 	    0 == (status & ZFCP_STATUS_COMMON_UNBLOCKED) ||
 	    0 == (status & ZFCP_STATUS_PORT_PHYS_OPEN) ||
+	    0 != (status & ZFCP_STATUS_PORT_LINK_TEST) ||
 	    0 != (status & ZFCP_STATUS_COMMON_ERP_FAILED) ||
 	    0 != (status & ZFCP_STATUS_COMMON_ACCESS_BOXED))
 		i = sprintf(buf, "unknown\n");