From patchwork Tue Jun 7 04:12:39 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: 9159817 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 6E1CC60467 for ; Tue, 7 Jun 2016 04:14:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 61D7426861 for ; Tue, 7 Jun 2016 04:14:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 562F22833E; Tue, 7 Jun 2016 04:14:01 +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 CD7402834A for ; Tue, 7 Jun 2016 04:14:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753338AbcFGEN7 (ORCPT ); Tue, 7 Jun 2016 00:13:59 -0400 Received: from mail.linux-iscsi.org ([67.23.28.174]:55978 "EHLO linux-iscsi.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753213AbcFGENq (ORCPT ); Tue, 7 Jun 2016 00:13:46 -0400 Received: from linux-iscsi.org (localhost [127.0.0.1]) by linux-iscsi.org (Postfix) with ESMTP id CE7C822CABB; Tue, 7 Jun 2016 04:12:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=linux-iscsi.org; s=default.private; t=1465272778; bh=hjhD0wX1KMWUYHjuccruT5LB8ZoJVbo +i3urrFbGrdU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References; b=mALI8b963YwiEcoCC7uhGrhrjCekUg76DKaXS6I6sXwa7iBFBZuE 3+cSENP3UfoM+0DE4t7mlkwiS0iSdGMf96TOhF06gffYOiRNPXptJFkGuSw7Z87tJGR 2mugeg2DqTfK9p8FjBCSrlwpTqHz+yhbYScTqxjRnZ/+BUkxW1u0= 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-v2 14/16] target: Make sbc_ops accessable via target_backend_ops Date: Tue, 7 Jun 2016 04:12:39 +0000 Message-Id: <1465272761-26045-15-git-send-email-nab@linux-iscsi.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1465272761-26045-1-git-send-email-nab@linux-iscsi.org> References: <1465272761-26045-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 allows backend driver sbc_ops function pointers to be accessed externally, so external target consumers can perform target_iostate + target_iomem I/O submission outside of /sys/kernel/config/target/$FABRIC/ users. Specifically, IBLOCK, FILEIO, and RAMDISK have been enabled, while PSCSI and TCMU have left sbc_ops NULL as they perform SCSI CDB pass-through. 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_file.c | 1 + drivers/target/target_core_iblock.c | 1 + drivers/target/target_core_pscsi.c | 1 + drivers/target/target_core_rd.c | 1 + drivers/target/target_core_user.c | 1 + include/target/target_core_backend.h | 4 ++++ 6 files changed, 9 insertions(+) diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c index b4956a5e..6f0064e 100644 --- a/drivers/target/target_core_file.c +++ b/drivers/target/target_core_file.c @@ -815,6 +815,7 @@ static const struct target_backend_ops fileio_ops = { .inquiry_prod = "FILEIO", .inquiry_rev = FD_VERSION, .owner = THIS_MODULE, + .sbc_ops = &fd_sbc_ops, .attach_hba = fd_attach_hba, .detach_hba = fd_detach_hba, .alloc_device = fd_alloc_device, diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c index 00781c8..29d3167 100644 --- a/drivers/target/target_core_iblock.c +++ b/drivers/target/target_core_iblock.c @@ -833,6 +833,7 @@ static const struct target_backend_ops iblock_ops = { .inquiry_prod = "IBLOCK", .inquiry_rev = IBLOCK_VERSION, .owner = THIS_MODULE, + .sbc_ops = &iblock_sbc_ops, .attach_hba = iblock_attach_hba, .detach_hba = iblock_detach_hba, .alloc_device = iblock_alloc_device, diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c index c52f943..4284dbf 100644 --- a/drivers/target/target_core_pscsi.c +++ b/drivers/target/target_core_pscsi.c @@ -1127,6 +1127,7 @@ static void pscsi_req_done(struct request *req, int uptodate) static const struct target_backend_ops pscsi_ops = { .name = "pscsi", .owner = THIS_MODULE, + .sbc_ops = NULL, .transport_flags = TRANSPORT_FLAG_PASSTHROUGH, .attach_hba = pscsi_attach_hba, .detach_hba = pscsi_detach_hba, diff --git a/drivers/target/target_core_rd.c b/drivers/target/target_core_rd.c index a38a37f..e9df036 100644 --- a/drivers/target/target_core_rd.c +++ b/drivers/target/target_core_rd.c @@ -662,6 +662,7 @@ static const struct target_backend_ops rd_mcp_ops = { .name = "rd_mcp", .inquiry_prod = "RAMDISK-MCP", .inquiry_rev = RD_MCP_VERSION, + .sbc_ops = &rd_sbc_ops, .attach_hba = rd_attach_hba, .detach_hba = rd_detach_hba, .alloc_device = rd_alloc_device, diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c index 3467560..ec6142b 100644 --- a/drivers/target/target_core_user.c +++ b/drivers/target/target_core_user.c @@ -1151,6 +1151,7 @@ static const struct target_backend_ops tcmu_ops = { .name = "user", .owner = THIS_MODULE, .transport_flags = TRANSPORT_FLAG_PASSTHROUGH, + .sbc_ops = NULL, .attach_hba = tcmu_attach_hba, .detach_hba = tcmu_detach_hba, .alloc_device = tcmu_alloc_device, diff --git a/include/target/target_core_backend.h b/include/target/target_core_backend.h index 9efe718..15f731f 100644 --- a/include/target/target_core_backend.h +++ b/include/target/target_core_backend.h @@ -8,6 +8,10 @@ struct target_backend_ops { char inquiry_prod[16]; char inquiry_rev[4]; struct module *owner; + /* + * Used by NVMe-target for se_cmd dispatch without SCSI CDB parsing + */ + struct sbc_ops *sbc_ops; u8 transport_flags;