Commit 381af577 authored Dec 19, 2017 by Changpeng Liu Committed by Jim Harris Dec 21, 2017

nvme: re-enable the separate metadata support in nvme driver



Commit ID "269910c0" removed the support of separate metadata,
for those controllers which can support this feature, SPDK driver
can't be used. SPDK provides APIs such as:
spdk_nvme_ctrlr_cmd_io_raw_with_md/spdk_nvme_ns_cmd_write_with_md/
spdk_nvme_ns_cmd_read_with_md, which can support separate metadata.
While here, re-enable this feature with this commit.

Change-Id: If77c21e9ac700c4b334548ebfa7e8e6286285a64
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/392440


Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>

parent 710d59a5

lib/nvme/nvme_pcie.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -1836,6 +1836,7 @@ nvme_pcie_qpair_submit_request(struct spdk_nvme_qpair *qpair, struct nvme_reques
		{
		struct nvme_tracker *tr;
		int rc = 0;
		void *md_payload;
		struct spdk_nvme_ctrlr *ctrlr = qpair->ctrlr;
		struct nvme_pcie_qpair *pqpair = nvme_pcie_qpair(qpair);

		@@ -1866,6 +1867,16 @@ nvme_pcie_qpair_submit_request(struct spdk_nvme_qpair *qpair, struct nvme_reques
		tr->req = req;
		req->cmd.cid = tr->cid;

		if (req->payload_size && req->payload.md) {
		md_payload = req->payload.md + req->md_offset;
		tr->req->cmd.mptr = spdk_vtophys(md_payload);
		if (tr->req->cmd.mptr == SPDK_VTOPHYS_ERROR) {
		nvme_pcie_fail_request_bad_vtophys(qpair, tr);
		rc = -EINVAL;
		goto exit;
		}
		}

		if (req->payload_size == 0) {
		/* Null payload - leave PRP fields zeroed */
		rc = 0;