Commit fdafda4c authored Jan 04, 2023 by Li Nan Committed by Zheng Zengkai Jan 04, 2023

scsi: iscsi: remove .unbind_conn from iscsi_transport

hulk inclusion
category: bugfix
bugzilla: 188176, https://gitee.com/openeuler/kernel/issues/I67294


CVE: NA

-------------------------------

Commit 891e2639 ("scsi: iscsi: Stop queueing during ep_disconnect")
introduces .unbind_conn to fix the race between __iscsi_conn_send_pdu()
and .ep_disconnect, however it also introduces the KABI problem.

Considering the issue is only related with offload iscsi driver but not
iscsi_tcp, so tried to revert it, however the above commit is just one
patch in a patchset, the following patches depends on it and these
patches fix problem related with iscsi_tcp.

So just reverting it manually by removing .unbind_conn from
iscsi_transport.

Signed-off-by: Li Nan <linan122@huawei.com>
Reviewed-by: zhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>

parent 7838e133

drivers/infiniband/ulp/iser/iscsi_iser.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -989,7 +989,6 @@ 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

+0 −1

Original line number	Diff line number	Diff line
		@@ -5810,7 +5810,6 @@ 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

+0 −1

Original line number	Diff line number	Diff line
		@@ -2285,7 +2285,6 @@ 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

+0 −1

Original line number	Diff line number	Diff line
		@@ -117,7 +117,6 @@ 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

+0 −1

Original line number	Diff line number	Diff line
		@@ -134,7 +134,6 @@ 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,