From: Max Gurtovoy <maxg@mellanox.com>
To: linux-nvme@lists.infradead.org, kbusch@kernel.org, hch@lst.de,
sagi@grimberg.me, martin.petersen@oracle.com,
jsmart2021@gmail.com, linux-rdma@vger.kernel.org
Cc: axboe@kernel.dk, vladimirk@mellanox.com, shlomin@mellanox.com,
israelr@mellanox.com, idanb@mellanox.com, jgg@mellanox.com,
oren@mellanox.com, maxg@mellanox.com
Subject: [PATCH 09/17] nvmet: prepare metadata request
Date: Fri, 27 Mar 2020 20:15:37 +0300 [thread overview]
Message-ID: <20200327171545.98970-11-maxg@mellanox.com> (raw)
In-Reply-To: <20200327171545.98970-1-maxg@mellanox.com>
From: Israel Rukshin <israelr@mellanox.com>
Allocate the metadata SGL buffers and set metadata fields for the
request. This is a preparation for adding metadata support over the
fabrics.
Signed-off-by: Israel Rukshin <israelr@mellanox.com>
Reviewed-by: Max Gurtovoy <maxg@mellanox.com>
---
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..3899b2b4 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->md_sg = NULL;
req->sg_cnt = 0;
+ req->md_sg_cnt = 0;
req->transfer_len = 0;
+ req->md_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_md = 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->md_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->md_len) {
+ req->md_sg =
+ pci_p2pmem_alloc_sgl(p2p_dev,
+ &req->md_sg_cnt,
+ req->md_len);
+ if (!req->md_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->md_len) {
+ req->md_sg = sgl_alloc(req->md_len, GFP_KERNEL,
+ &req->md_sg_cnt);
+ if (unlikely(!req->md_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->md_sg)
+ pci_p2pmem_free_sgl(req->p2p_dev, req->md_sg);
+ } else {
sgl_free(req->sg);
+ if (req->md_sg)
+ sgl_free(req->md_sg);
+ }
req->sg = NULL;
+ req->md_sg = NULL;
req->sg_cnt = 0;
+ req->md_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 421dff3..8c75667 100644
--- a/drivers/nvme/target/nvmet.h
+++ b/drivers/nvme/target/nvmet.h
@@ -302,6 +302,7 @@ struct nvmet_req {
struct nvmet_cq *cq;
struct nvmet_ns *ns;
struct scatterlist *sg;
+ struct scatterlist *md_sg;
struct bio_vec inline_bvec[NVMET_MAX_INLINE_BIOVEC];
union {
struct {
@@ -315,8 +316,10 @@ struct nvmet_req {
} f;
};
int sg_cnt;
+ int md_sg_cnt;
/* data length as parsed from the SGL descriptor: */
size_t transfer_len;
+ size_t md_len;
struct nvmet_port *port;
@@ -327,6 +330,8 @@ struct nvmet_req {
struct device *p2p_client;
u16 error_loc;
u64 error_slba;
+ /* Metadata support */
+ bool use_md;
};
extern struct workqueue_struct *buffered_io_wq;
--
1.8.3.1
_______________________________________________
linux-nvme mailing list
linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2020-03-27 17:18 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-27 17:15 [PATCH 00/17 V5] nvme-rdma/nvmet-rdma: Add metadata/T10-PI support Max Gurtovoy
2020-03-27 17:15 ` [PATCH 1/1] nvme-cli/fabrics: Add pi_enable param to connect cmd Max Gurtovoy
2020-03-27 17:15 ` [PATCH 01/17] nvme: introduce namespace features flag Max Gurtovoy
2020-04-21 11:59 ` Christoph Hellwig
2020-04-21 15:53 ` James Smart
2020-04-21 18:11 ` Christoph Hellwig
2020-03-27 17:15 ` [PATCH 02/17] nvme: Add has_md field to the nvme_req structure Max Gurtovoy
2020-04-21 11:59 ` Christoph Hellwig
2020-03-27 17:15 ` [PATCH 03/17] nvme: Enforce extended LBA format for fabrics metadata Max Gurtovoy
2020-04-21 12:08 ` Christoph Hellwig
2020-03-27 17:15 ` [PATCH 04/17] nvme: introduce max_integrity_segments ctrl attribute Max Gurtovoy
2020-04-21 12:09 ` Christoph Hellwig
2020-03-27 17:15 ` [PATCH 05/17] nvme-fabrics: Allow user enabling metadata/T10-PI support Max Gurtovoy
2020-04-21 12:12 ` Christoph Hellwig
2020-04-21 15:17 ` Christoph Hellwig
2020-04-22 22:07 ` Max Gurtovoy
2020-04-22 22:24 ` James Smart
2020-04-22 22:39 ` Max Gurtovoy
2020-04-23 5:54 ` Christoph Hellwig
2020-04-23 7:30 ` Max Gurtovoy
2020-04-24 7:06 ` Christoph Hellwig
2020-04-26 9:48 ` Max Gurtovoy
2020-04-27 6:04 ` Christoph Hellwig
2020-04-27 13:52 ` Max Gurtovoy
2020-04-27 13:54 ` Christoph Hellwig
2020-04-28 9:18 ` Max Gurtovoy
2020-04-23 5:53 ` Christoph Hellwig
2020-03-27 17:15 ` [PATCH 06/17] nvme: introduce NVME_INLINE_MD_SG_CNT Max Gurtovoy
2020-04-21 12:12 ` Christoph Hellwig
2020-03-27 17:15 ` [PATCH 07/17] nvme-rdma: Introduce nvme_rdma_sgl structure Max Gurtovoy
2020-04-21 12:13 ` Christoph Hellwig
2020-03-27 17:15 ` [PATCH 08/17] nvme-rdma: add metadata/T10-PI support Max Gurtovoy
2020-04-21 12:20 ` Christoph Hellwig
2020-04-23 9:22 ` Max Gurtovoy
2020-04-24 7:09 ` Christoph Hellwig
2020-04-26 10:04 ` Max Gurtovoy
2020-03-27 17:15 ` Max Gurtovoy [this message]
2020-04-21 15:21 ` [PATCH 09/17] nvmet: prepare metadata request Christoph Hellwig
2020-03-27 17:15 ` [PATCH 10/17] nvmet: add metadata characteristics for a namespace Max Gurtovoy
2020-04-21 15:23 ` Christoph Hellwig
2020-03-27 17:15 ` [PATCH 11/17] nvmet: Rename nvmet_rw_len to nvmet_rw_data_len Max Gurtovoy
2020-03-27 17:15 ` [PATCH 12/17] nvmet: Rename nvmet_check_data_len to nvmet_check_transfer_len Max Gurtovoy
2020-03-27 17:15 ` [PATCH 13/17] nvme: Add Metadata Capabilities enumerations Max Gurtovoy
2020-04-21 15:24 ` Christoph Hellwig
2020-04-23 12:09 ` Max Gurtovoy
2020-04-24 7:12 ` Christoph Hellwig
2020-03-27 17:15 ` [PATCH 14/17] nvmet: Add metadata/T10-PI support Max Gurtovoy
2020-04-21 15:30 ` Christoph Hellwig
2020-04-23 12:39 ` Max Gurtovoy
2020-04-24 7:14 ` Christoph Hellwig
2020-04-26 10:50 ` Max Gurtovoy
2020-04-27 6:06 ` Christoph Hellwig
2020-03-27 17:15 ` [PATCH 15/17] nvmet: Add metadata support for block devices Max Gurtovoy
2020-04-21 15:33 ` Christoph Hellwig
2020-04-23 17:25 ` Max Gurtovoy
2020-04-24 7:54 ` Christoph Hellwig
2020-03-27 17:15 ` [PATCH 16/17] RDMA/rw: Expose maximal page list for a device per 1 MR Max Gurtovoy
2020-03-27 17:15 ` [PATCH 17/17] nvmet-rdma: Add metadata/T10-PI support Max Gurtovoy
2020-04-21 15:37 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200327171545.98970-11-maxg@mellanox.com \
--to=maxg@mellanox.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=idanb@mellanox.com \
--cc=israelr@mellanox.com \
--cc=jgg@mellanox.com \
--cc=jsmart2021@gmail.com \
--cc=kbusch@kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-rdma@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=oren@mellanox.com \
--cc=sagi@grimberg.me \
--cc=shlomin@mellanox.com \
--cc=vladimirk@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).