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 Cc: axboe@kernel.dk, vladimirk@mellanox.com, shlomin@mellanox.com, israelr@mellanox.com, idanb@mellanox.com, oren@mellanox.com, maxg@mellanox.com Subject: [PATCH 08/15] nvmet: Prepare metadata request Date: Mon, 6 Jan 2020 15:37:29 +0200 Message-ID: <20200106133736.123038-10-maxg@mellanox.com> (raw) In-Reply-To: <20200106133736.123038-1-maxg@mellanox.com> From: Israel Rukshin <israelr@mellanox.com> 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 <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 28438b8..ab3ffc6 100644 --- a/drivers/nvme/target/core.c +++ b/drivers/nvme/target/core.c @@ -863,13 +863,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); @@ -941,6 +945,7 @@ bool nvmet_check_data_len(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) @@ -950,11 +955,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; } /* @@ -963,23 +980,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 46df45e..60011f3 100644 --- a/drivers/nvme/target/nvmet.h +++ b/drivers/nvme/target/nvmet.h @@ -291,6 +291,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 { @@ -304,8 +305,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; @@ -316,6 +319,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; -- 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 index Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-01-06 13:37 [PATCH 00/15 V3] nvme-rdma/nvmet-rdma: Add metadata/T10-PI support Max Gurtovoy 2020-01-06 13:37 ` [PATCH] nvme-cli/fabrics: Add pi_enable param to connect cmd Max Gurtovoy 2020-01-06 13:37 ` [PATCH 01/15] nvme: Introduce namespace features flag Max Gurtovoy 2020-01-07 18:07 ` Keith Busch 2020-01-08 12:00 ` Max Gurtovoy 2020-01-09 3:11 ` Martin K. Petersen 2020-01-09 10:38 ` Max Gurtovoy 2020-01-09 16:26 ` Keith Busch 2020-01-12 9:40 ` Max Gurtovoy 2020-01-13 20:31 ` Keith Busch 2020-01-14 16:04 ` Max Gurtovoy 2020-01-12 9:40 ` Max Gurtovoy 2020-01-06 13:37 ` [PATCH 02/15] nvme: Enforce extended LBA format for fabrics metadata Max Gurtovoy 2020-01-16 23:53 ` James Smart 2020-01-19 11:20 ` Max Gurtovoy 2020-01-21 17:40 ` James Smart 2020-01-06 13:37 ` [PATCH 03/15] nvme: Introduce max_integrity_segments ctrl attribute Max Gurtovoy 2020-01-09 3:12 ` Martin K. Petersen 2020-01-06 13:37 ` [PATCH 04/15] nvme-fabrics: Allow user enabling metadata/T10-PI support Max Gurtovoy 2020-01-06 13:37 ` [PATCH 05/15] nvme: Introduce NVME_INLINE_PROT_SG_CNT Max Gurtovoy 2020-01-09 3:13 ` Martin K. Petersen 2020-01-06 13:37 ` [PATCH 06/15] nvme-rdma: Introduce nvme_rdma_sgl structure Max Gurtovoy 2020-01-06 13:37 ` [PATCH 07/15] nvme-rdma: Add metadata/T10-PI support Max Gurtovoy 2020-01-06 13:37 ` Max Gurtovoy [this message] 2020-01-06 13:37 ` [PATCH 09/15] nvmet: Add metadata characteristics for a namespace Max Gurtovoy 2020-01-09 3:16 ` Martin K. Petersen 2020-01-06 13:37 ` [PATCH 10/15] nvmet: Rename nvmet_rw_len to nvmet_rw_data_len Max Gurtovoy 2020-01-09 3:17 ` Martin K. Petersen 2020-01-06 13:37 ` [PATCH 11/15] nvmet: Rename nvmet_check_data_len to nvmet_check_transfer_len Max Gurtovoy 2020-01-09 3:19 ` Martin K. Petersen 2020-01-06 13:37 ` [PATCH 12/15] nvme: Add Metadata Capabilities enumerations Max Gurtovoy 2020-01-06 13:37 ` [PATCH 13/15] nvmet: Add metadata/T10-PI support Max Gurtovoy 2020-01-09 3:24 ` Martin K. Petersen 2020-01-27 17:17 ` Max Gurtovoy 2020-01-29 2:32 ` Martin K. Petersen 2020-01-17 16:46 ` James Smart 2020-01-19 13:47 ` Max Gurtovoy 2020-01-06 13:37 ` [PATCH 14/15] nvmet: Add metadata support for block devices Max Gurtovoy 2020-01-06 13:37 ` [PATCH 15/15] nvmet-rdma: Add metadata/T10-PI support Max Gurtovoy 2020-01-09 3:29 ` Martin K. Petersen
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=20200106133736.123038-10-maxg@mellanox.com \ --to=maxg@mellanox.com \ --cc=axboe@kernel.dk \ --cc=hch@lst.de \ --cc=idanb@mellanox.com \ --cc=israelr@mellanox.com \ --cc=kbusch@kernel.org \ --cc=linux-nvme@lists.infradead.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
Linux-NVME Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-nvme/0 linux-nvme/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-nvme linux-nvme/ https://lore.kernel.org/linux-nvme \ linux-nvme@lists.infradead.org public-inbox-index linux-nvme Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.infradead.lists.linux-nvme AGPL code for this site: git clone https://public-inbox.org/public-inbox.git