RepoMirrors/crash
1
0
Fork 0
mirror of https://github.com/crash-utility/crash synced 2025-02-18 22:46:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle blk_mq_ctx member changes for kernels 5.16-rc1 and later

Browse Source 
Kernel commit 9a14d6ce4135 ("block: remove debugfs blk_mq_ctx
dispatched/merged/completed attributes") removed the member
rq_dispatched and rq_completed from struct blk_mq_ctx.  Without
the patch, "dev -d|-D" options will fail with the following error:

crash> dev -d
MAJOR GENDISK            NAME       REQUEST_QUEUE      TOTAL ASYNC  SYNC

dev: invalid structure member offset: blk_mq_ctx_rq_dispatched
     FILE: dev.c  LINE: 4229  FUNCTION: get_one_mctx_diskio()

Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
Signed-off-by: Kazuhito Hagio <k-hagio-ab@nec.com>
This commit is contained in:
Lianbo Jiang 2021-12-24 18:56:35 +08:00
parent 7eba220e1a
commit 98b417fc63
1 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
dev.c
View File

@ -4246,6 +4246,10 @@ get_mq_diskio(unsigned long q, unsigned long *mq_count)
unsigned long mctx_addr;
struct diskio tmp;
if (INVALID_MEMBER(blk_mq_ctx_rq_dispatched) ||
INVALID_MEMBER(blk_mq_ctx_rq_completed))
return;
memset(&tmp, 0x00, sizeof(struct diskio));
readmem(q + OFFSET(request_queue_queue_ctx), KVADDR, &queue_ctx,
@ -4475,24 +4479,41 @@ display_one_diskio(struct iter *i, unsigned long gendisk, ulong flags)
&& (io.read + io.write == 0))
return;
fprintf(fp, "%s%s%s %s%s%s%s %s%5d%s%s%s%s%s",
mkstring(buf0, 5, RJUST|INT_DEC, (char *)(unsigned long)major),
space(MINSPACE),
mkstring(buf1, VADDR_PRLEN, LJUST|LONG_HEX, (char *)gendisk),
space(MINSPACE),
mkstring(buf2, 10, LJUST, disk_name),
space(MINSPACE),
mkstring(buf3, VADDR_PRLEN <= 11 ? 11 : VADDR_PRLEN,
LJUST|LONG_HEX, (char *)queue_addr),
space(MINSPACE),
io.read + io.write,
space(MINSPACE),
mkstring(buf4, 5, RJUST|INT_DEC,
(char *)(unsigned long)io.read),
space(MINSPACE),
mkstring(buf5, 5, RJUST|INT_DEC,
(char *)(unsigned long)io.write),
space(MINSPACE));
if (use_mq_interface(queue_addr) &&
(INVALID_MEMBER(blk_mq_ctx_rq_dispatched) ||
INVALID_MEMBER(blk_mq_ctx_rq_completed)))
fprintf(fp, "%s%s%s %s%s%s%s %s%s%s",
mkstring(buf0, 5, RJUST|INT_DEC, (char *)(unsigned long)major),
space(MINSPACE),
mkstring(buf1, VADDR_PRLEN, LJUST|LONG_HEX, (char *)gendisk),
space(MINSPACE),
mkstring(buf2, 10, LJUST, disk_name),
space(MINSPACE),
mkstring(buf3, VADDR_PRLEN <= 11 ? 11 : VADDR_PRLEN,
LJUST|LONG_HEX, (char *)queue_addr),
space(MINSPACE),
mkstring(buf4, 17, RJUST, "(not supported)"),
space(MINSPACE));
else
fprintf(fp, "%s%s%s %s%s%s%s %s%5d%s%s%s%s%s",
mkstring(buf0, 5, RJUST|INT_DEC, (char *)(unsigned long)major),
space(MINSPACE),
mkstring(buf1, VADDR_PRLEN, LJUST|LONG_HEX, (char *)gendisk),
space(MINSPACE),
mkstring(buf2, 10, LJUST, disk_name),
space(MINSPACE),
mkstring(buf3, VADDR_PRLEN <= 11 ? 11 : VADDR_PRLEN,
LJUST|LONG_HEX, (char *)queue_addr),
space(MINSPACE),
io.read + io.write,
space(MINSPACE),
mkstring(buf4, 5, RJUST|INT_DEC,
(char *)(unsigned long)io.read),
space(MINSPACE),
mkstring(buf5, 5, RJUST|INT_DEC,
(char *)(unsigned long)io.write),
space(MINSPACE));
if (VALID_MEMBER(request_queue_in_flight)) {
if (!use_mq_interface(queue_addr)) {