From patchwork Wed Feb 8 22:24:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 9563617 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 524B76020F for ; Wed, 8 Feb 2017 22:27:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 25CE02840B for ; Wed, 8 Feb 2017 22:27:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1A8CC2852B; Wed, 8 Feb 2017 22:27:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6F1E42840B for ; Wed, 8 Feb 2017 22:27:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751764AbdBHW11 (ORCPT ); Wed, 8 Feb 2017 17:27:27 -0500 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:63830 "EHLO esa2.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751301AbdBHW1Z (ORCPT ); Wed, 8 Feb 2017 17:27:25 -0500 X-IronPort-AV: E=Sophos;i="5.35,348,1483977600"; d="scan'208";a="76618134" Received: from unknown (HELO milsmgep15.sandisk.com) ([63.163.107.21]) by ob1.hgst.iphmx.com with ESMTP; 09 Feb 2017 06:28:18 +0800 Received: from MILHUBIP03.sdcorp.global.sandisk.com (Unknown_Domain [10.201.67.162]) (using TLS with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by (Symantec Messaging Gateway) with SMTP id 53.54.57638.9CA9B985; Wed, 8 Feb 2017 14:25:13 -0800 (PST) Received: from milsmgip12.sandisk.com (10.177.9.6) by MILHUBIP03.sdcorp.global.sandisk.com (10.177.9.96) with Microsoft SMTP Server id 14.3.319.2; Wed, 8 Feb 2017 14:25:11 -0800 X-AuditID: 0ac94369-26dee9800001e126-f1-589b9ac97502 Received: from exp-402881.sdcorp.global.sandisk.com ( [10.177.9.6]) by (Symantec Messaging Gateway) with SMTP id 50.42.18148.7CA9B985; Wed, 8 Feb 2017 14:25:11 -0800 (PST) From: Bart Van Assche To: Bart Van Assche CC: , Himanshu Madhani , Giridhar Malavali Subject: [PATCH v4 09/37] target: Make it possible to specify I_T nexus for SCSI abort Date: Wed, 8 Feb 2017 14:24:39 -0800 Message-ID: <20170208222507.25715-10-bart.vanassche@sandisk.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170208222507.25715-1-bart.vanassche@sandisk.com> References: <20170208222507.25715-1-bart.vanassche@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrOLMWRmVeSWpSXmKPExsXCddJ5ke7JWbMjDC7OErLY8+Acm8WFPd2M Fq1L3zI5MHvM+L2IxePzJrkApigum5TUnMyy1CJ9uwSujJa721gK3mpUrL6/mLmB8YZiFyMn h4SAicT0STuZuhi5OIQEljJJPLm+gg0kISSwlVHi1G5PmKJ1s1+yQBRtZJRYM+0CE0iCTcBI 4tv7mSwgtoiAgcTv3guMIDazQAejxIyvsSC2sECYxJdpTWA1LAIqEmf7FoEt4BVwkNj9+jYL xAJ5iV1tF1lBbE6g+ISXzxghjrCXeHXgCyPIYgmB5ywSE85eY4VoFpQ4OfMJC8QyCYmDL14w QzSoS5xcMp9pAqPQLCRls5CULWBkWsUolpuZU5ybnlpgaKpXnJiXklmcrZecn7uJERK8mTsY 7z7xPsQowMGoxMNbYTk7Qog1say4MvcQowQHs5IIb8o0oBBvSmJlVWpRfnxRaU5q8SFGaQ4W JXHeczJTI4QE0hNLUrNTUwtSi2CyTBycUg2MO7KO/vjR/MMkOCOn+NVey8UZnX1for0OLnPM ePnx5TfZBbeDCpXlAr9Ntzx1zbP2+VfDqUGtPpcKW2ouqmQmhZ3T3/H1wLGvvjcMYj98PBK8 7cGBJKu/oj8OOdWEcD+wbYx75NgwSVDyPt/NdL2etK/PL8qJmFhKJe/Zo9x8LC23+8WaRbVW SizFGYmGWsxFxYkA2P+GNVoCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprOJMWRmVeSWpSXmKPExsXCtZGTTff4rNkRBjsmKFoc/NnGaLHnwTk2 iwt7uhktWpe+ZXJg8ZjxexGLx7Q155k8Pm+SC2CO4rJJSc3JLEst0rdL4MpoubuNpeCtRsXq +4uZGxhvKHYxcnJICJhIrJv9kgXEFhJYzyhxZTsviM0mYCTx7f1MsLiIgIHE794LjF2MXBzM Am2MEue3PwZLCAuESXyZ1gRmswioSsx60gdm8wo4SDzYvoMZYoG8xK62i6wgNidQfMLLZ4wQ y+wlXh34wjiBkXsBI8MqRrHczJzi3PTMAkMjveLEvJTM4my95PzcTYwQr0ftYLw+0fwQIxMH p1QDo+wy+V/nRA+Y8pReMPTyYxB/n+bo6K7HwNNl2Xrxhk2KtkNgdVUpp6D+hUMuKxXl2X7H t6xnqzZfqWQUkPXlRNPzujndHt9nrtTpjPh66d9Ew/lusscVTey/cP02OPey+3ecpplPcrnd Xd29NUFeBpFmX0V3cbGcPzX3tfYUiyl+GSp7tkcosRRnJBpqMRcVJwIAuq3vraoBAAA= MIME-Version: 1.0 Sender: target-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: target-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP target_submit_tmr() only supports the I_T_L nexus for SCSI abort and other task management functions. Make it possible for target drivers to specify I_T nexus for SCSI abort by passing the TARGET_SCF_IGNORE_TMR_LUN flag to target_submit_tmr(). Signed-off-by: Bart Van Assche Reviewed-by: Hannes Reinecke Reviewed-by: Christoph Hellwig Cc: Himanshu Madhani Cc: Giridhar Malavali --- drivers/target/target_core_tmr.c | 16 +++++++++++++++- drivers/target/target_core_transport.c | 30 +++++++++++++++++++++++------- include/target/target_core_base.h | 1 + 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c index 311dc3c2f1dc..367799b4dde1 100644 --- a/drivers/target/target_core_tmr.c +++ b/drivers/target/target_core_tmr.c @@ -149,6 +149,13 @@ static bool __target_check_io_state(struct se_cmd *se_cmd, return kref_get_unless_zero(&se_cmd->cmd_kref); } +/** + * core_tmr_abort_task - abort a SCSI command + * @dev: LUN specified in task management function or NULL if no LUN has been + * specified. + * @tmr: Task management function. + * @se_sess: Session a.k.a. I_T nexus. + */ void core_tmr_abort_task( struct se_device *dev, struct se_tmr_req *tmr, @@ -161,7 +168,7 @@ void core_tmr_abort_task( spin_lock_irqsave(&se_sess->sess_cmd_lock, flags); list_for_each_entry(se_cmd, &se_sess->sess_cmd_list, se_cmd_list) { - if (dev != se_cmd->se_dev) + if (dev && dev != se_cmd->se_dev) continue; /* skip task management functions, including tmr->task_cmd */ @@ -178,6 +185,13 @@ void core_tmr_abort_task( if (!__target_check_io_state(se_cmd, se_sess, 0)) continue; + if (!tmr->tmr_dev && + transport_lookup_tmr_lun(tmr->task_cmd, + se_cmd->orig_fe_lun) < 0) { + target_put_sess_cmd(se_cmd); + continue; + } + list_del_init(&se_cmd->se_cmd_list); spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags); diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index 084a7fbfc72e..72fd0b430380 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c @@ -1593,18 +1593,18 @@ static void target_complete_tmr_failure(struct work_struct *work) } /** - * target_submit_tmr - lookup unpacked lun and submit uninitialized se_cmd - * for TMR CDBs + * target_submit_tmr - submit a SCSI task management function to the target core * * @se_cmd: command descriptor to submit * @se_sess: associated se_sess for endpoint * @sense: pointer to SCSI sense buffer - * @unpacked_lun: unpacked LUN to reference for struct se_lun + * @unpacked_lun: LUN the TMR applies to. Ignored if TARGET_SCF_IGNORE_TMR_LUN + * has been set in @flags. * @fabric_context: fabric context for TMR req * @tm_type: Type of TM request * @gfp: gfp type for caller * @tag: referenced task tag for TMR_ABORT_TASK - * @flags: submit cmd flags + * @flags: submit cmd flags (TARGET_SCF_*). * * Callable from all contexts. **/ @@ -1640,7 +1640,14 @@ int target_submit_tmr(struct se_cmd *se_cmd, struct se_session *se_sess, return ret; } - ret = transport_lookup_tmr_lun(se_cmd, unpacked_lun); + if (flags & TARGET_SCF_IGNORE_TMR_LUN) { + WARN_ON_ONCE(tm_type != TMR_ABORT_TASK); + se_cmd->se_lun = NULL; + se_cmd->se_dev = NULL; + se_cmd->se_tmr_req->tmr_dev = NULL; + } else { + ret = transport_lookup_tmr_lun(se_cmd, unpacked_lun); + } if (ret) { /* * For callback during failure handling, push this work off @@ -1650,6 +1657,7 @@ int target_submit_tmr(struct se_cmd *se_cmd, struct se_session *se_sess, schedule_work(&se_cmd->work); return 0; } + WARN_ON_ONCE(tm_type != TMR_ABORT_TASK && !se_cmd->se_dev); transport_generic_handle_tmr(se_cmd); return 0; } @@ -3128,8 +3136,16 @@ static void target_tmr_work(struct work_struct *work) transport_cmd_check_stop_to_fabric(cmd); } -int transport_generic_handle_tmr( - struct se_cmd *cmd) +/** + * transport_generic_handle_tmr - queue a task management function + * + * Note: task management functions for which flag TARGET_SCF_IGNORE_TMR_LUN + * has been set are queued on a separate workqueue. This may cause out-of-order + * execution of task management functions. That is fine though since the + * SCSI Architecture Manual does not require that task management functions + * are executed in order. + */ +int transport_generic_handle_tmr(struct se_cmd *cmd) { unsigned long flags; diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h index 5cb7583ad701..fb87f0e5d0d6 100644 --- a/include/target/target_core_base.h +++ b/include/target/target_core_base.h @@ -186,6 +186,7 @@ enum target_sc_flags_table { TARGET_SCF_ACK_KREF = 0x02, TARGET_SCF_UNKNOWN_SIZE = 0x04, TARGET_SCF_USE_CPUID = 0x08, + TARGET_SCF_IGNORE_TMR_LUN = 0x10, }; /* fabric independent task management function values */