From patchwork Wed Feb 8 22:24:45 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: 9563631 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 BF0B86020F for ; Wed, 8 Feb 2017 22:27:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 92823284F2 for ; Wed, 8 Feb 2017 22:27:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 85B452852C; Wed, 8 Feb 2017 22:27:34 +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 0FC53284F2 for ; Wed, 8 Feb 2017 22:27:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751307AbdBHW1d (ORCPT ); Wed, 8 Feb 2017 17:27:33 -0500 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:63858 "EHLO esa2.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751301AbdBHW12 (ORCPT ); Wed, 8 Feb 2017 17:27:28 -0500 X-IronPort-AV: E=Sophos;i="5.35,348,1483977600"; d="scan'208";a="76618145" Received: from unknown (HELO milsmgep15.sandisk.com) ([63.163.107.21]) by ob1.hgst.iphmx.com with ESMTP; 09 Feb 2017 06:28:19 +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 24.54.57638.9CA9B985; Wed, 8 Feb 2017 14:25:14 -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-f4-589b9ac98d6d Received: from exp-402881.sdcorp.global.sandisk.com ( [10.177.9.6]) by (Symantec Messaging Gateway) with SMTP id 62.42.18148.7CA9B985; Wed, 8 Feb 2017 14:25:11 -0800 (PST) From: Bart Van Assche To: Bart Van Assche CC: , Christoph Hellwig , Andy Grover , David Disseldorp Subject: [PATCH v4 15/37] target: Inline transport_cmd_check_stop() Date: Wed, 8 Feb 2017 14:24:45 -0800 Message-ID: <20170208222507.25715-16-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+NgFrrELMWRmVeSWpSXmKPExsXCddJ5ke6pWbMjDP5UWOyf9YzJ4uv/6SwW K1cfZbJoXfqWyYHFY/fNBjaP9/uusnlsPl3t8XmTXABLFJdNSmpOZllqkb5dAlfG1znSBW/V KlZO021g7FboYuTkkBAwkeiZcJ6xi5GLQ0hgKZPEnIv/GUESQgJbGSVO7faEKTp5/TNU0UZG iSPX7oAVsQkYSXx7P5MFxBYRMJD43XsBrIhZoINRYn7PM1aQhLCAs8SjczOZQWwWARWJPycn g8V5BRwkeldfYoPYIC+xq+0iWJwTKD7h5TOoK+wlXh34wghR08Yq0X7TE6JXUOLkzCdgi5kF JCQOvnjBDFGvLnFyyXymCYxCs5CUzUJStoCRaRWjWG5mTnFuemqBoalecWJeSmZxtl5yfu4m RkhIZ+5gvPvE+xCjAAejEg9vheXsCCHWxLLiytxDjBIczEoivCnTgEK8KYmVValF+fFFpTmp xYcYpTlYlMR5z8lMjRASSE8sSc1OTS1ILYLJMnFwSjUwJtZPurihXC9bzuifUUtAyuuqNX9m vXrX6n46Zflf9lmJEZ7zyrqWbEoukGBx3rNto4nSTLPm1bxnIw1+b2jKmfbml9XllNsiWpsZ jSS8J0w3amI4ZlKmod7F+qSQVzHU9OvflcJfco+/PfEiQcq09POG2tCqjIKm9btWnRCM5Xtj Hrrnes16JZbijERDLeai4kQAaYsoqmUCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrCJMWRmVeSWpSXmKPExsXCtZGTTff4rNkRBo3v1S32z3rGZHHwZxuj xdf/01ksVq4+ymTRuvQtkwOrx+6bDWwe7/ddZfOYtuY8k8fm09UenzfJBbBGcdmkpOZklqUW 6dslcGV8nSNd8FatYuU03QbGboUuRk4OCQETiZPXPzN2MXJxCAmsZ5Q4+OUgI0iCTcBI4tv7 mSwgtoiAgcTv3gtgRcwCXYwSm86cYgdJCAs4Szw6N5MZxGYRUJWY07QVrJlXwEGib9pBJogN 8hK72i6ygticQPEJL5+B1QgJ2Eu8OvCFcQIj9wJGhlWMYrmZOcW56ZkFhkZ6xYl5KZnF2XrJ +bmbGCHhELWD8fpE80OMTBycUg2MTpfqhap29C1fPUU0cfr3m795T93yWe6zYer5SxxvFN9N lj54lKXote6jSfXlp5dJbSkRn8PHtLOvftfMFQYnvXubH2tXrps4b+oKx2ULbrfwTHASfTY1 JO5yfPP8B9cizli4H9H4WvTwhuFywe2aDV6VM865VKYc//ejQfbY/YU6i/Z8X/Nk7yUlluKM REMt5qLiRADbU11htwEAAA== 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 The function transport_cmd_check_stop() has two callers. These callers invoke this function as follows: * transport_cmd_check_stop(cmd, true, false) * transport_cmd_check_stop(cmd, false, true) Hence inline this function into its callers. This patch does not change any functionality but improves source code readability. Signed-off-by: Bart Van Assche Reviewed-by: Hannes Reinecke Reviewed-by: Bryant G. Ly Cc: Christoph Hellwig Cc: Andy Grover Cc: David Disseldorp --- drivers/target/target_core_transport.c | 68 +++++++++++++++++----------------- include/target/target_core_fabric.h | 2 +- 2 files changed, 34 insertions(+), 36 deletions(-) diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index 7b5ae36e3c58..fc3022ec39d3 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c @@ -596,24 +596,18 @@ static void target_remove_from_state_list(struct se_cmd *cmd) spin_unlock_irqrestore(&dev->execute_task_lock, flags); } -static int transport_cmd_check_stop(struct se_cmd *cmd, bool remove_from_lists, - bool write_pending) +static int transport_cmd_check_stop_to_fabric(struct se_cmd *cmd) { unsigned long flags; - if (remove_from_lists) { - target_remove_from_state_list(cmd); + target_remove_from_state_list(cmd); - /* - * Clear struct se_cmd->se_lun before the handoff to FE. - */ - cmd->se_lun = NULL; - } + /* + * Clear struct se_cmd->se_lun before the handoff to FE. + */ + cmd->se_lun = NULL; spin_lock_irqsave(&cmd->t_state_lock, flags); - if (write_pending) - cmd->t_state = TRANSPORT_WRITE_PENDING; - /* * Determine if frontend context caller is requesting the stopping of * this command for frontend exceptions. @@ -626,30 +620,17 @@ static int transport_cmd_check_stop(struct se_cmd *cmd, bool remove_from_lists, } else { cmd->transport_state &= ~CMD_T_ACTIVE; } - - if (remove_from_lists) { - /* - * Some fabric modules like tcm_loop can release - * their internally allocated I/O reference now and - * struct se_cmd now. - * - * Fabric modules are expected to return '1' here if the - * se_cmd being passed is released at this point, - * or zero if not being released. - */ - if (cmd->se_tfo->check_stop_free != NULL) { - spin_unlock_irqrestore(&cmd->t_state_lock, flags); - return cmd->se_tfo->check_stop_free(cmd); - } - } - spin_unlock_irqrestore(&cmd->t_state_lock, flags); - return 0; -} -static int transport_cmd_check_stop_to_fabric(struct se_cmd *cmd) -{ - return transport_cmd_check_stop(cmd, true, false); + /* + * Some fabric modules like tcm_loop can release their internally + * allocated I/O reference and struct se_cmd now. + * + * Fabric modules are expected to return '1' here if the se_cmd being + * passed is released at this point, or zero if not being released. + */ + return cmd->se_tfo->check_stop_free ? cmd->se_tfo->check_stop_free(cmd) + : 0; } static void transport_lun_remove_cmd(struct se_cmd *cmd) @@ -2383,6 +2364,7 @@ EXPORT_SYMBOL(target_alloc_sgl); sense_reason_t transport_generic_new_cmd(struct se_cmd *cmd) { + unsigned long flags; int ret = 0; bool zero_flag = !(cmd->se_cmd_flags & SCF_SCSI_DATA_CDB); @@ -2448,8 +2430,24 @@ transport_generic_new_cmd(struct se_cmd *cmd) target_execute_cmd(cmd); return 0; } - if (transport_cmd_check_stop(cmd, false, true)) + + spin_lock_irqsave(&cmd->t_state_lock, flags); + cmd->t_state = TRANSPORT_WRITE_PENDING; + /* + * Determine if frontend context caller is requesting the stopping of + * this command for frontend exceptions. + */ + if (cmd->transport_state & CMD_T_STOP) { + pr_debug("%s:%d CMD_T_STOP for ITT: 0x%08llx\n", + __func__, __LINE__, cmd->tag); + + spin_unlock_irqrestore(&cmd->t_state_lock, flags); + + complete_all(&cmd->t_transport_stop_comp); return 0; + } + cmd->transport_state &= ~CMD_T_ACTIVE; + spin_unlock_irqrestore(&cmd->t_state_lock, flags); ret = cmd->se_tfo->write_pending(cmd); if (ret == -EAGAIN || ret == -ENOMEM) diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h index 358041bad1da..d7dd1427fe0d 100644 --- a/include/target/target_core_fabric.h +++ b/include/target/target_core_fabric.h @@ -47,7 +47,7 @@ struct target_core_fabric_ops { u32 (*tpg_get_inst_index)(struct se_portal_group *); /* * Optional to release struct se_cmd and fabric dependent allocated - * I/O descriptor in transport_cmd_check_stop(). + * I/O descriptor after command execution has finished. * * Returning 1 will signal a descriptor has been released. * Returning 0 will signal a descriptor has not been released.