From: Hannes Reinecke <hare@kernel.org>
To: Christoph Hellwig <hch@lst.de>
Cc: Sagi Grimberg <sagi@grimberg.me>, Keith Busch <kbusch@kernel.org>,
linux-nvme@lists.infradead.org, Hannes Reinecke <hare@kernel.org>
Subject: [PATCH 8/8] nvmet: add debugfs support for queues
Date: Fri, 22 Mar 2024 08:03:33 +0100 [thread overview]
Message-ID: <20240322070333.3820-9-hare@kernel.org> (raw)
In-Reply-To: <20240322070333.3820-1-hare@kernel.org>
Add debugfs entries to display the status of the controller
queues.
Signed-off-by: Hannes Reinecke <hare@kernel.org>
---
drivers/nvme/target/core.c | 2 ++
drivers/nvme/target/debugfs.c | 49 +++++++++++++++++++++++++++++++++++
drivers/nvme/target/debugfs.h | 8 ++++++
drivers/nvme/target/nvmet.h | 3 +++
4 files changed, 62 insertions(+)
diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c
index 4955819e4f5f..694e91cdfc8d 100644
--- a/drivers/nvme/target/core.c
+++ b/drivers/nvme/target/core.c
@@ -791,6 +791,7 @@ void nvmet_sq_setup(struct nvmet_ctrl *ctrl, struct nvmet_sq *sq,
sq->size = size;
ctrl->sqs[qid] = sq;
+ nvmet_debugfs_queue_setup(ctrl, sq);
}
static void nvmet_confirm_sq(struct percpu_ref *ref)
@@ -815,6 +816,7 @@ void nvmet_sq_destroy(struct nvmet_sq *sq)
wait_for_completion(&sq->free_done);
percpu_ref_exit(&sq->ref);
nvmet_auth_sq_free(sq);
+ nvmet_debugfs_queue_free(sq);
if (ctrl) {
/*
diff --git a/drivers/nvme/target/debugfs.c b/drivers/nvme/target/debugfs.c
index 40eeac97157a..a8fec34f36d4 100644
--- a/drivers/nvme/target/debugfs.c
+++ b/drivers/nvme/target/debugfs.c
@@ -35,6 +35,55 @@ struct dentry *nvmet_debugfs;
.release = single_release, \
}
+static int nvmet_queue_sqsize_show(struct seq_file *m, void *p)
+{
+ struct nvmet_sq *sq = (struct nvmet_sq *)m->private;
+
+ seq_printf(m, "%d\n", sq->size);
+ return 0;
+}
+NVMET_DEBUGFS_ATTR(nvmet_queue_sqsize);
+
+static int nvmet_queue_sqhead_show(struct seq_file *m, void *p)
+{
+ struct nvmet_sq *sq = (struct nvmet_sq *)m->private;
+ u32 sqhd = READ_ONCE(sq->sqhd);
+
+ if (sq->sqhd_disabled)
+ seq_puts(m, "disabled\n");
+ else
+ seq_printf(m, "%u\n", sqhd & 0x0000FFFF);
+ return 0;
+}
+NVMET_DEBUGFS_ATTR(nvmet_queue_sqhead);
+
+int nvmet_debugfs_queue_setup(struct nvmet_ctrl *ctrl, struct nvmet_sq *sq)
+{
+ char name[32];
+ struct dentry *parent = ctrl->debugfs_dir, *queue_dir;
+
+ if (!parent)
+ return -ENODEV;
+ if (!sq)
+ return -EINVAL;
+ snprintf(name, sizeof(name), "queue%d", sq->qid);
+ queue_dir = debugfs_create_dir(name, parent);
+ if (IS_ERR(queue_dir))
+ return PTR_ERR(queue_dir);
+ sq->debugfs_dir = queue_dir;
+ debugfs_create_file("sqsize", S_IRUSR, queue_dir,
+ sq, &nvmet_queue_sqsize_fops);
+ debugfs_create_file("sqhead", S_IRUSR, queue_dir,
+ sq, &nvmet_queue_sqhead_fops);
+ return 0;
+}
+
+void nvmet_debugfs_queue_free(struct nvmet_sq *sq)
+{
+ debugfs_remove_recursive(sq->debugfs_dir);
+ sq->debugfs_dir = NULL;
+}
+
static int nvmet_ctrl_hostnqn_show(struct seq_file *m, void *p)
{
struct nvmet_ctrl *ctrl = (struct nvmet_ctrl *)m->private;
diff --git a/drivers/nvme/target/debugfs.h b/drivers/nvme/target/debugfs.h
index ff09e5597614..5192f8012b79 100644
--- a/drivers/nvme/target/debugfs.h
+++ b/drivers/nvme/target/debugfs.h
@@ -14,6 +14,8 @@ int nvmet_debugfs_subsys_setup(struct nvmet_subsys *subsys);
void nvmet_debugfs_subsys_free(struct nvmet_subsys *subsys);
int nvmet_debugfs_ctrl_setup(struct nvmet_ctrl *ctrl);
void nvmet_debugfs_ctrl_free(struct nvmet_ctrl *ctrl);
+int nvmet_debugfs_queue_setup(struct nvmet_ctrl *ctrl, struct nvmet_sq *sq);
+void nvmet_debugfs_queue_free(struct nvmet_sq *sq);
int __init nvmet_init_debugfs(void);
void nvmet_exit_debugfs(void);
@@ -30,6 +32,12 @@ static inline int nvmet_debugfs_ctrl_setup(struct nvmet_ctrl *ctrl)
}
static inline void nvmet_debugfs_ctrl_free(struct nvmet_ctrl *ctrl) {}
+static inline int nvmet_debugfs_sq_setup(struct nvmet_ctrl *ctrl, struct nvmet_sq *sq)
+{
+ return 0;
+}
+static inline void nvmet_debugfs_sq_free(struct nvmet_sq *sq) {}
+
static inline int __init nvmet_init_debugfs(void)
{
return 0;
diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h
index 3b7ba6d656cf..a6c2b106ba1c 100644
--- a/drivers/nvme/target/nvmet.h
+++ b/drivers/nvme/target/nvmet.h
@@ -109,6 +109,9 @@ struct nvmet_sq {
u16 size;
u32 sqhd;
bool sqhd_disabled;
+#ifdef CONFIG_NVME_TARGET_DEBUGFS
+ struct dentry *debugfs_dir;
+#endif
#ifdef CONFIG_NVME_TARGET_AUTH
bool authenticated;
struct delayed_work auth_expired_work;
--
2.35.3
next prev parent reply other threads:[~2024-03-22 7:04 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-22 7:03 [PATCHv3 0/8] nvmet: debugfs support Hannes Reinecke
2024-03-22 7:03 ` [PATCH 1/8] nvmet: add " Hannes Reinecke
2024-03-23 20:25 ` Sagi Grimberg
2024-03-26 11:55 ` Hannes Reinecke
2024-03-25 18:18 ` Daniel Wagner
2024-03-25 19:22 ` Daniel Wagner
2024-03-25 22:39 ` Sagi Grimberg
2024-03-26 7:16 ` Daniel Wagner
2024-03-26 7:14 ` Hannes Reinecke
2024-03-26 7:22 ` Daniel Wagner
2024-03-22 7:03 ` [PATCH 2/8] nvmet: add 'host_traddr' callback for debugfs Hannes Reinecke
2024-03-23 20:27 ` Sagi Grimberg
2024-03-22 7:03 ` [PATCH 3/8] nvmet-tcp: implement host_traddr() Hannes Reinecke
2024-03-23 20:27 ` Sagi Grimberg
2024-03-22 7:03 ` [PATCH 4/8] nvmet-rdma: " Hannes Reinecke
2024-03-23 20:27 ` Sagi Grimberg
2024-03-22 7:03 ` [PATCH 5/8] nvmet-fc: " Hannes Reinecke
2024-03-22 7:03 ` [PATCH 6/8] nvme-fcloop: implement 'host_traddr' Hannes Reinecke
2024-03-22 7:03 ` [PATCH 7/8] lpfc_nvmet: " Hannes Reinecke
2024-03-22 7:03 ` Hannes Reinecke [this message]
2024-03-23 20:31 ` [PATCH 8/8] nvmet: add debugfs support for queues Sagi Grimberg
2024-03-25 7:25 ` Hannes Reinecke
2024-03-25 9:07 ` Sagi Grimberg
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=20240322070333.3820-9-hare@kernel.org \
--to=hare@kernel.org \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-nvme@lists.infradead.org \
--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).