From patchwork Thu Apr 14 01:49:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenchao Hao X-Patchwork-Id: 12811988 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9A547C433F5 for ; Wed, 13 Apr 2022 12:39:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235564AbiDMMlU (ORCPT ); Wed, 13 Apr 2022 08:41:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229528AbiDMMlR (ORCPT ); Wed, 13 Apr 2022 08:41:17 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80F2F4BB87; Wed, 13 Apr 2022 05:38:55 -0700 (PDT) Received: from dggpemm500022.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4KdhtR75THzgYj8; Wed, 13 Apr 2022 20:37:03 +0800 (CST) Received: from dggpemm500017.china.huawei.com (7.185.36.178) by dggpemm500022.china.huawei.com (7.185.36.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 13 Apr 2022 20:38:53 +0800 Received: from huawei.com (10.175.101.6) by dggpemm500017.china.huawei.com (7.185.36.178) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 13 Apr 2022 20:38:53 +0800 From: Wenchao Hao To: Mike Christie , Lee Duncan , Chris Leech , "James E . J . Bottomley" , "Martin K . Petersen" , , , CC: , Wenchao Hao Subject: [PATCH 1/2] scsi: iscsi: introduce session UNBOUND state to avoid multiple unbind event Date: Wed, 13 Apr 2022 21:49:46 -0400 Message-ID: <20220414014947.4168447-2-haowenchao@huawei.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220414014947.4168447-1-haowenchao@huawei.com> References: <20220414014947.4168447-1-haowenchao@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm500017.china.huawei.com (7.185.36.178) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Fix the issue of kernel send multiple ISCSI_KEVENT_UNBIND_SESSION event. If session is in UNBOUND state, do not perform unbind operations anymore, else unbind session and set session to UNBOUND state. Reference:https://github.com/open-iscsi/open-iscsi/issues/338 Signed-off-by: Wenchao Hao --- drivers/scsi/scsi_transport_iscsi.c | 19 +++++++++++++++++-- include/scsi/scsi_transport_iscsi.h | 1 + 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c index 27951ea05dd4..97a9fee02efa 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c @@ -1656,6 +1656,7 @@ static struct { { ISCSI_SESSION_LOGGED_IN, "LOGGED_IN" }, { ISCSI_SESSION_FAILED, "FAILED" }, { ISCSI_SESSION_FREE, "FREE" }, + { ISCSI_SESSION_UNBOUND, "UNBOUND" }, }; static const char *iscsi_session_state_name(int state) @@ -1686,6 +1687,9 @@ int iscsi_session_chkready(struct iscsi_cls_session *session) case ISCSI_SESSION_FREE: err = DID_TRANSPORT_FAILFAST << 16; break; + case ISCSI_SESSION_UNBOUND: + err = DID_NO_CONNECT << 16; + break; default: err = DID_NO_CONNECT << 16; break; @@ -1838,7 +1842,8 @@ int iscsi_block_scsi_eh(struct scsi_cmnd *cmd) spin_lock_irqsave(&session->lock, flags); while (session->state != ISCSI_SESSION_LOGGED_IN) { - if (session->state == ISCSI_SESSION_FREE) { + if ((session->state == ISCSI_SESSION_FREE) || + (session->state == ISCSI_SESSION_UNBOUND)) { ret = FAST_IO_FAIL; break; } @@ -1869,6 +1874,7 @@ static void session_recovery_timedout(struct work_struct *work) break; case ISCSI_SESSION_LOGGED_IN: case ISCSI_SESSION_FREE: + case ISCSI_SESSION_UNBOUND: /* we raced with the unblock's flush */ spin_unlock_irqrestore(&session->lock, flags); return; @@ -1957,6 +1963,14 @@ static void __iscsi_unbind_session(struct work_struct *work) unsigned long flags; unsigned int target_id; + spin_lock_irqsave(&session->lock, flags); + if (session->state == ISCSI_SESSION_UNBOUND) { + spin_unlock_irqrestore(&session->lock, flags); + return; + } + session->state = ISCSI_SESSION_UNBOUND; + spin_unlock_irqrestore(&session->lock, flags); + ISCSI_DBG_TRANS_SESSION(session, "Unbinding session\n"); /* Prevent new scans and make sure scanning is not in progress */ @@ -4329,7 +4343,8 @@ store_priv_session_##field(struct device *dev, \ struct iscsi_cls_session *session = \ iscsi_dev_to_session(dev->parent); \ if ((session->state == ISCSI_SESSION_FREE) || \ - (session->state == ISCSI_SESSION_FAILED)) \ + (session->state == ISCSI_SESSION_FAILED) || \ + (session->state == ISCSI_SESSION_UNBOUND)) \ return -EBUSY; \ if (strncmp(buf, "off", 3) == 0) { \ session->field = -1; \ diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h index 38e4a67f5922..80149643cbcd 100644 --- a/include/scsi/scsi_transport_iscsi.h +++ b/include/scsi/scsi_transport_iscsi.h @@ -232,6 +232,7 @@ enum { ISCSI_SESSION_LOGGED_IN, ISCSI_SESSION_FAILED, ISCSI_SESSION_FREE, + ISCSI_SESSION_UNBOUND, }; #define ISCSI_MAX_TARGET -1 From patchwork Thu Apr 14 01:49:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenchao Hao X-Patchwork-Id: 12811989 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7ACCC4332F for ; Wed, 13 Apr 2022 12:39:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235568AbiDMMlV (ORCPT ); Wed, 13 Apr 2022 08:41:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233208AbiDMMlS (ORCPT ); Wed, 13 Apr 2022 08:41:18 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F11550E35; Wed, 13 Apr 2022 05:38:56 -0700 (PDT) Received: from dggpemm500023.china.huawei.com (unknown [172.30.72.53]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4Kdhqc1xJgzBsKf; Wed, 13 Apr 2022 20:34:36 +0800 (CST) Received: from dggpemm500017.china.huawei.com (7.185.36.178) by dggpemm500023.china.huawei.com (7.185.36.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 13 Apr 2022 20:38:54 +0800 Received: from huawei.com (10.175.101.6) by dggpemm500017.china.huawei.com (7.185.36.178) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 13 Apr 2022 20:38:53 +0800 From: Wenchao Hao To: Mike Christie , Lee Duncan , Chris Leech , "James E . J . Bottomley" , "Martin K . Petersen" , , , CC: , Wenchao Hao Subject: [PATCH 2/2] iscsi: set session to FREE state after unbind session in remove session Date: Wed, 13 Apr 2022 21:49:47 -0400 Message-ID: <20220414014947.4168447-3-haowenchao@huawei.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220414014947.4168447-1-haowenchao@huawei.com> References: <20220414014947.4168447-1-haowenchao@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm500017.china.huawei.com (7.185.36.178) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org __iscsi_unbind_session() set session state to ISCSI_SESSION_UNBOUND, which would overwrite the ISCSI_SESSION_FREE state. Signed-off-by: Wenchao Hao --- drivers/scsi/scsi_transport_iscsi.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c index 97a9fee02efa..d8dd9279cea8 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c @@ -2173,6 +2173,22 @@ void iscsi_remove_session(struct iscsi_cls_session *session) if (!cancel_work_sync(&session->block_work)) cancel_delayed_work_sync(&session->recovery_work); cancel_work_sync(&session->unblock_work); + + scsi_target_unblock(&session->dev, SDEV_TRANSPORT_OFFLINE); + /* + * qla4xxx can perform it's own scans when it runs in kernel only + * mode. Make sure to flush those scans. + */ + flush_work(&session->scan_work); + + /* + * flush running unbind operations + * if unbind work did not queued, call __iscsi_unbind_session + * directly to perform target remove + */ + if (!flush_work(&session->unbind_work)) + __iscsi_unbind_session(&session->unbind_work); + /* * If we are blocked let commands flow again. The lld or iscsi * layer should set up the queuecommand to fail commands. @@ -2183,16 +2199,6 @@ void iscsi_remove_session(struct iscsi_cls_session *session) session->state = ISCSI_SESSION_FREE; spin_unlock_irqrestore(&session->lock, flags); - scsi_target_unblock(&session->dev, SDEV_TRANSPORT_OFFLINE); - /* - * qla4xxx can perform it's own scans when it runs in kernel only - * mode. Make sure to flush those scans. - */ - flush_work(&session->scan_work); - /* flush running unbind operations */ - flush_work(&session->unbind_work); - __iscsi_unbind_session(&session->unbind_work); - /* hw iscsi may not have removed all connections from session */ err = device_for_each_child(&session->dev, NULL, iscsi_iter_destroy_conn_fn);