From: Maurizio Lombardi <mlombard@redhat.com>
To: kbusch@kernel.org
Cc: mheyne@amazon.de, emilne@redhat.com, jmeneghi@redhat.com,
linux-nvme@lists.infradead.org, dwagner@suse.de,
mlombard@bsdbackstore.eu
Subject: [PATCH RFC 2/5] nvme: add sysfs attribute to change admin timeout per nvme controller
Date: Thu, 12 Feb 2026 13:09:48 +0100 [thread overview]
Message-ID: <20260212120951.79738-3-mlombard@redhat.com> (raw)
In-Reply-To: <20260212120951.79738-1-mlombard@redhat.com>
Currently, there is no method to adjust the timeout values
on a per controller basis with nvme admin queues.
Add an admin_timeout attribute to nvme so that different
nvme controllers which may have different timeout
requirements can have custom admin timeouts set.
Signed-off-by: Maurizio Lombardi <mlombard@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 29430949ce2f..149cd1ab3b3d 100644
--- a/drivers/nvme/host/sysfs.c
+++ b/drivers/nvme/host/sysfs.c
@@ -601,6 +601,36 @@ static ssize_t dctype_show(struct device *dev,
}
static DEVICE_ATTR_RO(dctype);
+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);
+ u32 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);
+
#ifdef CONFIG_NVME_HOST_AUTH
static ssize_t nvme_ctrl_dhchap_secret_show(struct device *dev,
struct device_attribute *attr, char *buf)
@@ -742,6 +772,7 @@ static struct attribute *nvme_dev_attrs[] = {
&dev_attr_kato.attr,
&dev_attr_cntrltype.attr,
&dev_attr_dctype.attr,
+ &dev_attr_admin_timeout.attr,
#ifdef CONFIG_NVME_HOST_AUTH
&dev_attr_dhchap_secret.attr,
&dev_attr_dhchap_ctrl_secret.attr,
--
2.53.0
next prev parent reply other threads:[~2026-02-12 12:11 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-12 12:09 [PATCH RFC 0/5] nvme: Refactor and expose per-controller timeout configuration Maurizio Lombardi
2026-02-12 12:09 ` [PATCH RFC 1/5] nvme: Let the blocklayer set timeouts for requests Maurizio Lombardi
2026-02-17 20:15 ` Mohamed Khalfella
2026-02-18 12:19 ` Heyne, Maximilian
2026-02-12 12:09 ` Maurizio Lombardi [this message]
2026-02-17 20:17 ` [PATCH RFC 2/5] nvme: add sysfs attribute to change admin timeout per nvme controller Mohamed Khalfella
2026-02-18 12:40 ` Heyne, Maximilian
2026-02-18 14:49 ` Maurizio Lombardi
2026-02-18 18:00 ` Mohamed Khalfella
2026-02-19 16:16 ` Maurizio Lombardi
2026-02-12 12:09 ` [PATCH RFC 3/5] nvme: pci: use admin queue timeout over NVME_ADMIN_TIMEOUT Maurizio Lombardi
2026-02-17 20:22 ` Mohamed Khalfella
2026-02-18 13:10 ` Heyne, Maximilian
2026-02-18 13:32 ` Maurizio Lombardi
2026-02-12 12:09 ` [PATCH RFC 4/5] nvme: add sysfs attribute to change IO timeout per nvme controller Maurizio Lombardi
2026-02-17 20:25 ` Mohamed Khalfella
2026-02-18 13:28 ` Maurizio Lombardi
2026-02-18 17:54 ` Mohamed Khalfella
2026-02-19 17:22 ` Maurizio Lombardi
2026-02-20 12:47 ` Maurizio Lombardi
2026-02-20 17:53 ` Mohamed Khalfella
2026-02-23 10:36 ` Maurizio Lombardi
2026-02-18 17:58 ` Mohamed Khalfella
2026-02-12 12:09 ` [PATCH RFC 5/5] nvme: use per controller timeout waits over depending on global default Maurizio Lombardi
2026-02-17 20:29 ` Mohamed Khalfella
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=20260212120951.79738-3-mlombard@redhat.com \
--to=mlombard@redhat.com \
--cc=dwagner@suse.de \
--cc=emilne@redhat.com \
--cc=jmeneghi@redhat.com \
--cc=kbusch@kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=mheyne@amazon.de \
--cc=mlombard@bsdbackstore.eu \
/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