|
 |
aefe19 |
From c07068266b41450ca6821ee0a1a3adf34206015f Mon Sep 17 00:00:00 2001
|
|
|
aefe19 |
From: Kazuhito Hagio <k-hagio-ab@nec.com>
|
|
|
aefe19 |
Date: Fri, 10 Jun 2022 15:21:53 +0900
|
|
|
aefe19 |
Subject: [PATCH 16/18] Make "dev -d|-D" options parse sbitmap on Linux 4.18
|
|
|
aefe19 |
and later
|
|
|
aefe19 |
|
|
|
aefe19 |
There have been a few reports that the "dev -d|-D" options displayed
|
|
|
aefe19 |
incorrect I/O stats due to racy blk_mq_ctx.rq_* counters. To fix it,
|
|
|
aefe19 |
make the options parse sbitmap to count I/O stats on Linux 4.18 and
|
|
|
aefe19 |
later kernels, which include RHEL8 ones.
|
|
|
aefe19 |
|
|
|
aefe19 |
To do this, adjust to the blk_mq_tags structure of Linux 5.10 through
|
|
|
aefe19 |
5.15 kernels, which contain kernel commit 222a5ae03cdd ("blk-mq: Use
|
|
|
aefe19 |
pointers for blk_mq_tags bitmap tags") and do not contain ae0f1a732f4a
|
|
|
aefe19 |
("blk-mq: Stop using pointers for blk_mq_tags bitmap tags").
|
|
|
aefe19 |
|
|
|
aefe19 |
Signed-off-by: Kazuhito Hagio <k-hagio-ab@nec.com>
|
|
|
aefe19 |
Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
|
|
|
aefe19 |
---
|
|
|
aefe19 |
dev.c | 25 +++++++++++++++++++++++--
|
|
|
aefe19 |
1 file changed, 23 insertions(+), 2 deletions(-)
|
|
|
aefe19 |
|
|
|
aefe19 |
diff --git a/dev.c b/dev.c
|
|
|
aefe19 |
index 0172c83ffaea..db97f8aebdc2 100644
|
|
|
aefe19 |
--- a/dev.c
|
|
|
aefe19 |
+++ b/dev.c
|
|
|
aefe19 |
@@ -4339,6 +4339,10 @@ static void bt_for_each(ulong q, ulong tags, ulong sbq, uint reserved, uint nr_r
|
|
|
aefe19 |
static void queue_for_each_hw_ctx(ulong q, ulong *hctx, uint cnt, struct diskio *dio)
|
|
|
aefe19 |
{
|
|
|
aefe19 |
uint i;
|
|
|
aefe19 |
+ int bitmap_tags_is_ptr = 0;
|
|
|
aefe19 |
+
|
|
|
aefe19 |
+ if (MEMBER_TYPE("blk_mq_tags", "bitmap_tags") == TYPE_CODE_PTR)
|
|
|
aefe19 |
+ bitmap_tags_is_ptr = 1;
|
|
|
aefe19 |
|
|
|
aefe19 |
for (i = 0; i < cnt; i++) {
|
|
|
aefe19 |
ulong addr = 0, tags = 0;
|
|
|
aefe19 |
@@ -4357,9 +4361,17 @@ static void queue_for_each_hw_ctx(ulong q, ulong *hctx, uint cnt, struct diskio
|
|
|
aefe19 |
|
|
|
aefe19 |
if (nr_reserved_tags) {
|
|
|
aefe19 |
addr = tags + OFFSET(blk_mq_tags_breserved_tags);
|
|
|
aefe19 |
+ if (bitmap_tags_is_ptr &&
|
|
|
aefe19 |
+ !readmem(addr, KVADDR, &addr, sizeof(ulong),
|
|
|
aefe19 |
+ "blk_mq_tags.bitmap_tags", RETURN_ON_ERROR))
|
|
|
aefe19 |
+ break;
|
|
|
aefe19 |
bt_for_each(q, tags, addr, 1, nr_reserved_tags, dio);
|
|
|
aefe19 |
}
|
|
|
aefe19 |
addr = tags + OFFSET(blk_mq_tags_bitmap_tags);
|
|
|
aefe19 |
+ if (bitmap_tags_is_ptr &&
|
|
|
aefe19 |
+ !readmem(addr, KVADDR, &addr, sizeof(ulong),
|
|
|
aefe19 |
+ "blk_mq_tags.bitmap_tags", RETURN_ON_ERROR))
|
|
|
aefe19 |
+ break;
|
|
|
aefe19 |
bt_for_each(q, tags, addr, 0, nr_reserved_tags, dio);
|
|
|
aefe19 |
}
|
|
|
aefe19 |
}
|
|
|
aefe19 |
@@ -4423,14 +4435,23 @@ get_mq_diskio(unsigned long q, unsigned long *mq_count)
|
|
|
aefe19 |
unsigned long mctx_addr;
|
|
|
aefe19 |
struct diskio tmp = {0};
|
|
|
aefe19 |
|
|
|
aefe19 |
- if (INVALID_MEMBER(blk_mq_ctx_rq_dispatched) ||
|
|
|
aefe19 |
- INVALID_MEMBER(blk_mq_ctx_rq_completed)) {
|
|
|
aefe19 |
+ /*
|
|
|
aefe19 |
+ * Currently this function does not support old blk-mq implementation
|
|
|
aefe19 |
+ * before 12f5b9314545 ("blk-mq: Remove generation seqeunce"), so
|
|
|
aefe19 |
+ * filter them out.
|
|
|
aefe19 |
+ */
|
|
|
aefe19 |
+ if (VALID_MEMBER(request_state)) {
|
|
|
aefe19 |
+ if (CRASHDEBUG(1))
|
|
|
aefe19 |
+ fprintf(fp, "mq: using sbitmap\n");
|
|
|
aefe19 |
get_mq_diskio_from_hw_queues(q, &tmp);
|
|
|
aefe19 |
mq_count[0] = tmp.read;
|
|
|
aefe19 |
mq_count[1] = tmp.write;
|
|
|
aefe19 |
return;
|
|
|
aefe19 |
}
|
|
|
aefe19 |
|
|
|
aefe19 |
+ if (CRASHDEBUG(1))
|
|
|
aefe19 |
+ fprintf(fp, "mq: using blk_mq_ctx.rq_{completed,dispatched} counters\n");
|
|
|
aefe19 |
+
|
|
|
aefe19 |
readmem(q + OFFSET(request_queue_queue_ctx), KVADDR, &queue_ctx,
|
|
|
aefe19 |
sizeof(ulong), "request_queue.queue_ctx",
|
|
|
aefe19 |
FAULT_ON_ERROR);
|
|
|
aefe19 |
--
|
|
|
aefe19 |
2.30.2
|
|
|
aefe19 |
|