Commit 891e2639 authored by Mike Christie's avatar Mike Christie Committed by Martin K. Petersen
Browse files

scsi: iscsi: Stop queueing during ep_disconnect 

During ep_disconnect we have been doing iscsi_suspend_tx/queue to block new
I/O but every driver except cxgbi and iscsi_tcp can still get I/O from
__iscsi_conn_send_pdu() if we haven't called iscsi_conn_failure() before
ep_disconnect. This could happen if we were terminating the session, and
the logout timed out before it was even sent to libiscsi.

Fix the issue by adding a helper which reverses the bind_conn call that
allows new I/O to be queued. Drivers implementing ep_disconnect can use this
to make sure new I/O is not queued to them when handling the disconnect.

Link: https://lore.kernel.org/r/20210525181821.7617-3-michael.christie@oracle.com


Reviewed-by: default avatarLee Duncan <lduncan@suse.com>
Signed-off-by: default avatarMike Christie <michael.christie@oracle.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 1486a4f5

drivers/infiniband/ulp/iser/iscsi_iser.c

+1 −0
Original line number Diff line number Diff line
@@ -1002,6 +1002,7 @@ static struct iscsi_transport iscsi_iser_transport = { 
	/* connection management */

	.create_conn            = iscsi_iser_conn_create,

	.bind_conn              = iscsi_iser_conn_bind,

	.unbind_conn		= iscsi_conn_unbind,

	.destroy_conn           = iscsi_conn_teardown,

	.attr_is_visible	= iser_attr_is_visible,

	.set_param              = iscsi_iser_set_param,

drivers/scsi/be2iscsi/be_main.c

+1 −0
Original line number Diff line number Diff line
@@ -5807,6 +5807,7 @@ struct iscsi_transport beiscsi_iscsi_transport = { 
	.destroy_session = beiscsi_session_destroy,

	.create_conn = beiscsi_conn_create,

	.bind_conn = beiscsi_conn_bind,

	.unbind_conn = iscsi_conn_unbind,

	.destroy_conn = iscsi_conn_teardown,

	.attr_is_visible = beiscsi_attr_is_visible,

	.set_iface_param = beiscsi_iface_set_param,

drivers/scsi/bnx2i/bnx2i_iscsi.c

+1 −0
Original line number Diff line number Diff line
@@ -2276,6 +2276,7 @@ struct iscsi_transport bnx2i_iscsi_transport = { 
	.destroy_session	= bnx2i_session_destroy,

	.create_conn		= bnx2i_conn_create,

	.bind_conn		= bnx2i_conn_bind,

	.unbind_conn		= iscsi_conn_unbind,

	.destroy_conn		= bnx2i_conn_destroy,

	.attr_is_visible	= bnx2i_attr_is_visible,

	.set_param		= iscsi_set_param,

drivers/scsi/cxgbi/cxgb3i/cxgb3i.c

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ static struct iscsi_transport cxgb3i_iscsi_transport = { 
	/* connection management */

	.create_conn	= cxgbi_create_conn,

	.bind_conn	= cxgbi_bind_conn,

	.unbind_conn	= iscsi_conn_unbind,

	.destroy_conn	= iscsi_tcp_conn_teardown,

	.start_conn	= iscsi_conn_start,

	.stop_conn	= iscsi_conn_stop,

drivers/scsi/cxgbi/cxgb4i/cxgb4i.c

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ static struct iscsi_transport cxgb4i_iscsi_transport = { 
	/* connection management */

	.create_conn	= cxgbi_create_conn,

	.bind_conn		= cxgbi_bind_conn,

	.unbind_conn	= iscsi_conn_unbind,

	.destroy_conn	= iscsi_tcp_conn_teardown,

	.start_conn		= iscsi_conn_start,

	.stop_conn		= iscsi_conn_stop,