[SRU][linux-aws-bionic][PATCH 1/2] block: add io timeout to sysfs
Kamal Mostafa
kamal at canonical.com
Mon Aug 26 18:47:54 UTC 2019
From: Weiping Zhang <zhangweiping at didiglobal.com>
BugLink: https://bugs.launchpad.net/bugs/1841461
Give a interface to adjust io timeout(ms) by device.
Signed-off-by: Weiping Zhang <zhangweiping at didiglobal.com>
Signed-off-by: Jens Axboe <axboe at kernel.dk>
(cherry picked from commit 65cd1d13b880920054d6c750679baa80b7f9c072)
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
block/blk-sysfs.c | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 870484eaed1f..06eb8ea600e5 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -424,6 +424,26 @@ static ssize_t queue_poll_store(struct request_queue *q, const char *page,
return ret;
}
+static ssize_t queue_io_timeout_show(struct request_queue *q, char *page)
+{
+ return sprintf(page, "%u\n", jiffies_to_msecs(q->rq_timeout));
+}
+
+static ssize_t queue_io_timeout_store(struct request_queue *q, const char *page,
+ size_t count)
+{
+ unsigned int val;
+ int err;
+
+ err = kstrtou32(page, 10, &val);
+ if (err || val == 0)
+ return -EINVAL;
+
+ blk_queue_rq_timeout(q, msecs_to_jiffies(val));
+
+ return count;
+}
+
static ssize_t queue_wb_lat_show(struct request_queue *q, char *page)
{
if (!q->rq_wb)
@@ -670,6 +690,12 @@ static struct queue_sysfs_entry queue_dax_entry = {
.show = queue_dax_show,
};
+static struct queue_sysfs_entry queue_io_timeout_entry = {
+ .attr = {.name = "io_timeout", .mode = 0644 },
+ .show = queue_io_timeout_show,
+ .store = queue_io_timeout_store,
+};
+
static struct queue_sysfs_entry queue_wb_lat_entry = {
.attr = {.name = "wbt_lat_usec", .mode = S_IRUGO | S_IWUSR },
.show = queue_wb_lat_show,
@@ -717,6 +743,7 @@ static struct attribute *default_attrs[] = {
&queue_dax_entry.attr,
&queue_wb_lat_entry.attr,
&queue_poll_delay_entry.attr,
+ &queue_io_timeout_entry.attr,
#ifdef CONFIG_BLK_DEV_THROTTLING_LOW
&throtl_sample_time_entry.attr,
#endif
--
2.17.1
More information about the kernel-team
mailing list