From patchwork Mon Feb 24 16:45:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Gurtovoy X-Patchwork-Id: 11401025 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5376314E3 for ; Mon, 24 Feb 2020 16:45:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 377BF20836 for ; Mon, 24 Feb 2020 16:45:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727426AbgBXQpw (ORCPT ); Mon, 24 Feb 2020 11:45:52 -0500 Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:46547 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727689AbgBXQpv (ORCPT ); Mon, 24 Feb 2020 11:45:51 -0500 Received: from Internal Mail-Server by MTLPINE1 (envelope-from maxg@mellanox.com) with ESMTPS (AES256-SHA encrypted); 24 Feb 2020 18:45:46 +0200 Received: from mtr-vdi-031.wap.labs.mlnx. (mtr-vdi-031.wap.labs.mlnx [10.209.102.136]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 01OGji9V013647; Mon, 24 Feb 2020 18:45:46 +0200 From: Max Gurtovoy To: linux-nvme@lists.infradead.org, sagi@grimberg.me, linux-rdma@vger.kernel.org, kbusch@kernel.org, hch@lst.de, martin.petersen@oracle.com Cc: vladimirk@mellanox.com, idanb@mellanox.com, maxg@mellanox.com, israelr@mellanox.com, axboe@kernel.dk, shlomin@mellanox.com Subject: [PATCH 09/19] nvmet: Prepare metadata request Date: Mon, 24 Feb 2020 18:45:34 +0200 Message-Id: <20200224164544.219438-11-maxg@mellanox.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200224164544.219438-1-maxg@mellanox.com> References: <20200224164544.219438-1-maxg@mellanox.com> MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Israel Rukshin Allocate the metadata SGL buffers and add metadata fields for the request. This is a preparation for adding metadata support over the fabrics. Signed-off-by: Israel Rukshin Reviewed-by: Max Gurtovoy --- drivers/nvme/target/core.c | 48 ++++++++++++++++++++++++++++++++++++++------- drivers/nvme/target/nvmet.h | 5 +++++ 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c index b685f99d..192b9ef 100644 --- a/drivers/nvme/target/core.c +++ b/drivers/nvme/target/core.c @@ -873,13 +873,17 @@ bool nvmet_req_init(struct nvmet_req *req, struct nvmet_cq *cq, req->sq = sq; req->ops = ops; req->sg = NULL; + req->prot_sg = NULL; req->sg_cnt = 0; + req->prot_sg_cnt = 0; req->transfer_len = 0; + req->prot_len = 0; req->cqe->status = 0; req->cqe->sq_head = 0; req->ns = NULL; req->error_loc = NVMET_NO_ERROR_LOC; req->error_slba = 0; + req->use_pi = false; trace_nvmet_req_init(req, req->cmd); @@ -962,6 +966,7 @@ bool nvmet_check_data_len_lte(struct nvmet_req *req, size_t data_len) int nvmet_req_alloc_sgl(struct nvmet_req *req) { struct pci_dev *p2p_dev = NULL; + int data_len = req->transfer_len - req->prot_len; if (IS_ENABLED(CONFIG_PCI_P2PDMA)) { if (req->sq->ctrl && req->ns) @@ -971,11 +976,23 @@ int nvmet_req_alloc_sgl(struct nvmet_req *req) req->p2p_dev = NULL; if (req->sq->qid && p2p_dev) { req->sg = pci_p2pmem_alloc_sgl(p2p_dev, &req->sg_cnt, - req->transfer_len); - if (req->sg) { - req->p2p_dev = p2p_dev; - return 0; + data_len); + if (!req->sg) + goto fallback; + + if (req->prot_len) { + req->prot_sg = + pci_p2pmem_alloc_sgl(p2p_dev, + &req->prot_sg_cnt, + req->prot_len); + if (!req->prot_sg) { + pci_p2pmem_free_sgl(req->p2p_dev, + req->sg); + goto fallback; + } } + req->p2p_dev = p2p_dev; + return 0; } /* @@ -984,23 +1001,40 @@ int nvmet_req_alloc_sgl(struct nvmet_req *req) */ } - req->sg = sgl_alloc(req->transfer_len, GFP_KERNEL, &req->sg_cnt); +fallback: + req->sg = sgl_alloc(data_len, GFP_KERNEL, &req->sg_cnt); if (unlikely(!req->sg)) return -ENOMEM; + if (req->prot_len) { + req->prot_sg = sgl_alloc(req->prot_len, GFP_KERNEL, + &req->prot_sg_cnt); + if (unlikely(!req->prot_sg)) { + sgl_free(req->sg); + return -ENOMEM; + } + } + return 0; } EXPORT_SYMBOL_GPL(nvmet_req_alloc_sgl); void nvmet_req_free_sgl(struct nvmet_req *req) { - if (req->p2p_dev) + if (req->p2p_dev) { pci_p2pmem_free_sgl(req->p2p_dev, req->sg); - else + if (req->prot_sg) + pci_p2pmem_free_sgl(req->p2p_dev, req->prot_sg); + } else { sgl_free(req->sg); + if (req->prot_sg) + sgl_free(req->prot_sg); + } req->sg = NULL; + req->prot_sg = NULL; req->sg_cnt = 0; + req->prot_sg_cnt = 0; } EXPORT_SYMBOL_GPL(nvmet_req_free_sgl); diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h index 42ba2dd..a0f29e6 100644 --- a/drivers/nvme/target/nvmet.h +++ b/drivers/nvme/target/nvmet.h @@ -301,6 +301,7 @@ struct nvmet_req { struct nvmet_cq *cq; struct nvmet_ns *ns; struct scatterlist *sg; + struct scatterlist *prot_sg; struct bio_vec inline_bvec[NVMET_MAX_INLINE_BIOVEC]; union { struct { @@ -314,8 +315,10 @@ struct nvmet_req { } f; }; int sg_cnt; + int prot_sg_cnt; /* data length as parsed from the SGL descriptor: */ size_t transfer_len; + size_t prot_len; struct nvmet_port *port; @@ -326,6 +329,8 @@ struct nvmet_req { struct device *p2p_client; u16 error_loc; u64 error_slba; + /* Metadata (T10-PI) support */ + bool use_pi; }; extern struct workqueue_struct *buffered_io_wq;