From: David Jeffery <djeffery@redhat.com>
To: Keith Busch <kbusch@kernel.org>, ens Axboe <axboe@fb.com>,
Christoph Hellwig <hch@lst.de>, Sagi Grimberg <sagi@grimberg.me>
Cc: linux-nvme@lists.infradead.org, David Jeffery <djeffery@redhat.com>
Subject: [PATCH 2/4] nvme: add sysfs attribute to change admin timeout per nvme dev
Date: Fri, 13 Sep 2024 09:44:28 -0400 [thread overview]
Message-ID: <20240913134430.5416-3-djeffery@redhat.com> (raw)
In-Reply-To: <20240913134430.5416-1-djeffery@redhat.com>
Currently, there is no method to adjust the timeout values on a per device
basis with nvme admin queues. Add an admin_timeout attribute to nvme so
that different types of nvme devices which may have different timeout
requirements can have custom admin timeouts set.
Signed-off-by: David Jeffery <djeffery@redhat.com>
---
drivers/nvme/host/sysfs.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/drivers/nvme/host/sysfs.c b/drivers/nvme/host/sysfs.c
index ba05faaac562..1d60316274ce 100644
--- a/drivers/nvme/host/sysfs.c
+++ b/drivers/nvme/host/sysfs.c
@@ -60,6 +60,36 @@ static ssize_t nvme_adm_passthru_err_log_enabled_store(struct device *dev,
return count;
}
+static ssize_t nvme_admin_timeout_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct nvme_ctrl *ctrl = dev_get_drvdata(dev);
+
+ return sysfs_emit(buf, "%u\n", jiffies_to_msecs(
+ ctrl->admin_q->rq_timeout));
+}
+
+static ssize_t nvme_admin_timeout_store(struct device *dev,
+ struct device_attribute *attr, const char *buf, size_t count)
+{
+ struct nvme_ctrl *ctrl = dev_get_drvdata(dev);
+ unsigned int timeout;
+ int err;
+
+ err = kstrtou32(buf, 10, &timeout);
+ if (err || !timeout)
+ return -EINVAL;
+
+ blk_queue_rq_timeout(ctrl->admin_q, msecs_to_jiffies(timeout));
+
+ return count;
+}
+
+static struct device_attribute dev_attr_admin_timeout = \
+ __ATTR(admin_timeout, S_IRUGO | S_IWUSR, \
+ nvme_admin_timeout_show, nvme_admin_timeout_store);
+
+
static inline struct nvme_ns_head *dev_to_ns_head(struct device *dev)
{
struct gendisk *disk = dev_to_disk(dev);
@@ -708,6 +738,7 @@ static struct attribute *nvme_dev_attrs[] = {
&dev_attr_tls_key.attr,
#endif
&dev_attr_adm_passthru_err_log_enabled.attr,
+ &dev_attr_admin_timeout.attr,
NULL
};
--
2.46.0
next prev parent reply other threads:[~2024-09-13 13:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-13 13:44 [PATCH 0/4] cleaning up nvme timeout over-dependence on global values David Jeffery
2024-09-13 13:44 ` [PATCH 1/4] nvme: use queue's configured timeout not global config value for passthru David Jeffery
2024-09-13 13:44 ` David Jeffery [this message]
2024-09-13 13:44 ` [PATCH 3/4] nvme: pci: use admin queue timeout over NVME_ADMIN_TIMEOUT David Jeffery
2024-09-13 13:44 ` [PATCH 4/4] nvme: use per device timeout waits over depending on global default value David Jeffery
2024-09-13 15:17 ` Keith Busch
2024-09-13 18:36 ` David Jeffery
2024-09-16 7:17 ` 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=20240913134430.5416-3-djeffery@redhat.com \
--to=djeffery@redhat.com \
--cc=axboe@fb.com \
--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