From: Johannes Thumshirn <jthumshirn@suse.de> To: Christoph Hellwig <hch@lst.de>, Sagi Grimberg <sagi@grimberg.me>, Keith Busch <keith.busch@intel.com> Cc: Hannes Reinecke <hare@suse.de>, maxg@mellanox.com, Linux NVMe Mailinglist <linux-nvme@lists.infradead.org>, Linux Kernel Mailinglist <linux-kernel@vger.kernel.org>, Johannes Thumshirn <jthumshirn@suse.de> Subject: [PATCH v3 3/8] nvmet: implement namespace identify descriptor list Date: Fri, 2 Jun 2017 11:45:31 +0200 [thread overview] Message-ID: <20170602094536.25775-4-jthumshirn@suse.de> (raw) In-Reply-To: <20170602094536.25775-1-jthumshirn@suse.de> A NVMe Identify NS command with a CNS value of '3' is expecting a list of Namespace Identification Descriptor structures to be returned to the host for the namespace requested in the namespace identify command. This Namespace Identification Descriptor structure consists of the type of the namespace identifier, the length of the identifier and the actual identifier. Valid types are NGUID and UUID which we have saved in our nvme_ns structure if they have been configured via configfs. If no value has been assigened to one of these we return an "invalid opcode" back to the host to maintain backward compatibiliy with older implementations without Namespace Identify Descriptor list support. Also as the Namespace Identify Descriptor list is the only mandatory feature change between 1.2.1 and 1.3.0 we can bump the advertised version as well. Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> --- drivers/nvme/target/admin-cmd.c | 53 +++++++++++++++++++++++++++++++++++++++++ drivers/nvme/target/core.c | 2 +- drivers/nvme/target/nvmet.h | 1 + 3 files changed, 55 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c index ff1f97006322..833b5ef935c3 100644 --- a/drivers/nvme/target/admin-cmd.c +++ b/drivers/nvme/target/admin-cmd.c @@ -367,6 +367,56 @@ static void nvmet_execute_identify_nslist(struct nvmet_req *req) nvmet_req_complete(req, status); } +static void nvmet_execute_identify_desclist(struct nvmet_req *req) +{ + struct nvmet_ns *ns; + struct nvme_ns_identifier_hdr hdr; + u16 status = 0; + off_t off = 0; + + ns = nvmet_find_namespace(req->sq->ctrl, req->cmd->identify.nsid); + if (!ns) { + status = NVME_SC_INVALID_NS | NVME_SC_DNR; + goto out; + } + + if (memchr_inv(&ns->uuid, 0, sizeof(ns->uuid))) { + memset(&hdr, 0, sizeof(hdr)); + hdr.nidt = NVME_NIDT_UUID; + hdr.nidl = NVME_NIDT_UUID_LEN; + status = nvmet_copy_to_sgl(req, off, &hdr, sizeof(hdr)); + if (status) + goto out_put_ns; + off += sizeof(hdr); + + status = nvmet_copy_to_sgl(req, off, &ns->uuid, + sizeof(ns->uuid)); + if (status) + goto out_put_ns; + off += sizeof(ns->uuid); + } + if (memchr_inv(ns->nguid, 0, sizeof(ns->nguid))) { + memset(&hdr, 0, sizeof(hdr)); + hdr.nidt = NVME_NIDT_NGUID; + hdr.nidl = NVME_NIDT_NGUID_LEN; + status = nvmet_copy_to_sgl(req, off, &hdr, sizeof(hdr)); + if (status) + goto out_put_ns; + off += sizeof(hdr); + + status = nvmet_copy_to_sgl(req, off, &ns->nguid, + sizeof(ns->nguid)); + if (status) + goto out_put_ns; + off += sizeof(ns->nguid); + } + +out_put_ns: + nvmet_put_namespace(ns); +out: + nvmet_req_complete(req, status); +} + /* * A "mimimum viable" abort implementation: the command is mandatory in the * spec, but we are not required to do any useful work. We couldn't really @@ -515,6 +565,9 @@ u16 nvmet_parse_admin_cmd(struct nvmet_req *req) case NVME_ID_CNS_NS_ACTIVE_LIST: req->execute = nvmet_execute_identify_nslist; return 0; + case NVME_ID_CNS_NS_DESC_LIST: + req->execute = nvmet_execute_identify_desclist; + return 0; } break; case nvme_admin_abort_cmd: diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c index eb9399ac97cf..d4eeee4f2fab 100644 --- a/drivers/nvme/target/core.c +++ b/drivers/nvme/target/core.c @@ -926,7 +926,7 @@ struct nvmet_subsys *nvmet_subsys_alloc(const char *subsysnqn, if (!subsys) return NULL; - subsys->ver = NVME_VS(1, 2, 1); /* NVMe 1.2.1 */ + subsys->ver = NVME_VS(1, 3, 0); /* NVMe 1.3.0 */ switch (type) { case NVME_NQN_NVME: diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h index cfc5c7fb0ab7..4c6cb5ea1186 100644 --- a/drivers/nvme/target/nvmet.h +++ b/drivers/nvme/target/nvmet.h @@ -46,6 +46,7 @@ struct nvmet_ns { u32 blksize_shift; loff_t size; u8 nguid[16]; + uuid_be uuid; bool enabled; struct nvmet_subsys *subsys; -- 2.12.0
WARNING: multiple messages have this Message-ID (diff)
From: jthumshirn@suse.de (Johannes Thumshirn) Subject: [PATCH v3 3/8] nvmet: implement namespace identify descriptor list Date: Fri, 2 Jun 2017 11:45:31 +0200 [thread overview] Message-ID: <20170602094536.25775-4-jthumshirn@suse.de> (raw) In-Reply-To: <20170602094536.25775-1-jthumshirn@suse.de> A NVMe Identify NS command with a CNS value of '3' is expecting a list of Namespace Identification Descriptor structures to be returned to the host for the namespace requested in the namespace identify command. This Namespace Identification Descriptor structure consists of the type of the namespace identifier, the length of the identifier and the actual identifier. Valid types are NGUID and UUID which we have saved in our nvme_ns structure if they have been configured via configfs. If no value has been assigened to one of these we return an "invalid opcode" back to the host to maintain backward compatibiliy with older implementations without Namespace Identify Descriptor list support. Also as the Namespace Identify Descriptor list is the only mandatory feature change between 1.2.1 and 1.3.0 we can bump the advertised version as well. Signed-off-by: Johannes Thumshirn <jthumshirn at suse.de> --- drivers/nvme/target/admin-cmd.c | 53 +++++++++++++++++++++++++++++++++++++++++ drivers/nvme/target/core.c | 2 +- drivers/nvme/target/nvmet.h | 1 + 3 files changed, 55 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c index ff1f97006322..833b5ef935c3 100644 --- a/drivers/nvme/target/admin-cmd.c +++ b/drivers/nvme/target/admin-cmd.c @@ -367,6 +367,56 @@ static void nvmet_execute_identify_nslist(struct nvmet_req *req) nvmet_req_complete(req, status); } +static void nvmet_execute_identify_desclist(struct nvmet_req *req) +{ + struct nvmet_ns *ns; + struct nvme_ns_identifier_hdr hdr; + u16 status = 0; + off_t off = 0; + + ns = nvmet_find_namespace(req->sq->ctrl, req->cmd->identify.nsid); + if (!ns) { + status = NVME_SC_INVALID_NS | NVME_SC_DNR; + goto out; + } + + if (memchr_inv(&ns->uuid, 0, sizeof(ns->uuid))) { + memset(&hdr, 0, sizeof(hdr)); + hdr.nidt = NVME_NIDT_UUID; + hdr.nidl = NVME_NIDT_UUID_LEN; + status = nvmet_copy_to_sgl(req, off, &hdr, sizeof(hdr)); + if (status) + goto out_put_ns; + off += sizeof(hdr); + + status = nvmet_copy_to_sgl(req, off, &ns->uuid, + sizeof(ns->uuid)); + if (status) + goto out_put_ns; + off += sizeof(ns->uuid); + } + if (memchr_inv(ns->nguid, 0, sizeof(ns->nguid))) { + memset(&hdr, 0, sizeof(hdr)); + hdr.nidt = NVME_NIDT_NGUID; + hdr.nidl = NVME_NIDT_NGUID_LEN; + status = nvmet_copy_to_sgl(req, off, &hdr, sizeof(hdr)); + if (status) + goto out_put_ns; + off += sizeof(hdr); + + status = nvmet_copy_to_sgl(req, off, &ns->nguid, + sizeof(ns->nguid)); + if (status) + goto out_put_ns; + off += sizeof(ns->nguid); + } + +out_put_ns: + nvmet_put_namespace(ns); +out: + nvmet_req_complete(req, status); +} + /* * A "mimimum viable" abort implementation: the command is mandatory in the * spec, but we are not required to do any useful work. We couldn't really @@ -515,6 +565,9 @@ u16 nvmet_parse_admin_cmd(struct nvmet_req *req) case NVME_ID_CNS_NS_ACTIVE_LIST: req->execute = nvmet_execute_identify_nslist; return 0; + case NVME_ID_CNS_NS_DESC_LIST: + req->execute = nvmet_execute_identify_desclist; + return 0; } break; case nvme_admin_abort_cmd: diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c index eb9399ac97cf..d4eeee4f2fab 100644 --- a/drivers/nvme/target/core.c +++ b/drivers/nvme/target/core.c @@ -926,7 +926,7 @@ struct nvmet_subsys *nvmet_subsys_alloc(const char *subsysnqn, if (!subsys) return NULL; - subsys->ver = NVME_VS(1, 2, 1); /* NVMe 1.2.1 */ + subsys->ver = NVME_VS(1, 3, 0); /* NVMe 1.3.0 */ switch (type) { case NVME_NQN_NVME: diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h index cfc5c7fb0ab7..4c6cb5ea1186 100644 --- a/drivers/nvme/target/nvmet.h +++ b/drivers/nvme/target/nvmet.h @@ -46,6 +46,7 @@ struct nvmet_ns { u32 blksize_shift; loff_t size; u8 nguid[16]; + uuid_be uuid; bool enabled; struct nvmet_subsys *subsys; -- 2.12.0
next prev parent reply other threads:[~2017-06-02 9:47 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-06-02 9:45 [PATCH v3 0/8] Implement NVMe Namespace Descriptor Identification Johannes Thumshirn 2017-06-02 9:45 ` Johannes Thumshirn 2017-06-02 9:45 ` [PATCH v3 1/8] nvme: introduce NVMe Namespace Identification Descriptor structures Johannes Thumshirn 2017-06-02 9:45 ` Johannes Thumshirn 2017-06-02 9:45 ` [PATCH v3 2/8] nvme: rename uuid to nguid in nvme_ns Johannes Thumshirn 2017-06-02 9:45 ` Johannes Thumshirn 2017-06-02 9:45 ` Johannes Thumshirn [this message] 2017-06-02 9:45 ` [PATCH v3 3/8] nvmet: implement namespace identify descriptor list Johannes Thumshirn 2017-06-02 13:46 ` Sagi Grimberg 2017-06-02 13:46 ` Sagi Grimberg 2017-06-02 13:54 ` Johannes Thumshirn 2017-06-02 13:54 ` Johannes Thumshirn 2017-06-03 5:18 ` Christoph Hellwig 2017-06-03 5:18 ` Christoph Hellwig 2017-06-03 8:03 ` Sagi Grimberg 2017-06-03 8:03 ` Sagi Grimberg 2017-06-05 5:31 ` Christoph Hellwig 2017-06-05 5:31 ` Christoph Hellwig 2017-06-06 7:17 ` Johannes Thumshirn 2017-06-06 7:17 ` Johannes Thumshirn 2017-06-06 7:19 ` Christoph Hellwig 2017-06-06 7:19 ` Christoph Hellwig 2017-06-06 7:20 ` Johannes Thumshirn 2017-06-06 7:20 ` Johannes Thumshirn 2017-06-02 9:45 ` [PATCH v3 4/8] nvmet: add uuid field to nvme_ns and populate via configfs Johannes Thumshirn 2017-06-02 9:45 ` Johannes Thumshirn 2017-06-02 9:45 ` [PATCH v3 5/8] nvme: get list of namespace descriptors Johannes Thumshirn 2017-06-02 9:45 ` Johannes Thumshirn 2017-06-02 9:45 ` [PATCH v3 6/8] nvme: provide UUID value to userspace Johannes Thumshirn 2017-06-02 9:45 ` Johannes Thumshirn 2017-06-02 9:45 ` [PATCH v3 7/8] nvmet: allow overriding the NVMe VS via configfs Johannes Thumshirn 2017-06-02 9:45 ` Johannes Thumshirn 2017-06-02 9:45 ` [PATCH v3 8/8] nvmet: use NVME_IDENTIFY_DATA_SIZE Johannes Thumshirn 2017-06-02 9:45 ` Johannes Thumshirn
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=20170602094536.25775-4-jthumshirn@suse.de \ --to=jthumshirn@suse.de \ --cc=hare@suse.de \ --cc=hch@lst.de \ --cc=keith.busch@intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nvme@lists.infradead.org \ --cc=maxg@mellanox.com \ --cc=sagi@grimberg.me \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.