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 v4 6/8] nvme: provide UUID value to userspace
Date: Sun, 4 Jun 2017 12:36:47 +0200 [thread overview]
Message-ID: <20170604103649.22130-7-jthumshirn@suse.de> (raw)
In-Reply-To: <20170604103649.22130-1-jthumshirn@suse.de>
Now that we have a way for getting the UUID from a target, provide it
to userspace as well.
Unfortunately there is already a sysfs attribute called UUID which is
a misnomer as it holds the NGUID value. So instead of creating yet
another wrong name, create a new 'nguid' sysfs attribute for the
NGUID. For the UUID attribute add a check wheter the namespace has a
UUID assigned to it and return this or return the NGUID to maintain
backwards compatibility. This should give userspace a chance to catch
up.
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
---
drivers/nvme/host/core.c | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 37047841da0e..3aa5b12680e5 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1887,11 +1887,28 @@ static ssize_t wwid_show(struct device *dev, struct device_attribute *attr,
}
static DEVICE_ATTR(wwid, S_IRUGO, wwid_show, NULL);
+static ssize_t nguid_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct nvme_ns *ns = nvme_get_ns_from_dev(dev);
+ return sprintf(buf, "%pU\n", ns->nguid);
+}
+static DEVICE_ATTR(nguid, S_IRUGO, nguid_show, NULL);
+
static ssize_t uuid_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
struct nvme_ns *ns = nvme_get_ns_from_dev(dev);
- return sprintf(buf, "%pU\n", ns->nguid);
+
+ /* For backward compatibility expose the NGUID to userspace if
+ * we have no UUID set
+ */
+ if (!memchr_inv(ns->uuid, 0, sizeof(ns->uuid))) {
+ printk_ratelimited(KERN_WARNING
+ "No UUID available providing old NGUID\n");
+ return sprintf(buf, "%pU\n", ns->nguid);
+ }
+ return sprintf(buf, "%pU\n", ns->uuid);
}
static DEVICE_ATTR(uuid, S_IRUGO, uuid_show, NULL);
@@ -1914,6 +1931,7 @@ static DEVICE_ATTR(nsid, S_IRUGO, nsid_show, NULL);
static struct attribute *nvme_ns_attrs[] = {
&dev_attr_wwid.attr,
&dev_attr_uuid.attr,
+ &dev_attr_nguid.attr,
&dev_attr_eui.attr,
&dev_attr_nsid.attr,
NULL,
@@ -1926,6 +1944,11 @@ static umode_t nvme_ns_attrs_are_visible(struct kobject *kobj,
struct nvme_ns *ns = nvme_get_ns_from_dev(dev);
if (a == &dev_attr_uuid.attr) {
+ if (!memchr_inv(ns->uuid, 0, sizeof(ns->uuid)) ||
+ !memchr_inv(ns->nguid, 0, sizeof(ns->nguid)))
+ return 0;
+ }
+ if (a == &dev_attr_nguid.attr) {
if (!memchr_inv(ns->nguid, 0, sizeof(ns->nguid)))
return 0;
}
--
2.12.0
next prev parent reply other threads:[~2017-06-04 10:38 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-04 10:36 [PATCH v4 0/8] Implement NVMe Namespace Descriptor Identification Johannes Thumshirn
2017-06-04 10:36 ` [PATCH v4 1/8] nvme: introduce NVMe Namespace Identification Descriptor structures Johannes Thumshirn
2017-06-04 14:43 ` Sagi Grimberg
2017-06-04 14:59 ` Sagi Grimberg
2017-06-05 5:33 ` Christoph Hellwig
2017-06-06 6:23 ` Hannes Reinecke
2017-06-04 10:36 ` [PATCH v4 2/8] nvme: rename uuid to nguid in nvme_ns Johannes Thumshirn
2017-06-04 14:43 ` Sagi Grimberg
2017-06-04 10:36 ` [PATCH v4 3/8] nvmet: implement namespace identify descriptor list Johannes Thumshirn
2017-06-04 15:00 ` Sagi Grimberg
2017-06-05 5:35 ` Christoph Hellwig
2017-06-06 12:04 ` Johannes Thumshirn
2017-06-06 6:23 ` Hannes Reinecke
2017-06-04 10:36 ` [PATCH v4 4/8] nvmet: add uuid field to nvme_ns and populate via configfs Johannes Thumshirn
2017-06-04 11:46 ` Max Gurtovoy
2017-06-04 15:01 ` Sagi Grimberg
2017-06-06 6:24 ` Hannes Reinecke
2017-06-04 10:36 ` [PATCH v4 5/8] nvme: get list of namespace descriptors Johannes Thumshirn
2017-06-04 15:06 ` Sagi Grimberg
2017-06-05 5:38 ` Christoph Hellwig
2017-06-06 7:15 ` Sagi Grimberg
2017-06-06 6:24 ` Hannes Reinecke
2017-06-04 10:36 ` Johannes Thumshirn [this message]
2017-06-04 15:06 ` [PATCH v4 6/8] nvme: provide UUID value to userspace Sagi Grimberg
2017-06-04 10:36 ` [PATCH v4 7/8] nvmet: allow overriding the NVMe VS via configfs Johannes Thumshirn
2017-06-04 15:08 ` Sagi Grimberg
2017-06-05 5:45 ` Christoph Hellwig
2017-06-06 6:25 ` Hannes Reinecke
2017-06-04 10:36 ` [PATCH v4 8/8] nvmet: use NVME_IDENTIFY_DATA_SIZE Johannes Thumshirn
2017-06-04 14:06 ` Max Gurtovoy
2017-06-04 15:09 ` Sagi Grimberg
2017-06-05 8:37 ` Christoph Hellwig
2017-06-06 6:26 ` Hannes Reinecke
2017-06-05 5:32 ` [PATCH v4 0/8] Implement NVMe Namespace Descriptor Identification 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=20170604103649.22130-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: 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).