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>, Max Gurtovoy <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 v6 06/10] nvmet: add uuid field to nvme_ns and populate via configfs Date: Wed, 7 Jun 2017 11:45:33 +0200 [thread overview] Message-ID: <20170607094536.32419-7-jthumshirn@suse.de> (raw) In-Reply-To: <20170607094536.32419-1-jthumshirn@suse.de> Add the UUID field from the NVMe Namespace Identification Descriptor to the nvmet_ns structure and allow it's population via configfs. Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> Reviewed-by: Max Gurtovoy <maxg@mellanox.com> Reviewed-by: Sagi Grimberg <sagi@grimberg.me> Reviewed-by: Hannes Reinecke <hare@suse.com> --- drivers/nvme/target/configfs.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/drivers/nvme/target/configfs.c b/drivers/nvme/target/configfs.c index be8c800078e2..83bfe28fe7da 100644 --- a/drivers/nvme/target/configfs.c +++ b/drivers/nvme/target/configfs.c @@ -305,11 +305,41 @@ static ssize_t nvmet_ns_device_path_store(struct config_item *item, CONFIGFS_ATTR(nvmet_ns_, device_path); +static ssize_t nvmet_ns_device_uuid_show(struct config_item *item, char *page) +{ + return sprintf(page, "%pUb\n", &to_nvmet_ns(item)->uuid); +} + +static ssize_t nvmet_ns_device_uuid_store(struct config_item *item, + const char *page, size_t count) +{ + struct nvmet_ns *ns = to_nvmet_ns(item); + struct nvmet_subsys *subsys = ns->subsys; + int ret = 0; + + + mutex_lock(&subsys->lock); + if (ns->enabled) { + ret = -EBUSY; + goto out_unlock; + } + + + if (uuid_parse(page, &ns->uuid)) + ret = -EINVAL; + +out_unlock: + mutex_unlock(&subsys->lock); + return ret ? ret : count; +} + static ssize_t nvmet_ns_device_nguid_show(struct config_item *item, char *page) { return sprintf(page, "%pUb\n", &to_nvmet_ns(item)->nguid); } +CONFIGFS_ATTR(nvmet_ns_, device_uuid); + static ssize_t nvmet_ns_device_nguid_store(struct config_item *item, const char *page, size_t count) { @@ -379,6 +409,7 @@ CONFIGFS_ATTR(nvmet_ns_, enable); static struct configfs_attribute *nvmet_ns_attrs[] = { &nvmet_ns_attr_device_path, &nvmet_ns_attr_device_nguid, + &nvmet_ns_attr_device_uuid, &nvmet_ns_attr_enable, NULL, }; -- 2.12.3
WARNING: multiple messages have this Message-ID (diff)
From: jthumshirn@suse.de (Johannes Thumshirn) Subject: [PATCH v6 06/10] nvmet: add uuid field to nvme_ns and populate via configfs Date: Wed, 7 Jun 2017 11:45:33 +0200 [thread overview] Message-ID: <20170607094536.32419-7-jthumshirn@suse.de> (raw) In-Reply-To: <20170607094536.32419-1-jthumshirn@suse.de> Add the UUID field from the NVMe Namespace Identification Descriptor to the nvmet_ns structure and allow it's population via configfs. Signed-off-by: Johannes Thumshirn <jthumshirn at suse.de> Reviewed-by: Max Gurtovoy <maxg at mellanox.com> Reviewed-by: Sagi Grimberg <sagi at grimberg.me> Reviewed-by: Hannes Reinecke <hare at suse.com> --- drivers/nvme/target/configfs.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/drivers/nvme/target/configfs.c b/drivers/nvme/target/configfs.c index be8c800078e2..83bfe28fe7da 100644 --- a/drivers/nvme/target/configfs.c +++ b/drivers/nvme/target/configfs.c @@ -305,11 +305,41 @@ static ssize_t nvmet_ns_device_path_store(struct config_item *item, CONFIGFS_ATTR(nvmet_ns_, device_path); +static ssize_t nvmet_ns_device_uuid_show(struct config_item *item, char *page) +{ + return sprintf(page, "%pUb\n", &to_nvmet_ns(item)->uuid); +} + +static ssize_t nvmet_ns_device_uuid_store(struct config_item *item, + const char *page, size_t count) +{ + struct nvmet_ns *ns = to_nvmet_ns(item); + struct nvmet_subsys *subsys = ns->subsys; + int ret = 0; + + + mutex_lock(&subsys->lock); + if (ns->enabled) { + ret = -EBUSY; + goto out_unlock; + } + + + if (uuid_parse(page, &ns->uuid)) + ret = -EINVAL; + +out_unlock: + mutex_unlock(&subsys->lock); + return ret ? ret : count; +} + static ssize_t nvmet_ns_device_nguid_show(struct config_item *item, char *page) { return sprintf(page, "%pUb\n", &to_nvmet_ns(item)->nguid); } +CONFIGFS_ATTR(nvmet_ns_, device_uuid); + static ssize_t nvmet_ns_device_nguid_store(struct config_item *item, const char *page, size_t count) { @@ -379,6 +409,7 @@ CONFIGFS_ATTR(nvmet_ns_, enable); static struct configfs_attribute *nvmet_ns_attrs[] = { &nvmet_ns_attr_device_path, &nvmet_ns_attr_device_nguid, + &nvmet_ns_attr_device_uuid, &nvmet_ns_attr_enable, NULL, }; -- 2.12.3
next prev parent reply other threads:[~2017-06-07 9:48 UTC|newest] Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-06-07 9:45 [PATCH v6 00/10] Implement NVMe Namespace Descriptor Identification Johannes Thumshirn 2017-06-07 9:45 ` Johannes Thumshirn 2017-06-07 9:45 ` [PATCH v6 01/10] scatterlist: add sg_zeroout_area() helper Johannes Thumshirn 2017-06-07 9:45 ` Johannes Thumshirn 2017-06-07 9:49 ` Sagi Grimberg 2017-06-07 9:49 ` Sagi Grimberg 2017-06-08 7:41 ` Christoph Hellwig 2017-06-08 7:41 ` Christoph Hellwig 2017-06-08 7:46 ` Johannes Thumshirn 2017-06-08 7:46 ` Johannes Thumshirn 2017-06-07 9:45 ` [PATCH v6 02/10] nvmet: use NVME_IDENTIFY_DATA_SIZE Johannes Thumshirn 2017-06-07 9:45 ` Johannes Thumshirn 2017-06-08 7:42 ` Christoph Hellwig 2017-06-08 7:42 ` Christoph Hellwig 2017-06-07 9:45 ` [PATCH v6 03/10] nvme: introduce NVMe Namespace Identification Descriptor structures Johannes Thumshirn 2017-06-07 9:45 ` Johannes Thumshirn 2017-06-08 7:42 ` Christoph Hellwig 2017-06-08 7:42 ` Christoph Hellwig 2017-06-07 9:45 ` [PATCH v6 04/10] nvme: rename uuid to nguid in nvme_ns Johannes Thumshirn 2017-06-07 9:45 ` Johannes Thumshirn 2017-06-07 9:45 ` [PATCH v6 05/10] nvmet: implement namespace identify descriptor list Johannes Thumshirn 2017-06-07 9:45 ` Johannes Thumshirn 2017-06-07 9:50 ` Sagi Grimberg 2017-06-07 9:50 ` Sagi Grimberg 2017-06-08 7:44 ` Christoph Hellwig 2017-06-08 7:44 ` Christoph Hellwig 2017-06-08 7:49 ` Johannes Thumshirn 2017-06-08 7:49 ` Johannes Thumshirn 2017-06-08 7:52 ` Christoph Hellwig 2017-06-08 7:52 ` Christoph Hellwig 2017-06-08 7:55 ` Johannes Thumshirn 2017-06-08 7:55 ` Johannes Thumshirn 2017-06-08 7:57 ` Christoph Hellwig 2017-06-08 7:57 ` Christoph Hellwig [not found] ` <MWHPR04MB10088151BCB7D7A209A739E686CD0@MWHPR04MB1008.namprd04.prod.outlook.com> 2017-06-12 16:19 ` Christoph Hellwig 2017-06-12 16:19 ` Christoph Hellwig 2017-06-07 9:45 ` Johannes Thumshirn [this message] 2017-06-07 9:45 ` [PATCH v6 06/10] nvmet: add uuid field to nvme_ns and populate via configfs Johannes Thumshirn 2017-06-08 7:44 ` Christoph Hellwig 2017-06-08 7:44 ` Christoph Hellwig 2017-06-07 9:45 ` [PATCH v6 07/10] nvme: get list of namespace descriptors Johannes Thumshirn 2017-06-07 9:45 ` Johannes Thumshirn 2017-06-08 7:46 ` Christoph Hellwig 2017-06-08 7:46 ` Christoph Hellwig 2017-06-07 9:45 ` [PATCH v6 08/10] nvme: provide UUID value to userspace Johannes Thumshirn 2017-06-07 9:45 ` Johannes Thumshirn 2017-06-07 9:45 ` [PATCH v6 09/10] nvmet: allow overriding the NVMe VS via configfs Johannes Thumshirn 2017-06-07 9:45 ` Johannes Thumshirn 2017-06-08 7:47 ` Christoph Hellwig 2017-06-08 7:47 ` Christoph Hellwig 2017-06-15 16:31 ` [PATCH v6 00/10] Implement NVMe Namespace Descriptor Identification Christoph Hellwig 2017-06-15 16:31 ` Christoph Hellwig 2017-06-16 8:20 ` Johannes Thumshirn 2017-06-16 8:20 ` Johannes Thumshirn 2017-06-16 9:40 ` Christoph Hellwig 2017-06-16 9:40 ` Christoph Hellwig 2017-06-16 9:48 ` Johannes Thumshirn 2017-06-16 9:48 ` Johannes Thumshirn 2017-06-16 9:58 ` Christoph Hellwig 2017-06-16 9:58 ` Christoph Hellwig 2017-06-16 9:59 ` Johannes Thumshirn 2017-06-16 9:59 ` Johannes Thumshirn 2017-06-16 13:28 ` Linus Torvalds 2017-06-16 13:28 ` Linus Torvalds 2017-06-17 12:08 ` odd sysfs find behavior, was: " Christoph Hellwig 2017-06-18 1:12 ` Greg Kroah-Hartman 2017-06-18 7:32 ` Christoph Hellwig [not found] ` <20170618073305.GB25797@lst.de> 2017-06-18 10:20 ` Tejun Heo 2017-06-18 10:32 ` Tejun Heo 2017-06-18 13:43 ` Christoph Hellwig 2017-06-19 17:59 ` Tejun Heo 2017-06-21 14:48 ` Greg Kroah-Hartman 2017-06-21 15:36 ` Tejun Heo 2017-06-22 0:21 ` Linus Torvalds 2017-06-22 0:06 ` Eric W. Biederman 2017-06-22 0:06 ` Eric W. Biederman
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=20170607094536.32419-7-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.