From patchwork Tue Jun 7 06:36:54 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: 9159917 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 4F9DE60572 for ; Tue, 7 Jun 2016 06:38:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40A5027B13 for ; Tue, 7 Jun 2016 06:38:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3576228326; Tue, 7 Jun 2016 06:38:07 +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 C7C3F27B13 for ; Tue, 7 Jun 2016 06:38:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753658AbcFGGiE (ORCPT ); Tue, 7 Jun 2016 02:38:04 -0400 Received: from mail.linux-iscsi.org ([67.23.28.174]:47911 "EHLO linux-iscsi.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753635AbcFGGiA (ORCPT ); Tue, 7 Jun 2016 02:38:00 -0400 Received: from linux-iscsi.org (localhost [127.0.0.1]) by linux-iscsi.org (Postfix) with ESMTP id 34AAD22D9D8; Tue, 7 Jun 2016 06:37:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=linux-iscsi.org; s=default.private; t=1465281427; bh=ebP0cC9Egi9pmidoqciQkudyDZk+HXm qv3Fd/ET4WDI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References; b=Xfd1CsAwSnJ8bASb+nJN2e5s9iN0NwzIgnau3kHt32EXrWpU4NIC 7XNm3Jzj14zHFxQz5ZY/KJ1Fnkdua4vA1zfFm679oNntigFETO07LH2HH1/h8+Vq+ib 0eAZQSDm6NB7n+UEFvefqhxgmkSMXhmYNppSMxIUUwXJIR8uIfAk= From: "Nicholas A. Bellinger" To: target-devel Cc: linux-nvme , linux-scsi , Jens Axboe , Christoph Hellwig , Martin Petersen , Sagi Grimberg , Hannes Reinecke , Mike Christie , Dave B Minturn , Nicholas Bellinger Subject: [RFC 6/8] nvmet/io-cmd: Hookup sbc_ops->execute_unmap backend ops Date: Tue, 7 Jun 2016 06:36:54 +0000 Message-Id: <1465281416-28355-7-git-send-email-nab@linux-iscsi.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1465281416-28355-1-git-send-email-nab@linux-iscsi.org> References: <1465281416-28355-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 converts nvmet_execute_discard() to utilize sbc_ops->execute_unmap() for target_iostate submission into existing backends drivers via configfs in /sys/kernel/config/target/core/. Cc: Jens Axboe Cc: Christoph Hellwig Cc: Martin Petersen Cc: Sagi Grimberg Cc: Hannes Reinecke Cc: Mike Christie Signed-off-by: Nicholas Bellinger --- drivers/nvme/target/io-cmd.c | 47 ++++++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/drivers/nvme/target/io-cmd.c b/drivers/nvme/target/io-cmd.c index 23905a8..605f560 100644 --- a/drivers/nvme/target/io-cmd.c +++ b/drivers/nvme/target/io-cmd.c @@ -126,52 +126,73 @@ static void nvmet_execute_flush(struct nvmet_req *req) rc = sbc_ops->execute_sync_cache(ios, false); } -#if 0 -static u16 nvmet_discard_range(struct nvmet_ns *ns, - struct nvme_dsm_range *range, int type, struct bio **bio) +static u16 nvmet_discard_range(struct nvmet_req *req, struct sbc_ops *sbc_ops, + struct nvme_dsm_range *range, struct bio **bio) { - if (__blkdev_issue_discard(ns->bdev, + struct nvmet_ns *ns = req->ns; + sense_reason_t rc; + + rc = sbc_ops->execute_unmap(&req->t_iostate, le64_to_cpu(range->slba) << (ns->blksize_shift - 9), le32_to_cpu(range->nlb) << (ns->blksize_shift - 9), - GFP_KERNEL, type, bio)) + bio); + if (rc) return NVME_SC_INTERNAL | NVME_SC_DNR; return 0; } -#endif + +static void nvmet_discard_bio_done(struct bio *bio) +{ + struct nvmet_req *req = bio->bi_private; + int err = bio->bi_error; + + bio_put(bio); + nvmet_req_complete(req, err ? NVME_SC_INTERNAL | NVME_SC_DNR : 0); +} static void nvmet_execute_discard(struct nvmet_req *req) { -#if 0 - struct nvme_dsm_range range; + struct target_iostate *ios = &req->t_iostate; + struct se_device *dev = rcu_dereference_raw(req->ns->dev); + struct sbc_ops *sbc_ops = dev->transport->sbc_ops; struct bio *bio = NULL; - int type = REQ_WRITE | REQ_DISCARD, i; + struct nvme_dsm_range range; + int i; u16 status; + if (!sbc_ops || !sbc_ops->execute_unmap) { + nvmet_req_complete(req, NVME_SC_INTERNAL | NVME_SC_DNR); + return; + } + + ios->se_dev = dev; + ios->iomem = NULL; + ios->t_comp_func = NULL; + for (i = 0; i <= le32_to_cpu(req->cmd->dsm.nr); i++) { status = nvmet_copy_from_sgl(req, i * sizeof(range), &range, sizeof(range)); if (status) break; - status = nvmet_discard_range(req->ns, &range, type, &bio); + status = nvmet_discard_range(req, sbc_ops, &range, &bio); if (status) break; } if (bio) { bio->bi_private = req; - bio->bi_end_io = nvmet_bio_done; + bio->bi_end_io = nvmet_discard_bio_done; if (status) { bio->bi_error = -EIO; bio_endio(bio); } else { - submit_bio(type, bio); + submit_bio(REQ_WRITE | REQ_DISCARD, bio); } } else { nvmet_req_complete(req, status); } -#endif } static void nvmet_execute_dsm(struct nvmet_req *req)