All of lore.kernel.org
 help / color / mirror / Atom feed
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 7/8] nvmet: allow overriding the NVMe VS via configfs
Date: Fri,  2 Jun 2017 11:45:35 +0200	[thread overview]
Message-ID: <20170602094536.25775-8-jthumshirn@suse.de> (raw)
In-Reply-To: <20170602094536.25775-1-jthumshirn@suse.de>

Allow overriding the announced NVMe Version of a via configfs.

This is particularly helpful when debugging new features for the host
or target side without bumping the hard coded version (as the target
might not be fully compliant to the announced version yet).

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
---
 drivers/nvme/target/configfs.c | 34 ++++++++++++++++++++++++++++++++++
 include/linux/nvme.h           |  4 ++++
 2 files changed, 38 insertions(+)

diff --git a/drivers/nvme/target/configfs.c b/drivers/nvme/target/configfs.c
index 16f9f6e3a084..45421d4308a4 100644
--- a/drivers/nvme/target/configfs.c
+++ b/drivers/nvme/target/configfs.c
@@ -650,8 +650,42 @@ static ssize_t nvmet_subsys_attr_allow_any_host_store(struct config_item *item,
 
 CONFIGFS_ATTR(nvmet_subsys_, attr_allow_any_host);
 
+static ssize_t nvmet_subsys_version_show(struct config_item *item,
+					      char *page)
+{
+	struct nvmet_subsys *subsys = to_subsys(item);
+	int major, minor, tertiary;
+	u32 ver;
+
+	ver = subsys->ver;
+	major = NVME_MAJOR(ver);
+	minor = NVME_MINOR(ver);
+	tertiary = NVME_TERRIARY(ver);
+
+	return snprintf(page, PAGE_SIZE, "%d %d %d\n", major, minor, tertiary);
+}
+
+static ssize_t nvmet_subsys_version_store(struct config_item *item,
+					       const char *page, size_t count)
+{
+	struct nvmet_subsys *subsys = to_subsys(item);
+	int major, minor, tertiary;
+	int ret;
+
+
+	ret = sscanf(page, "%d %d %d\n", &major, &minor, &tertiary);
+	if (ret != 3)
+		return -EINVAL;
+
+	subsys->ver = NVME_VS(major, minor, tertiary);
+
+	return count;
+}
+CONFIGFS_ATTR(nvmet_subsys_, version);
+
 static struct configfs_attribute *nvmet_subsys_attrs[] = {
 	&nvmet_subsys_attr_attr_allow_any_host,
+	&nvmet_subsys_attr_version,
 	NULL,
 };
 
diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index afa6ef484e50..0d6e307a7aa4 100644
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -1069,4 +1069,8 @@ struct nvme_completion {
 #define NVME_VS(major, minor, tertiary) \
 	(((major) << 16) | ((minor) << 8) | (tertiary))
 
+#define NVME_MAJOR(ver)		((ver) >> 16)
+#define NVME_MINOR(ver)		(((ver) >> 8) & 0xff)
+#define NVME_TERRIARY(ver)	((ver) & 0xff)
+
 #endif /* _LINUX_NVME_H */
-- 
2.12.0

WARNING: multiple messages have this Message-ID (diff)
From: jthumshirn@suse.de (Johannes Thumshirn)
Subject: [PATCH v3 7/8] nvmet: allow overriding the NVMe VS via configfs
Date: Fri,  2 Jun 2017 11:45:35 +0200	[thread overview]
Message-ID: <20170602094536.25775-8-jthumshirn@suse.de> (raw)
In-Reply-To: <20170602094536.25775-1-jthumshirn@suse.de>

Allow overriding the announced NVMe Version of a via configfs.

This is particularly helpful when debugging new features for the host
or target side without bumping the hard coded version (as the target
might not be fully compliant to the announced version yet).

Signed-off-by: Johannes Thumshirn <jthumshirn at suse.de>
---
 drivers/nvme/target/configfs.c | 34 ++++++++++++++++++++++++++++++++++
 include/linux/nvme.h           |  4 ++++
 2 files changed, 38 insertions(+)

diff --git a/drivers/nvme/target/configfs.c b/drivers/nvme/target/configfs.c
index 16f9f6e3a084..45421d4308a4 100644
--- a/drivers/nvme/target/configfs.c
+++ b/drivers/nvme/target/configfs.c
@@ -650,8 +650,42 @@ static ssize_t nvmet_subsys_attr_allow_any_host_store(struct config_item *item,
 
 CONFIGFS_ATTR(nvmet_subsys_, attr_allow_any_host);
 
+static ssize_t nvmet_subsys_version_show(struct config_item *item,
+					      char *page)
+{
+	struct nvmet_subsys *subsys = to_subsys(item);
+	int major, minor, tertiary;
+	u32 ver;
+
+	ver = subsys->ver;
+	major = NVME_MAJOR(ver);
+	minor = NVME_MINOR(ver);
+	tertiary = NVME_TERRIARY(ver);
+
+	return snprintf(page, PAGE_SIZE, "%d %d %d\n", major, minor, tertiary);
+}
+
+static ssize_t nvmet_subsys_version_store(struct config_item *item,
+					       const char *page, size_t count)
+{
+	struct nvmet_subsys *subsys = to_subsys(item);
+	int major, minor, tertiary;
+	int ret;
+
+
+	ret = sscanf(page, "%d %d %d\n", &major, &minor, &tertiary);
+	if (ret != 3)
+		return -EINVAL;
+
+	subsys->ver = NVME_VS(major, minor, tertiary);
+
+	return count;
+}
+CONFIGFS_ATTR(nvmet_subsys_, version);
+
 static struct configfs_attribute *nvmet_subsys_attrs[] = {
 	&nvmet_subsys_attr_attr_allow_any_host,
+	&nvmet_subsys_attr_version,
 	NULL,
 };
 
diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index afa6ef484e50..0d6e307a7aa4 100644
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -1069,4 +1069,8 @@ struct nvme_completion {
 #define NVME_VS(major, minor, tertiary) \
 	(((major) << 16) | ((minor) << 8) | (tertiary))
 
+#define NVME_MAJOR(ver)		((ver) >> 16)
+#define NVME_MINOR(ver)		(((ver) >> 8) & 0xff)
+#define NVME_TERRIARY(ver)	((ver) & 0xff)
+
 #endif /* _LINUX_NVME_H */
-- 
2.12.0

  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 ` [PATCH v3 3/8] nvmet: implement namespace identify descriptor list Johannes Thumshirn
2017-06-02  9:45   ` 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 ` Johannes Thumshirn [this message]
2017-06-02  9:45   ` [PATCH v3 7/8] nvmet: allow overriding the NVMe VS via configfs 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-8-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 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.