summaryrefslogtreecommitdiffstats
path: root/block/blk-mq-sysfs.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-12-02 17:46:16 +0100
committerJens Axboe <axboe@kernel.dk>2018-12-04 11:38:17 -0700
commite20ba6e1da029136ded295f33076483d65ddf50a (patch)
tree1b3224a2418d4cd2657e6b2ebcde6f3b32a2ddf5 /block/blk-mq-sysfs.c
parent154989e45fd8de9bfb52bbd6e5ea763e437e54c5 (diff)
downloadlinux-stable-e20ba6e1da029136ded295f33076483d65ddf50a.tar.gz
linux-stable-e20ba6e1da029136ded295f33076483d65ddf50a.tar.bz2
linux-stable-e20ba6e1da029136ded295f33076483d65ddf50a.zip
block: move queues types to the block layer
Having another indirect all in the fast path doesn't really help in our post-spectre world. Also having too many queue type is just going to create confusion, so I'd rather manage them centrally. Note that the queue type naming and ordering changes a bit - the first index now is the default queue for everything not explicitly marked, the optional ones are read and poll queues. Reviewed-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-mq-sysfs.c')
-rw-r--r--block/blk-mq-sysfs.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c
index 6efef1f679f0..9c2df137256a 100644
--- a/block/blk-mq-sysfs.c
+++ b/block/blk-mq-sysfs.c
@@ -173,9 +173,16 @@ static ssize_t blk_mq_hw_sysfs_cpus_show(struct blk_mq_hw_ctx *hctx, char *page)
return ret;
}
+static const char *const hctx_types[] = {
+ [HCTX_TYPE_DEFAULT] = "default",
+ [HCTX_TYPE_READ] = "read",
+ [HCTX_TYPE_POLL] = "poll",
+};
+
static ssize_t blk_mq_hw_sysfs_type_show(struct blk_mq_hw_ctx *hctx, char *page)
{
- return sprintf(page, "%u\n", hctx->type);
+ BUILD_BUG_ON(ARRAY_SIZE(hctx_types) != HCTX_MAX_TYPES);
+ return sprintf(page, "%s\n", hctx_types[hctx->type]);
}
static struct attribute *default_ctx_attrs[] = {