lkml.org 
[lkml]   [2020]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.5 119/150] scsi: Revert "RDMA/isert: Fix a recently introduced regression related to logout"
    Date
    From: Bart Van Assche <bvanassche@acm.org>

    commit 76261ada16dcc3be610396a46d35acc3efbda682 upstream.

    Since commit 04060db41178 introduces soft lockups when toggling network
    interfaces, revert it.

    Link: https://marc.info/?l=target-devel&m=158157054906196
    Cc: Rahul Kundu <rahul.kundu@chelsio.com>
    Cc: Mike Marciniszyn <mike.marciniszyn@intel.com>
    Cc: Sagi Grimberg <sagi@grimberg.me>
    Reported-by: Dakshaja Uppalapati <dakshaja@chelsio.com>
    Fixes: 04060db41178 ("scsi: RDMA/isert: Fix a recently introduced regression related to logout")
    Signed-off-by: Bart Van Assche <bvanassche@acm.org>
    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, 15 insertions(+), 3 deletions(-)

    --- a/drivers/infiniband/ulp/isert/ib_isert.c
    +++ b/drivers/infiniband/ulp/isert/ib_isert.c
    @@ -2575,6 +2575,17 @@ 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
    @@ -2622,6 +2633,7 @@ 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
    @@ -4149,6 +4149,9 @@ 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
    @@ -4234,9 +4237,6 @@ 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;

    \
     
     \ /
      Last update: 2020-02-27 15:17    [W:4.046 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site