Since a set-wide shared tag sbitmap may be used, it is no longer valid to
examine the per-hctx tagset for getting the active requests for a hctx
(when a shared sbitmap is used).
As such, add support for the shared sbitmap by using an intermediate
sbitmap per hctx, iterating all active tags for the specific hctx in the
shared sbitmap.
Originally-by: Bart Van Assche <bvanassche@xxxxxxx>
Signed-off-by: John Garry <john.garry@xxxxxxxxxx>
---
block/blk-mq-debugfs.c | 57 ++++++++++++++++++++++++++++++++++++++++--
1 file changed, 55 insertions(+), 2 deletions(-)
diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c
index fca87470e267..5c0db0309ebb 100644
--- a/block/blk-mq-debugfs.c
+++ b/block/blk-mq-debugfs.c
@@ -474,20 +474,73 @@ static int hctx_tags_show(void *data, struct seq_file *m)
return res;
}
+struct hctx_sb_data {
+ struct sbitmap *sb; /* output bitmap */
+ struct blk_mq_hw_ctx *hctx; /* input hctx */
+};
+
+static bool hctx_filter_fn(struct blk_mq_hw_ctx *hctx, struct request *req,
+ void *priv, bool reserved)
+{
+ struct hctx_sb_data *hctx_sb_data = priv;
+
+ if (hctx == hctx_sb_data->hctx)
+ sbitmap_set_bit(hctx_sb_data->sb, req->tag);
+
+ return true;
+}
+
+static void hctx_filter_sb(struct sbitmap *sb, struct blk_mq_hw_ctx *hctx)
+{
+ struct hctx_sb_data hctx_sb_data = { .sb = sb, .hctx = hctx };
+
+ blk_mq_queue_tag_busy_iter(hctx->queue, hctx_filter_fn, &hctx_sb_data);
+}
+
static int hctx_tags_bitmap_show(void *data, struct seq_file *m)
{
struct blk_mq_hw_ctx *hctx = data;
struct request_queue *q = hctx->queue;
+ struct blk_mq_tag_set *set = q->tag_set;
+ struct sbitmap shared_sb, *sb;
+ bool shared_sbitmap;
int res;
+ if (!set)
+ return 0;
+
+ shared_sbitmap = blk_mq_is_sbitmap_shared(set);
+
+ if (shared_sbitmap) {
+ /*
+ * We could use the allocated sbitmap for that hctx here, but
+ * that would mean that we would need to clean it prior to use.
+ */
+ res = sbitmap_init_node(&shared_sb,
+ set->__bitmap_tags.sb.depth,
+ set->__bitmap_tags.sb.shift,
+ GFP_KERNEL, NUMA_NO_NODE);
+ if (res)
+ return res;
+ sb = &shared_sb;
+ } else {
+ sb = &hctx->tags->bitmap_tags->sb;
+ }
+
res = mutex_lock_interruptible(&q->sysfs_lock);
if (res)
goto out;
- if (hctx->tags)
- sbitmap_bitmap_show(&hctx->tags->bitmap_tags->sb, m);
+ if (hctx->tags) {
+ if (shared_sbitmap)
+ hctx_filter_sb(sb, hctx);
+ sbitmap_bitmap_show(sb, m);
+ }
+
mutex_unlock(&q->sysfs_lock);
out:
+ if (shared_sbitmap)
+ sbitmap_free(&shared_sb);
return res;
}
--
2.17.1
