From patchwork Wed Jun 1 21:48:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nicholas A. Bellinger" X-Patchwork-Id: 9148281 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 884906082F for ; Wed, 1 Jun 2016 21:49:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7AF3B264FB for ; Wed, 1 Jun 2016 21:49:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6FEEB2714C; Wed, 1 Jun 2016 21:49:49 +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=-5.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, URIBL_BLACK 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 5C5C82714B for ; Wed, 1 Jun 2016 21:49:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753091AbcFAVtn (ORCPT ); Wed, 1 Jun 2016 17:49:43 -0400 Received: from mail.linux-iscsi.org ([67.23.28.174]:53475 "EHLO linux-iscsi.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753043AbcFAVti (ORCPT ); Wed, 1 Jun 2016 17:49:38 -0400 Received: from linux-iscsi.org (localhost [127.0.0.1]) by linux-iscsi.org (Postfix) with ESMTP id 7DF4522CAAB; Wed, 1 Jun 2016 21:48:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=linux-iscsi.org; s=default.private; t=1464817739; bh=l8iOEoxpAvjDFyRCoNO6uk8KCFEPOU1 lEy3LnOScTSg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References; b=UKbdeS9cWHnQADU6ApC6EViNm383idBXlheF6MU1yiRkMlUe/NaZ dk5jv5LaYHNEtL9RirsF28CTkTqVncVrefOqDYI+VrFCH745on9emBS7yzJvXncoFoZ kSMQcJtp4KUsaqNs0kuAYvPei0UCLSHoiI3fQKkk3tbC04fl6PUk= From: "Nicholas A. Bellinger" To: target-devel Cc: linux-scsi , Jens Axboe , Christoph Hellwig , Martin Petersen , Sagi Grimberg , Hannes Reinecke , Mike Christie , Dave B Minturn , Nicholas Bellinger Subject: [PATCH 04/14] target: Add target_complete_ios wrapper Date: Wed, 1 Jun 2016 21:48:37 +0000 Message-Id: <1464817727-9125-5-git-send-email-nab@linux-iscsi.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1464817727-9125-1-git-send-email-nab@linux-iscsi.org> References: <1464817727-9125-1-git-send-email-nab@linux-iscsi.org> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Nicholas Bellinger This patch adds a basic target_complete_ios() wrapper to dereference struct se_cmd from struct target_iostate, and invoke existing target_complete_cmd() code. It also includes PSCSI + TCMU backend driver conversions. Cc: Jens Axboe Cc: Christoph Hellwig Cc: Martin Petersen Cc: Sagi Grimberg Cc: Hannes Reinecke Cc: Mike Christie Signed-off-by: Nicholas Bellinger --- drivers/target/target_core_pscsi.c | 4 ++-- drivers/target/target_core_transport.c | 9 ++++++++- drivers/target/target_core_user.c | 4 ++-- include/target/target_core_backend.h | 1 + 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c index 105894a..b5728bc 100644 --- a/drivers/target/target_core_pscsi.c +++ b/drivers/target/target_core_pscsi.c @@ -1109,13 +1109,13 @@ static void pscsi_req_done(struct request *req, int uptodate) switch (host_byte(pt->pscsi_result)) { case DID_OK: - target_complete_cmd(cmd, cmd->scsi_status); + target_complete_ios(&cmd->t_iostate, cmd->scsi_status); break; default: pr_debug("PSCSI Host Byte exception at cmd: %p CDB:" " 0x%02x Result: 0x%08x\n", cmd, pt->pscsi_cdb[0], pt->pscsi_result); - target_complete_cmd(cmd, SAM_STAT_CHECK_CONDITION); + target_complete_ios(&cmd->t_iostate, SAM_STAT_CHECK_CONDITION); break; } diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index 18661da..2207624 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c @@ -714,7 +714,6 @@ void target_complete_cmd(struct se_cmd *cmd, u8 scsi_status) cmd->scsi_status = scsi_status; - spin_lock_irqsave(&cmd->t_state_lock, flags); cmd->transport_state &= ~CMD_T_BUSY; @@ -752,6 +751,14 @@ void target_complete_cmd(struct se_cmd *cmd, u8 scsi_status) } EXPORT_SYMBOL(target_complete_cmd); +void target_complete_ios(struct target_iostate *ios, u16 scsi_status) +{ + struct se_cmd *cmd = container_of(ios, struct se_cmd, t_iostate); + + target_complete_cmd(cmd, scsi_status); +} +EXPORT_SYMBOL(target_complete_ios); + void target_complete_cmd_with_length(struct se_cmd *cmd, u8 scsi_status, int length) { if (scsi_status == SAM_STAT_GOOD && length < cmd->t_iostate.data_length) { diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c index d6758a1..505b312 100644 --- a/drivers/target/target_core_user.c +++ b/drivers/target/target_core_user.c @@ -601,7 +601,7 @@ static void tcmu_handle_completion(struct tcmu_cmd *cmd, struct tcmu_cmd_entry * se_cmd->t_iostate.data_direction); } - target_complete_cmd(cmd->se_cmd, entry->rsp.scsi_status); + target_complete_ios(&cmd->se_cmd->t_iostate, entry->rsp.scsi_status); cmd->se_cmd = NULL; kmem_cache_free(tcmu_cmd_cache, cmd); @@ -680,7 +680,7 @@ static int tcmu_check_expired_cmd(int id, void *p, void *data) return 0; set_bit(TCMU_CMD_BIT_EXPIRED, &cmd->flags); - target_complete_cmd(cmd->se_cmd, SAM_STAT_CHECK_CONDITION); + target_complete_ios(&cmd->se_cmd->t_iostate, SAM_STAT_CHECK_CONDITION); cmd->se_cmd = NULL; kmem_cache_free(tcmu_cmd_cache, cmd); diff --git a/include/target/target_core_backend.h b/include/target/target_core_backend.h index d8ab510..2f6deb0 100644 --- a/include/target/target_core_backend.h +++ b/include/target/target_core_backend.h @@ -58,6 +58,7 @@ void target_backend_unregister(const struct target_backend_ops *); void target_complete_cmd(struct se_cmd *, u8); void target_complete_cmd_with_length(struct se_cmd *, u8, int); +void target_complete_ios(struct target_iostate *, u16); sense_reason_t spc_parse_cdb(struct se_cmd *cmd, unsigned int *size); sense_reason_t spc_emulate_report_luns(struct se_cmd *cmd);