| From 04060db41178c7c244f2c7dcd913e7fd331de915 Mon Sep 17 00:00:00 2001 |
| From: Bart Van Assche <bvanassche@acm.org> |
| Date: Wed, 15 Jan 2020 20:47:37 -0800 |
| Subject: scsi: RDMA/isert: Fix a recently introduced regression related to logout |
| |
| From: Bart Van Assche <bvanassche@acm.org> |
| |
| commit 04060db41178c7c244f2c7dcd913e7fd331de915 upstream. |
| |
| iscsit_close_connection() calls isert_wait_conn(). Due to commit |
| e9d3009cb936 both functions call target_wait_for_sess_cmds() although that |
| last function should be called only once. Fix this by removing the |
| target_wait_for_sess_cmds() call from isert_wait_conn() and by only calling |
| isert_wait_conn() after target_wait_for_sess_cmds(). |
| |
| Fixes: e9d3009cb936 ("scsi: target: iscsi: Wait for all commands to finish before freeing a session"). |
| Link: https://lore.kernel.org/r/20200116044737.19507-1-bvanassche@acm.org |
| Reported-by: Rahul Kundu <rahul.kundu@chelsio.com> |
| Signed-off-by: Bart Van Assche <bvanassche@acm.org> |
| Tested-by: Mike Marciniszyn <mike.marciniszyn@intel.com> |
| Acked-by: Sagi Grimberg <sagi@grimberg.me> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/infiniband/ulp/isert/ib_isert.c | 12 ------------ |
| drivers/target/iscsi/iscsi_target.c | 6 +++--- |
| 2 files changed, 3 insertions(+), 15 deletions(-) |
| |
| --- a/drivers/infiniband/ulp/isert/ib_isert.c |
| +++ b/drivers/infiniband/ulp/isert/ib_isert.c |
| @@ -2555,17 +2555,6 @@ isert_wait4logout(struct isert_conn *ise |
| } |
| } |
| |
| -static void |
| -isert_wait4cmds(struct iscsi_conn *conn) |
| -{ |
| - isert_info("iscsi_conn %p\n", conn); |
| - |
| - if (conn->sess) { |
| - target_sess_cmd_list_set_waiting(conn->sess->se_sess); |
| - target_wait_for_sess_cmds(conn->sess->se_sess); |
| - } |
| -} |
| - |
| /** |
| * isert_put_unsol_pending_cmds() - Drop commands waiting for |
| * unsolicitate dataout |
| @@ -2613,7 +2602,6 @@ static void isert_wait_conn(struct iscsi |
| |
| ib_drain_qp(isert_conn->qp); |
| isert_put_unsol_pending_cmds(conn); |
| - isert_wait4cmds(conn); |
| isert_wait4logout(isert_conn); |
| |
| queue_work(isert_release_wq, &isert_conn->release_work); |
| --- a/drivers/target/iscsi/iscsi_target.c |
| +++ b/drivers/target/iscsi/iscsi_target.c |
| @@ -4162,9 +4162,6 @@ int iscsit_close_connection( |
| iscsit_stop_nopin_response_timer(conn); |
| iscsit_stop_nopin_timer(conn); |
| |
| - if (conn->conn_transport->iscsit_wait_conn) |
| - conn->conn_transport->iscsit_wait_conn(conn); |
| - |
| /* |
| * During Connection recovery drop unacknowledged out of order |
| * commands for this connection, and prepare the other commands |
| @@ -4250,6 +4247,9 @@ int iscsit_close_connection( |
| target_sess_cmd_list_set_waiting(sess->se_sess); |
| target_wait_for_sess_cmds(sess->se_sess); |
| |
| + if (conn->conn_transport->iscsit_wait_conn) |
| + conn->conn_transport->iscsit_wait_conn(conn); |
| + |
| ahash_request_free(conn->conn_tx_hash); |
| if (conn->conn_rx_hash) { |
| struct crypto_ahash *tfm; |