From patchwork Fri Feb 10 01:28:31 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: 9565761 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 2EB3B60572 for ; Fri, 10 Feb 2017 01:29:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1FD302853A for ; Fri, 10 Feb 2017 01:29:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 14D2E28548; Fri, 10 Feb 2017 01:29:09 +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 686D42853B for ; Fri, 10 Feb 2017 01:29:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751366AbdBJB3F (ORCPT ); Thu, 9 Feb 2017 20:29:05 -0500 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:18628 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751290AbdBJB3D (ORCPT ); Thu, 9 Feb 2017 20:29:03 -0500 X-IronPort-AV: E=Sophos;i="5.33,348,1477929600"; d="scan'208";a="82349443" Received: from unknown (HELO milsmgep15.sandisk.com) ([63.163.107.21]) by ob1.hgst.iphmx.com with ESMTP; 10 Feb 2017 09:28:58 +0800 Received: from MILHUBIP04.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 0E.87.57638.A571D985; Thu, 9 Feb 2017 17:28:58 -0800 (PST) Received: from milsmgip11.sandisk.com (10.177.9.6) by MILHUBIP04.sdcorp.global.sandisk.com (10.177.9.97) with Microsoft SMTP Server id 14.3.319.2; Thu, 9 Feb 2017 17:28:55 -0800 X-AuditID: 0ac94369-26dee9800001e126-f7-589d175a6378 Received: from exp-402881.sdcorp.global.sandisk.com ( [10.177.9.6]) by (Symantec Messaging Gateway) with SMTP id 81.9F.11415.7571D985; Thu, 9 Feb 2017 17:28:55 -0800 (PST) From: Bart Van Assche To: "Nicholas A . Bellinger" CC: , Bart Van Assche , Himanshu Madhani , Giridhar Malavali Subject: [PATCH v5 01/22] target: Make it possible to specify I_T nexus for SCSI abort Date: Thu, 9 Feb 2017 17:28:31 -0800 Message-ID: <20170210012852.15735-2-bart.vanassche@sandisk.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170210012852.15735-1-bart.vanassche@sandisk.com> References: <20170210012852.15735-1-bart.vanassche@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrALMWRmVeSWpSXmKPExsXCddJ5kW6U+NwIgwlLjC32PDjHZnFhTzej RdvqM4wWrUvfMjmweMz4vYjF4/72I0wenzfJBTBHcdmkpOZklqUW6dslcGUcOXCAuWCBasXi Q41MDYyf5boYOTkkBEwkri7YxAJiCwksZZKYsjS0i5ELyN7KKDHv72O2LkYOsKKzu8Ih4hsZ JQ60TmcGaWATMJL49n4mWLMIkL26ZxkTSBGzwDZGiQe7DrOBJIQFwiQevX/JDmKzCKhIHO+e ygRi8wrYS1xcOo0N4gp5iV1tF1lBbE4BB4lXs6+zgiwWAqrZscsAZKaEwD8WiUdHb0D1Ckqc nPkEbDGzgITEwRcvmCE+UJc4uWQ+0wRGoVlIymYhKVvAyLSKUSw3M6c4Nz21wNBUrzgxLyWz OFsvOT93EyMknDN3MN594n2IUYCDUYmH90XNnAgh1sSy4srcQ4wSHMxKIrz3+eZGCPGmJFZW pRblxxeV5qQWH2KU5mBREuc9JzM1QkggPbEkNTs1tSC1CCbLxMEp1cAYFRJ+U8937SWl+Pzm 6Rft5e6YH2NbJMFeMfHkPJ197MlMyxb1cr1nm3hA97yQy7ycloqoCK6oc6WdundPf57ncFL6 Wp+Xj9ONDR8ZfsU8fVyrflwna1WI0qf09QYW/Bbernvq3+vECv+cHtv6q2zpHAb1Lx35KbpJ Bjd4jxy//faChVvlxjIlluKMREMt5qLiRAB9nOO8YwIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprHJMWRmVeSWpSXmKPExsXCtZGTTTdcfG6Ewd9DnBYHf7YxWux5cI7N 4sKebkaLttVnGC1al75lcmD1mPF7EYvH/e1HmDymrTnP5PF5k1wASxSXTUpqTmZZapG+XQJX xpEDB5gLFqhWLD7UyNTA+Fmui5GDQ0LAROLsrvAuRk4OIYH1jBLX9smB2GwCRhLf3s9kAbFF gOzVPcuYQGxmgW2MEjeeWIHYwgJhEo/ev2QHsVkEVCUurz/ICmLzCthLfFn1lxHElhCQl9jV dhEszingIPFq9nVWkLVCQDU7dhlMYORewMiwilEsNzOnODc9s8DQUK84MS8lszhbLzk/dxMj JAQidzA+nWh+iJGJg1OqgfHE9tfer602/H3/g+vp0hPz9yTNYtn5S2WyeKyAnp988brciYX7 Kta/kUqSCl/QaNMymzv8heCKGnGX1ZvZxQ/zOUz0ir/Es8/+28Jbz5m8CjJOvt/IU7zprkCZ muKOT9uTQ+Lbcta0y1jeTT9tfUV05ed+gQ+Chh8uOibJZ8RPluAqTl6Wzq7EUpyRaKjFXFSc CABzsNyBsQEAAA== 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(). Note: although several SCSI transport layers require in-order processing of TMFs per session, using schedule_work() does not introduce any new potential reordering. Since TMFs that originate from a single session can be queued onto different backend device workqueues there is already a potential for reordering. 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 | 9 ++++++++- drivers/target/target_core_transport.c | 23 +++++++++++++++++------ include/target/target_core_base.h | 1 + 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c index 311dc3c2f1dc..3330775aa47a 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 */ diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index 22190003534d..4e233c0f5f68 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c @@ -1577,18 +1577,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. **/ @@ -1624,7 +1624,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 @@ -1634,6 +1641,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; } @@ -3147,7 +3155,10 @@ int transport_generic_handle_tmr( } INIT_WORK(&cmd->work, target_tmr_work); - queue_work(cmd->se_dev->tmr_wq, &cmd->work); + if (cmd->se_dev) + queue_work(cmd->se_dev->tmr_wq, &cmd->work); + else + schedule_work(&cmd->work); return 0; } EXPORT_SYMBOL(transport_generic_handle_tmr); diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h index d7336f3c6b60..47aa40334d04 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 */