* [PATCH V3 0/5] blktrace: few cleanup
@ 2021-02-22 5:29 Chaitanya Kulkarni
2021-02-22 5:29 ` [PATCH V3 1/5] block: remove superfluous param in blk_fill_rwbs() Chaitanya Kulkarni
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Chaitanya Kulkarni @ 2021-02-22 5:29 UTC (permalink / raw)
To: linux-block
Cc: paolo.valente, axboe, rostedt, mingo, chaitanya.kulkarni,
johannes.thumshirn, damien.lemoal, bvanassche, dongli.zhang,
akpm, hare, colyli, tj, rdunlap, jack, hch
Hi,
These are few cleanups for the block trace.
Below is the test log on latest linux-block/for-next.
-ck
V2->V3:-
1. Rebase on block/for-next 5.11.
V1->V2:-
1. Add fixes tags.
2. Move EXPORT_TRACEPOINT_SYMBOL_GPL(blk_rq_insert) to
block/blk-core.c.
3. Add reviewed-by tags.
4. Remove the null_blk patches fro now, create a separate series.
Chaitanya Kulkarni (5):
block: remove superfluous param in blk_fill_rwbs()
blktrace: add blk_fill_rwbs documentation comment
blktrace: fix blk_rq_issue documentation
blktrace: fix blk_rq_merge documentation
block: get rid of the trace rq insert wrapper
block/bfq-iosched.c | 4 +++-
block/blk-core.c | 1 +
block/blk-mq-sched.c | 6 ------
block/blk-mq-sched.h | 1 -
block/kyber-iosched.c | 4 +++-
block/mq-deadline.c | 4 +++-
include/linux/blktrace_api.h | 2 +-
include/trace/events/bcache.h | 10 +++++-----
include/trace/events/block.h | 20 ++++++++++----------
kernel/trace/blktrace.c | 12 +++++++++++-
10 files changed, 37 insertions(+), 27 deletions(-)
Scheduler, Bounce, Merge and usual tracepoint testing :-
################### kyber #####################
252,0 43 1 0.000000000 1095 Q WS 0 + 8 [systemd-udevd]
252,0 43 2 0.000011001 1095 B WS 0 + 8 [systemd-udevd]
252,0 43 3 0.000025768 1095 G WS 0 + 8 [systemd-udevd]
252,0 43 4 0.000040316 1095 Q WS 8 + 8 [systemd-udevd]
252,0 43 5 0.000045996 1095 B WS 8 + 8 [systemd-udevd]
252,0 43 6 0.000048882 1095 M WS 8 + 8 [systemd-udevd]
252,0 43 7 0.000062577 1095 Q WS 16 + 8 [systemd-udevd]
252,0 43 8 0.000067837 1095 B WS 16 + 8 [systemd-udevd]
252,0 43 9 0.000068949 1095 M WS 16 + 8 [systemd-udevd]
252,0 43 10 0.000082375 1095 Q WS 24 + 8 [systemd-udevd]
252,0 43 11 0.000088215 1095 B WS 24 + 8 [systemd-udevd]
252,0 43 12 0.000089708 1095 M WS 24 + 8 [systemd-udevd]
252,0 43 13 0.000102192 1095 Q WS 32 + 8 [systemd-udevd]
252,0 43 14 0.000107261 1095 B WS 32 + 8 [systemd-udevd]
252,0 43 15 0.000108333 1095 M WS 32 + 8 [systemd-udevd]
252,0 43 16 0.000114124 1095 I WS 0 + 40 [systemd-udevd]
252,0 43 17 0.000124734 1095 D WS 0 + 40 [systemd-udevd]
252,0 43 18 0.000159740 227 C WS 0 + 40 [0]
252,0 43 19 0.000165801 227 C WS 0 + 8 [0]
252,0 43 20 0.000258675 227 C WS 8 + 8 [0]
252,0 43 21 0.000265378 227 C WS 16 + 8 [0]
252,0 43 22 0.000271098 227 C WS 24 + 8 [0]
252,0 43 23 0.000276959 227 C WS 32 + 8 [0]
CPU43 (252,0):
Reads Queued: 0, 0KiB Writes Queued: 5, 20KiB
Read Dispatches: 0, 0KiB Write Dispatches: 1, 20KiB
Reads Requeued: 0 Writes Requeued: 0
Reads Completed: 0, 0KiB Writes Completed: 6, 40KiB
Read Merges: 0, 0KiB Write Merges: 4, 16KiB
Read depth: 0 Write depth: 1
IO unplugs: 0 Timer unplugs: 0
Throughput (R/W): 0KiB/s / 0KiB/s
Events (252,0): 23 entries
Skips: 0 forward (0 - 0.0%)
#################### bfq #####################
252,0 43 1 0.000000000 1095 Q WS 0 + 8 [systemd-udevd]
252,0 43 2 0.000011562 1095 B WS 0 + 8 [systemd-udevd]
252,0 43 3 0.000035136 1095 G WS 0 + 8 [systemd-udevd]
252,0 43 4 0.000051967 1095 Q WS 8 + 8 [systemd-udevd]
252,0 43 5 0.000057017 1095 B WS 8 + 8 [systemd-udevd]
252,0 43 6 0.000059291 1095 M WS 8 + 8 [systemd-udevd]
252,0 43 7 0.000073007 1095 Q WS 16 + 8 [systemd-udevd]
252,0 43 8 0.000078357 1095 B WS 16 + 8 [systemd-udevd]
252,0 43 9 0.000079499 1095 M WS 16 + 8 [systemd-udevd]
252,0 43 10 0.000092914 1095 Q WS 24 + 8 [systemd-udevd]
252,0 43 11 0.000098384 1095 B WS 24 + 8 [systemd-udevd]
252,0 43 12 0.000099456 1095 M WS 24 + 8 [systemd-udevd]
252,0 43 13 0.000114314 1095 Q WS 32 + 8 [systemd-udevd]
252,0 43 14 0.000119464 1095 B WS 32 + 8 [systemd-udevd]
252,0 43 15 0.000120556 1095 M WS 32 + 8 [systemd-udevd]
252,0 43 16 0.000128411 1095 I WS 0 + 40 [systemd-udevd]
252,0 43 17 0.000172744 1095 D WS 0 + 40 [systemd-udevd]
252,0 43 18 0.000216646 227 C WS 0 + 40 [0]
252,0 43 19 0.000223078 227 C WS 0 + 8 [0]
252,0 43 20 0.000255329 227 C WS 8 + 8 [0]
252,0 43 21 0.000261390 227 C WS 16 + 8 [0]
252,0 43 22 0.000266890 227 C WS 24 + 8 [0]
252,0 43 23 0.000273533 227 C WS 32 + 8 [0]
CPU43 (252,0):
Reads Queued: 0, 0KiB Writes Queued: 5, 20KiB
Read Dispatches: 0, 0KiB Write Dispatches: 1, 20KiB
Reads Requeued: 0 Writes Requeued: 0
Reads Completed: 0, 0KiB Writes Completed: 6, 40KiB
Read Merges: 0, 0KiB Write Merges: 4, 16KiB
Read depth: 0 Write depth: 1
IO unplugs: 0 Timer unplugs: 0
Throughput (R/W): 0KiB/s / 0KiB/s
Events (252,0): 23 entries
Skips: 0 forward (0 - 0.0%)
#################### mq-deadline #####################
252,0 43 1 0.000000000 1095 Q WS 0 + 8 [systemd-udevd]
252,0 43 2 0.000011601 1095 B WS 0 + 8 [systemd-udevd]
252,0 43 3 0.000022672 1095 G WS 0 + 8 [systemd-udevd]
252,0 43 4 0.000037821 1095 Q WS 8 + 8 [systemd-udevd]
252,0 43 5 0.000043651 1095 B WS 8 + 8 [systemd-udevd]
252,0 43 6 0.000045836 1095 M WS 8 + 8 [systemd-udevd]
252,0 43 7 0.000059191 1095 Q WS 16 + 8 [systemd-udevd]
252,0 43 8 0.000064220 1095 B WS 16 + 8 [systemd-udevd]
252,0 43 9 0.000065382 1095 M WS 16 + 8 [systemd-udevd]
252,0 43 10 0.000211276 1095 Q WS 24 + 8 [systemd-udevd]
252,0 43 11 0.000218459 1095 B WS 24 + 8 [systemd-udevd]
252,0 43 12 0.000220323 1095 M WS 24 + 8 [systemd-udevd]
252,0 43 13 0.000237204 1095 Q WS 32 + 8 [systemd-udevd]
252,0 43 14 0.000243075 1095 B WS 32 + 8 [systemd-udevd]
252,0 43 15 0.000244158 1095 M WS 32 + 8 [systemd-udevd]
252,0 43 16 0.000250850 1095 I WS 0 + 40 [systemd-udevd]
252,0 43 17 0.000259286 1095 D WS 0 + 40 [systemd-udevd]
252,0 43 18 0.000290404 227 C WS 0 + 40 [0]
252,0 43 19 0.000296305 227 C WS 0 + 8 [0]
252,0 43 20 0.000324508 227 C WS 8 + 8 [0]
252,0 43 21 0.000328345 227 C WS 16 + 8 [0]
252,0 43 22 0.000343283 227 C WS 24 + 8 [0]
252,0 43 23 0.000347291 227 C WS 32 + 8 [0]
CPU43 (252,0):
Reads Queued: 0, 0KiB Writes Queued: 5, 20KiB
Read Dispatches: 0, 0KiB Write Dispatches: 1, 20KiB
Reads Requeued: 0 Writes Requeued: 0
Reads Completed: 0, 0KiB Writes Completed: 6, 40KiB
Read Merges: 0, 0KiB Write Merges: 4, 16KiB
Read depth: 0 Write depth: 1
IO unplugs: 0 Timer unplugs: 0
Throughput (R/W): 0KiB/s / 0KiB/s
Events (252,0): 23 entries
Skips: 0 forward (0 - 0.0%)
#################### none #####################
252,0 43 1 0.000000000 1095 Q WS 0 + 8 [systemd-udevd]
252,0 43 2 0.000009768 1095 B WS 0 + 8 [systemd-udevd]
252,0 43 3 0.000078246 1095 G WS 0 + 8 [systemd-udevd]
252,0 43 4 0.000097001 1095 Q WS 8 + 8 [systemd-udevd]
252,0 43 5 0.000103293 1095 B WS 8 + 8 [systemd-udevd]
252,0 43 6 0.000105477 1095 M WS 8 + 8 [systemd-udevd]
252,0 43 7 0.000121207 1095 Q WS 16 + 8 [systemd-udevd]
252,0 43 8 0.000126116 1095 B WS 16 + 8 [systemd-udevd]
252,0 43 9 0.000127248 1095 M WS 16 + 8 [systemd-udevd]
252,0 43 10 0.000145482 1095 Q WS 24 + 8 [systemd-udevd]
252,0 43 11 0.000150552 1095 B WS 24 + 8 [systemd-udevd]
252,0 43 12 0.000152455 1095 M WS 24 + 8 [systemd-udevd]
252,0 43 13 0.000166011 1095 Q WS 32 + 8 [systemd-udevd]
252,0 43 14 0.000171030 1095 B WS 32 + 8 [systemd-udevd]
252,0 43 15 0.000172102 1095 M WS 32 + 8 [systemd-udevd]
252,0 43 16 0.000178625 1095 D WS 0 + 40 [systemd-udevd]
252,0 43 17 0.000223148 227 C WS 0 + 40 [0]
252,0 43 18 0.000229290 227 C WS 0 + 8 [0]
252,0 43 19 0.000250139 227 C WS 8 + 8 [0]
252,0 43 20 0.000256100 227 C WS 16 + 8 [0]
252,0 43 21 0.000261931 227 C WS 24 + 8 [0]
252,0 43 22 0.000268052 227 C WS 32 + 8 [0]
CPU43 (252,0):
Reads Queued: 0, 0KiB Writes Queued: 5, 20KiB
Read Dispatches: 0, 0KiB Write Dispatches: 1, 20KiB
Reads Requeued: 0 Writes Requeued: 0
Reads Completed: 0, 0KiB Writes Completed: 6, 40KiB
Read Merges: 0, 0KiB Write Merges: 4, 16KiB
Read depth: 0 Write depth: 1
IO unplugs: 0 Timer unplugs: 0
Throughput (R/W): 0KiB/s / 0KiB/s
Events (252,0): 22 entries
Skips: 0 forward (0 - 0.0%)
#################### split #####################
252,0 29 1 0.000000000 5312 Q DS 0 + 80 [blkdiscard]
252,0 29 2 0.000007694 5312 X DS 0 / 0 [blkdiscard]
252,0 29 3 0.000020688 5312 G DS 0 + 4 [blkdiscard]
252,0 29 4 0.000025297 5312 X DS 4 / 0 [blkdiscard]
252,0 29 5 0.000028403 5312 G DS 4 + 4 [blkdiscard]
252,0 29 6 0.000031429 5312 X DS 8 / 0 [blkdiscard]
252,0 29 7 0.000034114 5312 G DS 8 + 4 [blkdiscard]
252,0 29 8 0.000037049 5312 X DS 12 / 0 [blkdiscard]
252,0 29 9 0.000039714 5312 G DS 12 + 4 [blkdiscard]
252,0 29 10 0.000042489 5312 X DS 16 / 0 [blkdiscard]
252,0 29 11 0.000050755 5312 I DS 0 + 4 [blkdiscard]
252,0 29 12 0.000052658 5312 I DS 4 + 4 [blkdiscard]
252,0 29 13 0.000053911 5312 I DS 8 + 4 [blkdiscard]
252,0 29 14 0.000055073 5312 I DS 12 + 4 [blkdiscard]
252,0 29 15 0.000096581 920 D DS 0 + 4 [kworker/29:1H]
252,0 29 16 0.000108413 920 D DS 4 + 4 [kworker/29:1H]
252,0 29 17 0.000110777 920 D DS 8 + 4 [kworker/29:1H]
252,0 29 18 0.000112891 920 D DS 12 + 4 [kworker/29:1H]
252,0 29 19 0.000128030 157 C DS 0 + 4 [0]
252,0 29 20 0.000136405 157 C DS 0 + 8 [0]
252,0 29 21 0.000151444 157 C DS 0 + 12 [0]
252,0 29 22 0.000154589 157 C DS 0 + 16 [0]
252,0 29 23 0.000164077 5312 G DS 16 + 4 [blkdiscard]
252,0 29 24 0.000168125 5312 X DS 20 / 0 [blkdiscard]
252,0 29 25 0.000171161 5312 G DS 20 + 4 [blkdiscard]
252,0 29 26 0.000173936 5312 X DS 24 / 0 [blkdiscard]
252,0 29 27 0.000176571 5312 G DS 24 + 4 [blkdiscard]
252,0 29 28 0.000179316 5312 X DS 28 / 0 [blkdiscard]
252,0 29 29 0.000181901 5312 G DS 28 + 4 [blkdiscard]
252,0 29 30 0.000184626 5312 X DS 32 / 0 [blkdiscard]
252,0 29 31 0.000189114 5312 I DS 16 + 4 [blkdiscard]
252,0 29 32 0.000190417 5312 I DS 20 + 4 [blkdiscard]
252,0 29 33 0.000191559 5312 I DS 24 + 4 [blkdiscard]
252,0 29 34 0.000192671 5312 I DS 28 + 4 [blkdiscard]
252,0 29 35 0.000210294 920 D DS 16 + 4 [kworker/29:1H]
252,0 29 36 0.000217558 920 D DS 20 + 4 [kworker/29:1H]
252,0 29 37 0.000219782 920 D DS 24 + 4 [kworker/29:1H]
252,0 29 38 0.000221816 920 D DS 28 + 4 [kworker/29:1H]
252,0 29 39 0.000229660 157 C DS 0 + 20 [0]
252,0 29 40 0.000233197 157 C DS 0 + 24 [0]
252,0 29 41 0.000243516 157 C DS 0 + 28 [0]
252,0 29 42 0.000246352 157 C DS 0 + 32 [0]
252,0 29 43 0.000254377 5312 G DS 32 + 4 [blkdiscard]
252,0 29 44 0.000258304 5312 X DS 36 / 0 [blkdiscard]
252,0 29 45 0.000261219 5312 G DS 36 + 4 [blkdiscard]
252,0 29 46 0.000263985 5312 X DS 40 / 0 [blkdiscard]
252,0 29 47 0.000266640 5312 G DS 40 + 4 [blkdiscard]
252,0 29 48 0.000269425 5312 X DS 44 / 0 [blkdiscard]
252,0 29 49 0.000271980 5312 G DS 44 + 4 [blkdiscard]
252,0 29 50 0.000274695 5312 X DS 48 / 0 [blkdiscard]
252,0 29 51 0.000278953 5312 I DS 32 + 4 [blkdiscard]
252,0 29 52 0.000280175 5312 I DS 36 + 4 [blkdiscard]
252,0 29 53 0.000281307 5312 I DS 40 + 4 [blkdiscard]
252,0 29 54 0.000282379 5312 I DS 44 + 4 [blkdiscard]
252,0 29 55 0.000346269 920 D DS 32 + 4 [kworker/29:1H]
252,0 29 56 0.000353793 920 D DS 36 + 4 [kworker/29:1H]
252,0 29 57 0.000355927 920 D DS 40 + 4 [kworker/29:1H]
252,0 29 58 0.000357951 920 D DS 44 + 4 [kworker/29:1H]
252,0 29 59 0.000366286 157 C DS 0 + 36 [0]
252,0 29 60 0.000370284 157 C DS 0 + 40 [0]
252,0 29 61 0.000380523 157 C DS 0 + 44 [0]
252,0 29 62 0.000383338 157 C DS 0 + 48 [0]
252,0 29 63 0.000391484 5312 G DS 48 + 4 [blkdiscard]
252,0 29 64 0.000395742 5312 X DS 52 / 0 [blkdiscard]
252,0 29 65 0.000398807 5312 G DS 52 + 4 [blkdiscard]
252,0 29 66 0.000401593 5312 X DS 56 / 0 [blkdiscard]
252,0 29 67 0.000404147 5312 G DS 56 + 4 [blkdiscard]
252,0 29 68 0.000406943 5312 X DS 60 / 0 [blkdiscard]
252,0 29 69 0.000409538 5312 G DS 60 + 4 [blkdiscard]
252,0 29 70 0.000412273 5312 X DS 64 / 0 [blkdiscard]
252,0 29 71 0.000416821 5312 I DS 48 + 4 [blkdiscard]
252,0 29 72 0.000417993 5312 I DS 52 + 4 [blkdiscard]
252,0 29 73 0.000419136 5312 I DS 56 + 4 [blkdiscard]
252,0 29 74 0.000420228 5312 I DS 60 + 4 [blkdiscard]
252,0 29 75 0.000438342 920 D DS 48 + 4 [kworker/29:1H]
252,0 29 76 0.000445515 920 D DS 52 + 4 [kworker/29:1H]
252,0 29 77 0.000447679 920 D DS 56 + 4 [kworker/29:1H]
252,0 29 78 0.000449693 920 D DS 60 + 4 [kworker/29:1H]
252,0 29 79 0.000457197 157 C DS 0 + 52 [0]
252,0 29 80 0.000460473 157 C DS 0 + 56 [0]
252,0 29 81 0.000470261 157 C DS 0 + 60 [0]
252,0 29 82 0.000473017 157 C DS 0 + 64 [0]
252,0 29 83 0.000480691 5312 G DS 64 + 4 [blkdiscard]
252,0 29 84 0.000484478 5312 X DS 68 / 0 [blkdiscard]
252,0 29 85 0.000487313 5312 G DS 68 + 4 [blkdiscard]
252,0 29 86 0.000490099 5312 X DS 72 / 0 [blkdiscard]
252,0 29 87 0.000492724 5312 G DS 72 + 4 [blkdiscard]
252,0 29 88 0.000496821 5312 G DS 76 + 4 [blkdiscard]
252,0 29 89 0.000501580 5312 I DS 64 + 4 [blkdiscard]
252,0 29 90 0.000502732 5312 I DS 68 + 4 [blkdiscard]
252,0 29 91 0.000503844 5312 I DS 72 + 4 [blkdiscard]
252,0 29 92 0.000504977 5312 I DS 76 + 4 [blkdiscard]
252,0 29 93 0.000523030 920 D DS 64 + 4 [kworker/29:1H]
252,0 29 94 0.000529763 920 D DS 68 + 4 [kworker/29:1H]
252,0 29 95 0.000531827 920 D DS 72 + 4 [kworker/29:1H]
252,0 29 96 0.000533861 920 D DS 76 + 4 [kworker/29:1H]
252,0 29 97 0.000541275 157 C DS 0 + 68 [0]
252,0 29 98 0.000544591 157 C DS 0 + 72 [0]
252,0 29 99 0.000547266 157 C DS 0 + 76 [0]
252,0 29 100 0.000549881 157 C DS 0 + 80 [0]
CPU29 (252,0):
Reads Queued: 0, 0KiB Writes Queued: 1, 40KiB
Read Dispatches: 0, 0KiB Write Dispatches: 20, 40KiB
Reads Requeued: 0 Writes Requeued: 0
Reads Completed: 0, 0KiB Writes Completed: 20, 420KiB
Read Merges: 0, 0KiB Write Merges: 0, 0KiB
Read depth: 0 Write depth: 4
IO unplugs: 0 Timer unplugs: 0
Throughput (R/W): 0KiB/s / 0KiB/s
Events (252,0): 100 entries
Skips: 0 forward (0 - 0.0%)
#################### requeue #####################
252,0 29 1 0.000000000 5404 Q WS 0 + 8 [dd]
252,0 29 2 0.000013586 5404 G WS 0 + 8 [dd]
252,0 29 3 0.000019647 5404 I WS 0 + 8 [dd]
252,0 29 4 0.000065293 920 D WS 0 + 8 [kworker/29:1H]
252,0 29 5 0.000069881 920 R WS 0 + 8 [0]
252,0 29 6 0.000082565 920 I WS 0 + 8 [kworker/29:1H]
252,0 29 7 0.000087063 920 D WS 0 + 8 [kworker/29:1H]
252,0 29 8 0.000115106 157 C WS 0 + 8 [0]
252,0 29 9 0.000160140 5404 Q WS 8 + 8 [dd]
252,0 29 10 0.000163998 5404 G WS 8 + 8 [dd]
252,0 29 11 0.000167524 5404 I WS 8 + 8 [dd]
252,0 29 12 0.000185177 920 D WS 8 + 8 [kworker/29:1H]
252,0 29 13 0.000198763 157 C WS 8 + 8 [0]
252,0 29 14 0.000230382 5404 Q WS 16 + 8 [dd]
252,0 29 15 0.000233849 5404 G WS 16 + 8 [dd]
252,0 29 16 0.000237075 5404 I WS 16 + 8 [dd]
252,0 29 17 0.000253005 920 D WS 16 + 8 [kworker/29:1H]
252,0 29 18 0.000265608 157 C WS 16 + 8 [0]
252,0 29 19 0.000295935 5404 Q WS 24 + 8 [dd]
252,0 29 20 0.000299362 5404 G WS 24 + 8 [dd]
252,0 29 21 0.000366467 5404 I WS 24 + 8 [dd]
252,0 29 22 0.000385343 920 D WS 24 + 8 [kworker/29:1H]
252,0 29 23 0.000387797 920 R WS 24 + 8 [0]
252,0 29 24 0.000396844 920 D WS 24 + 8 [kworker/29:1H]
252,0 29 25 0.000410941 157 C WS 24 + 8 [0]
252,0 29 26 0.000452308 5404 Q WS 32 + 8 [dd]
252,0 29 27 0.000456556 5404 G WS 32 + 8 [dd]
252,0 29 28 0.000460053 5404 I WS 32 + 8 [dd]
252,0 29 29 0.000477676 920 D WS 32 + 8 [kworker/29:1H]
252,0 29 30 0.000490159 157 C WS 32 + 8 [0]
252,0 29 31 0.000521779 5404 Q WS 40 + 8 [dd]
252,0 29 32 0.000525205 5404 G WS 40 + 8 [dd]
252,0 29 33 0.000528361 5404 I WS 40 + 8 [dd]
252,0 29 34 0.000544030 920 D WS 40 + 8 [kworker/29:1H]
252,0 29 35 0.000556514 157 C WS 40 + 8 [0]
252,0 29 36 0.000588003 5404 Q WS 48 + 8 [dd]
252,0 29 37 0.000591379 5404 G WS 48 + 8 [dd]
252,0 29 38 0.000594525 5404 I WS 48 + 8 [dd]
252,0 29 39 0.000610535 920 D WS 48 + 8 [kworker/29:1H]
252,0 29 40 0.000612709 920 R WS 48 + 8 [0]
252,0 29 41 0.000621175 920 I WS 48 + 8 [kworker/29:1H]
252,0 29 42 0.000624601 920 D WS 48 + 8 [kworker/29:1H]
252,0 29 43 0.000637155 157 C WS 48 + 8 [0]
252,0 29 44 0.000667993 5404 Q WS 56 + 8 [dd]
252,0 29 45 0.000671509 5404 G WS 56 + 8 [dd]
252,0 29 46 0.000674705 5404 I WS 56 + 8 [dd]
252,0 29 47 0.000691447 920 D WS 56 + 8 [kworker/29:1H]
252,0 29 48 0.000703780 157 C WS 56 + 8 [0]
252,0 29 49 0.000735710 5404 Q WS 64 + 8 [dd]
252,0 29 50 0.000739116 5404 G WS 64 + 8 [dd]
252,0 29 51 0.000742322 5404 I WS 64 + 8 [dd]
252,0 29 52 0.000757531 920 D WS 64 + 8 [kworker/29:1H]
252,0 29 53 0.000769643 157 C WS 64 + 8 [0]
252,0 29 54 0.000800051 5404 Q WS 72 + 8 [dd]
252,0 29 55 0.000803487 5404 G WS 72 + 8 [dd]
252,0 29 56 0.000806633 5404 I WS 72 + 8 [dd]
252,0 29 57 0.000821411 920 D WS 72 + 8 [kworker/29:1H]
252,0 29 58 0.000833834 157 C WS 72 + 8 [0]
CPU29 (252,0):
Reads Queued: 0, 0KiB Writes Queued: 10, 40KiB
Read Dispatches: 0, 0KiB Write Dispatches: 13, 40KiB
Reads Requeued: 0 Writes Requeued: 3
Reads Completed: 0, 0KiB Writes Completed: 10, 40KiB
Read Merges: 0, 0KiB Write Merges: 0, 0KiB
Read depth: 0 Write depth: 1
IO unplugs: 0 Timer unplugs: 0
Throughput (R/W): 0KiB/s / 0KiB/s
Events (252,0): 58 entries
Skips: 0 forward (0 - 0.0%)
#
--
2.22.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH V3 1/5] block: remove superfluous param in blk_fill_rwbs()
2021-02-22 5:29 [PATCH V3 0/5] blktrace: few cleanup Chaitanya Kulkarni
@ 2021-02-22 5:29 ` Chaitanya Kulkarni
2021-02-22 5:29 ` [PATCH V3 2/5] blktrace: add blk_fill_rwbs documentation comment Chaitanya Kulkarni
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Chaitanya Kulkarni @ 2021-02-22 5:29 UTC (permalink / raw)
To: linux-block
Cc: paolo.valente, axboe, rostedt, mingo, chaitanya.kulkarni,
johannes.thumshirn, damien.lemoal, bvanassche, dongli.zhang,
akpm, hare, colyli, tj, rdunlap, jack, hch
The last parameter for the function blk_fill_rwbs() was added in
5782138e47 ("tracing/events: convert block trace points to
TRACE_EVENT()") in order to signal read request and use of that parameter
was replaced with using switch case REQ_OP_READ with
1b9a9ab78b0 ("blktrace: use op accessors"), but the parameter was never
removed.
Remove the unused parameter and adjust the respective call sites.
Fixes: 1b9a9ab78b0 ("blktrace: use op accessors")
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
include/linux/blktrace_api.h | 2 +-
include/trace/events/bcache.h | 10 +++++-----
include/trace/events/block.h | 16 ++++++++--------
kernel/trace/blktrace.c | 2 +-
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
index 05556573b896..11484f1d19a1 100644
--- a/include/linux/blktrace_api.h
+++ b/include/linux/blktrace_api.h
@@ -119,7 +119,7 @@ struct compat_blk_user_trace_setup {
#endif
-extern void blk_fill_rwbs(char *rwbs, unsigned int op, int bytes);
+extern void blk_fill_rwbs(char *rwbs, unsigned int op);
static inline sector_t blk_rq_trace_sector(struct request *rq)
{
diff --git a/include/trace/events/bcache.h b/include/trace/events/bcache.h
index e41c611d6d3b..899fdacf57b9 100644
--- a/include/trace/events/bcache.h
+++ b/include/trace/events/bcache.h
@@ -28,7 +28,7 @@ DECLARE_EVENT_CLASS(bcache_request,
__entry->sector = bio->bi_iter.bi_sector;
__entry->orig_sector = bio->bi_iter.bi_sector - 16;
__entry->nr_sector = bio->bi_iter.bi_size >> 9;
- blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size);
+ blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
),
TP_printk("%d,%d %s %llu + %u (from %d,%d @ %llu)",
@@ -102,7 +102,7 @@ DECLARE_EVENT_CLASS(bcache_bio,
__entry->dev = bio_dev(bio);
__entry->sector = bio->bi_iter.bi_sector;
__entry->nr_sector = bio->bi_iter.bi_size >> 9;
- blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size);
+ blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
),
TP_printk("%d,%d %s %llu + %u",
@@ -137,7 +137,7 @@ TRACE_EVENT(bcache_read,
__entry->dev = bio_dev(bio);
__entry->sector = bio->bi_iter.bi_sector;
__entry->nr_sector = bio->bi_iter.bi_size >> 9;
- blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size);
+ blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
__entry->cache_hit = hit;
__entry->bypass = bypass;
),
@@ -168,7 +168,7 @@ TRACE_EVENT(bcache_write,
__entry->inode = inode;
__entry->sector = bio->bi_iter.bi_sector;
__entry->nr_sector = bio->bi_iter.bi_size >> 9;
- blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size);
+ blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
__entry->writeback = writeback;
__entry->bypass = bypass;
),
@@ -238,7 +238,7 @@ TRACE_EVENT(bcache_journal_write,
__entry->sector = bio->bi_iter.bi_sector;
__entry->nr_sector = bio->bi_iter.bi_size >> 9;
__entry->nr_keys = keys;
- blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size);
+ blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
),
TP_printk("%d,%d %s %llu + %u keys %u",
diff --git a/include/trace/events/block.h b/include/trace/events/block.h
index 0d782663a005..879cba8bdfca 100644
--- a/include/trace/events/block.h
+++ b/include/trace/events/block.h
@@ -89,7 +89,7 @@ TRACE_EVENT(block_rq_requeue,
__entry->sector = blk_rq_trace_sector(rq);
__entry->nr_sector = blk_rq_trace_nr_sectors(rq);
- blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, blk_rq_bytes(rq));
+ blk_fill_rwbs(__entry->rwbs, rq->cmd_flags);
__get_str(cmd)[0] = '\0';
),
@@ -133,7 +133,7 @@ TRACE_EVENT(block_rq_complete,
__entry->nr_sector = nr_bytes >> 9;
__entry->error = error;
- blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, nr_bytes);
+ blk_fill_rwbs(__entry->rwbs, rq->cmd_flags);
__get_str(cmd)[0] = '\0';
),
@@ -166,7 +166,7 @@ DECLARE_EVENT_CLASS(block_rq,
__entry->nr_sector = blk_rq_trace_nr_sectors(rq);
__entry->bytes = blk_rq_bytes(rq);
- blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, blk_rq_bytes(rq));
+ blk_fill_rwbs(__entry->rwbs, rq->cmd_flags);
__get_str(cmd)[0] = '\0';
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
),
@@ -249,7 +249,7 @@ TRACE_EVENT(block_bio_complete,
__entry->sector = bio->bi_iter.bi_sector;
__entry->nr_sector = bio_sectors(bio);
__entry->error = blk_status_to_errno(bio->bi_status);
- blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size);
+ blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
),
TP_printk("%d,%d %s %llu + %u [%d]",
@@ -276,7 +276,7 @@ DECLARE_EVENT_CLASS(block_bio,
__entry->dev = bio_dev(bio);
__entry->sector = bio->bi_iter.bi_sector;
__entry->nr_sector = bio_sectors(bio);
- blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size);
+ blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
),
@@ -433,7 +433,7 @@ TRACE_EVENT(block_split,
__entry->dev = bio_dev(bio);
__entry->sector = bio->bi_iter.bi_sector;
__entry->new_sector = new_sector;
- blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size);
+ blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
),
@@ -474,7 +474,7 @@ TRACE_EVENT(block_bio_remap,
__entry->nr_sector = bio_sectors(bio);
__entry->old_dev = dev;
__entry->old_sector = from;
- blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size);
+ blk_fill_rwbs(__entry->rwbs, bio->bi_opf);
),
TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu",
@@ -518,7 +518,7 @@ TRACE_EVENT(block_rq_remap,
__entry->old_dev = dev;
__entry->old_sector = from;
__entry->nr_bios = blk_rq_count_bios(rq);
- blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, blk_rq_bytes(rq));
+ blk_fill_rwbs(__entry->rwbs, rq->cmd_flags);
),
TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu %u",
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 9e9ee4945043..8a2591c7aa41 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1867,7 +1867,7 @@ void blk_trace_remove_sysfs(struct device *dev)
#ifdef CONFIG_EVENT_TRACING
-void blk_fill_rwbs(char *rwbs, unsigned int op, int bytes)
+void blk_fill_rwbs(char *rwbs, unsigned int op)
{
int i = 0;
--
2.22.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH V3 2/5] blktrace: add blk_fill_rwbs documentation comment
2021-02-22 5:29 [PATCH V3 0/5] blktrace: few cleanup Chaitanya Kulkarni
2021-02-22 5:29 ` [PATCH V3 1/5] block: remove superfluous param in blk_fill_rwbs() Chaitanya Kulkarni
@ 2021-02-22 5:29 ` Chaitanya Kulkarni
2021-02-22 5:29 ` [PATCH V3 3/5] blktrace: fix blk_rq_issue documentation Chaitanya Kulkarni
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Chaitanya Kulkarni @ 2021-02-22 5:29 UTC (permalink / raw)
To: linux-block
Cc: paolo.valente, axboe, rostedt, mingo, chaitanya.kulkarni,
johannes.thumshirn, damien.lemoal, bvanassche, dongli.zhang,
akpm, hare, colyli, tj, rdunlap, jack, hch
blk_fill_rwbs() is an expoted function, add kernel style documentation
comment.
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
include/linux/blktrace_api.h | 2 +-
kernel/trace/blktrace.c | 10 ++++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
index 11484f1d19a1..e17d04abf6a3 100644
--- a/include/linux/blktrace_api.h
+++ b/include/linux/blktrace_api.h
@@ -119,7 +119,7 @@ struct compat_blk_user_trace_setup {
#endif
-extern void blk_fill_rwbs(char *rwbs, unsigned int op);
+void blk_fill_rwbs(char *rwbs, unsigned int op);
static inline sector_t blk_rq_trace_sector(struct request *rq)
{
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 8a2591c7aa41..d7ebef83771c 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1867,6 +1867,16 @@ void blk_trace_remove_sysfs(struct device *dev)
#ifdef CONFIG_EVENT_TRACING
+/**
+ * blk_fill_rwbs - Fill the buffer rwbs by mapping op to character string.
+ * @rwbs buffer to be filled
+ * @op: REQ_OP_XXX for the tracepoint
+ *
+ * Description:
+ * Maps the REQ_OP_XXX to character and fills the buffer provided by the
+ * caller with resulting string.
+ *
+ **/
void blk_fill_rwbs(char *rwbs, unsigned int op)
{
int i = 0;
--
2.22.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH V3 3/5] blktrace: fix blk_rq_issue documentation
2021-02-22 5:29 [PATCH V3 0/5] blktrace: few cleanup Chaitanya Kulkarni
2021-02-22 5:29 ` [PATCH V3 1/5] block: remove superfluous param in blk_fill_rwbs() Chaitanya Kulkarni
2021-02-22 5:29 ` [PATCH V3 2/5] blktrace: add blk_fill_rwbs documentation comment Chaitanya Kulkarni
@ 2021-02-22 5:29 ` Chaitanya Kulkarni
2021-02-22 5:29 ` [PATCH V3 4/5] blktrace: fix blk_rq_merge documentation Chaitanya Kulkarni
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Chaitanya Kulkarni @ 2021-02-22 5:29 UTC (permalink / raw)
To: linux-block
Cc: paolo.valente, axboe, rostedt, mingo, chaitanya.kulkarni,
johannes.thumshirn, damien.lemoal, bvanassche, dongli.zhang,
akpm, hare, colyli, tj, rdunlap, jack, hch
The commit 881245dcff29 ("Add DocBook documentation for the block tracepoints.")
added the comment for blk_rq_issue() tracepoint. Remove the duplicate
word from the tracepoint documentation.
Fixes: 881245dcff29 ("Add DocBook documentation for the block tracepoints.")
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
include/trace/events/block.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/trace/events/block.h b/include/trace/events/block.h
index 879cba8bdfca..004cfe34ef37 100644
--- a/include/trace/events/block.h
+++ b/include/trace/events/block.h
@@ -196,7 +196,7 @@ DEFINE_EVENT(block_rq, block_rq_insert,
/**
* block_rq_issue - issue pending block IO request operation to device driver
- * @rq: block IO operation operation request
+ * @rq: block IO operation request
*
* Called when block operation request @rq from queue @q is sent to a
* device driver for processing.
--
2.22.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH V3 4/5] blktrace: fix blk_rq_merge documentation
2021-02-22 5:29 [PATCH V3 0/5] blktrace: few cleanup Chaitanya Kulkarni
` (2 preceding siblings ...)
2021-02-22 5:29 ` [PATCH V3 3/5] blktrace: fix blk_rq_issue documentation Chaitanya Kulkarni
@ 2021-02-22 5:29 ` Chaitanya Kulkarni
2021-02-22 5:29 ` [PATCH V3 5/5] block: get rid of the trace rq insert wrapper Chaitanya Kulkarni
2021-02-22 13:37 ` [PATCH V3 0/5] blktrace: few cleanup Jens Axboe
5 siblings, 0 replies; 7+ messages in thread
From: Chaitanya Kulkarni @ 2021-02-22 5:29 UTC (permalink / raw)
To: linux-block
Cc: paolo.valente, axboe, rostedt, mingo, chaitanya.kulkarni,
johannes.thumshirn, damien.lemoal, bvanassche, dongli.zhang,
akpm, hare, colyli, tj, rdunlap, jack, hch
The commit f3bdc62fd82e ("blktrace: Provide event for request merging")
added the comment for blk_rq_merge() tracepoint. Remove the duplicate
word from the tracepoint documentation.
Fixes: f3bdc62fd82e ("blktrace: Provide event for request merging")
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
include/trace/events/block.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/trace/events/block.h b/include/trace/events/block.h
index 004cfe34ef37..cc5ab96a7471 100644
--- a/include/trace/events/block.h
+++ b/include/trace/events/block.h
@@ -210,7 +210,7 @@ DEFINE_EVENT(block_rq, block_rq_issue,
/**
* block_rq_merge - merge request with another one in the elevator
- * @rq: block IO operation operation request
+ * @rq: block IO operation request
*
* Called when block operation request @rq from queue @q is merged to another
* request queued in the elevator.
--
2.22.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH V3 5/5] block: get rid of the trace rq insert wrapper
2021-02-22 5:29 [PATCH V3 0/5] blktrace: few cleanup Chaitanya Kulkarni
` (3 preceding siblings ...)
2021-02-22 5:29 ` [PATCH V3 4/5] blktrace: fix blk_rq_merge documentation Chaitanya Kulkarni
@ 2021-02-22 5:29 ` Chaitanya Kulkarni
2021-02-22 13:37 ` [PATCH V3 0/5] blktrace: few cleanup Jens Axboe
5 siblings, 0 replies; 7+ messages in thread
From: Chaitanya Kulkarni @ 2021-02-22 5:29 UTC (permalink / raw)
To: linux-block
Cc: paolo.valente, axboe, rostedt, mingo, chaitanya.kulkarni,
johannes.thumshirn, damien.lemoal, bvanassche, dongli.zhang,
akpm, hare, colyli, tj, rdunlap, jack, hch
Get rid of the wrapper for trace_block_rq_insert() and call the function
directly.
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
block/bfq-iosched.c | 4 +++-
block/blk-core.c | 1 +
block/blk-mq-sched.c | 6 ------
block/blk-mq-sched.h | 1 -
block/kyber-iosched.c | 4 +++-
block/mq-deadline.c | 4 +++-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index b398dde53af9..ec482e6641ff 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -125,6 +125,8 @@
#include <linux/delay.h>
#include <linux/backing-dev.h>
+#include <trace/events/block.h>
+
#include "blk.h"
#include "blk-mq.h"
#include "blk-mq-tag.h"
@@ -5621,7 +5623,7 @@ static void bfq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,
spin_unlock_irq(&bfqd->lock);
- blk_mq_sched_request_inserted(rq);
+ trace_block_rq_insert(rq);
spin_lock_irq(&bfqd->lock);
bfqq = bfq_init_rq(rq);
diff --git a/block/blk-core.c b/block/blk-core.c
index 5e752840b41a..fc60ff208497 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -59,6 +59,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_remap);
EXPORT_TRACEPOINT_SYMBOL_GPL(block_bio_complete);
EXPORT_TRACEPOINT_SYMBOL_GPL(block_split);
EXPORT_TRACEPOINT_SYMBOL_GPL(block_unplug);
+EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_insert);
DEFINE_IDA(blk_queue_ida);
diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
index deff4e826e23..ddb65e9e6fd9 100644
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@ -384,12 +384,6 @@ bool blk_mq_sched_try_insert_merge(struct request_queue *q, struct request *rq)
}
EXPORT_SYMBOL_GPL(blk_mq_sched_try_insert_merge);
-void blk_mq_sched_request_inserted(struct request *rq)
-{
- trace_block_rq_insert(rq);
-}
-EXPORT_SYMBOL_GPL(blk_mq_sched_request_inserted);
-
static bool blk_mq_sched_bypass_insert(struct blk_mq_hw_ctx *hctx,
bool has_sched,
struct request *rq)
diff --git a/block/blk-mq-sched.h b/block/blk-mq-sched.h
index 0476360f05f1..5b18ab915c65 100644
--- a/block/blk-mq-sched.h
+++ b/block/blk-mq-sched.h
@@ -7,7 +7,6 @@
void blk_mq_sched_assign_ioc(struct request *rq);
-void blk_mq_sched_request_inserted(struct request *rq);
bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio,
unsigned int nr_segs, struct request **merged_request);
bool __blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio,
diff --git a/block/kyber-iosched.c b/block/kyber-iosched.c
index c25c41d0d061..f13da10953bf 100644
--- a/block/kyber-iosched.c
+++ b/block/kyber-iosched.c
@@ -13,6 +13,8 @@
#include <linux/module.h>
#include <linux/sbitmap.h>
+#include <trace/events/block.h>
+
#include "blk.h"
#include "blk-mq.h"
#include "blk-mq-debugfs.h"
@@ -602,7 +604,7 @@ static void kyber_insert_requests(struct blk_mq_hw_ctx *hctx,
list_move_tail(&rq->queuelist, head);
sbitmap_set_bit(&khd->kcq_map[sched_domain],
rq->mq_ctx->index_hw[hctx->type]);
- blk_mq_sched_request_inserted(rq);
+ trace_block_rq_insert(rq);
spin_unlock(&kcq->lock);
}
}
diff --git a/block/mq-deadline.c b/block/mq-deadline.c
index b57470e154c8..f3631a287466 100644
--- a/block/mq-deadline.c
+++ b/block/mq-deadline.c
@@ -18,6 +18,8 @@
#include <linux/rbtree.h>
#include <linux/sbitmap.h>
+#include <trace/events/block.h>
+
#include "blk.h"
#include "blk-mq.h"
#include "blk-mq-debugfs.h"
@@ -496,7 +498,7 @@ static void dd_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,
if (blk_mq_sched_try_insert_merge(q, rq))
return;
- blk_mq_sched_request_inserted(rq);
+ trace_block_rq_insert(rq);
if (at_head || blk_rq_is_passthrough(rq)) {
if (at_head)
--
2.22.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH V3 0/5] blktrace: few cleanup
2021-02-22 5:29 [PATCH V3 0/5] blktrace: few cleanup Chaitanya Kulkarni
` (4 preceding siblings ...)
2021-02-22 5:29 ` [PATCH V3 5/5] block: get rid of the trace rq insert wrapper Chaitanya Kulkarni
@ 2021-02-22 13:37 ` Jens Axboe
5 siblings, 0 replies; 7+ messages in thread
From: Jens Axboe @ 2021-02-22 13:37 UTC (permalink / raw)
To: Chaitanya Kulkarni, linux-block
Cc: paolo.valente, rostedt, mingo, johannes.thumshirn, damien.lemoal,
bvanassche, dongli.zhang, akpm, hare, colyli, tj, rdunlap, jack,
hch
On 2/21/21 10:29 PM, Chaitanya Kulkarni wrote:
> Hi,
>
> These are few cleanups for the block trace.
Applied, thanks.
--
Jens Axboe
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-02-22 13:40 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-22 5:29 [PATCH V3 0/5] blktrace: few cleanup Chaitanya Kulkarni
2021-02-22 5:29 ` [PATCH V3 1/5] block: remove superfluous param in blk_fill_rwbs() Chaitanya Kulkarni
2021-02-22 5:29 ` [PATCH V3 2/5] blktrace: add blk_fill_rwbs documentation comment Chaitanya Kulkarni
2021-02-22 5:29 ` [PATCH V3 3/5] blktrace: fix blk_rq_issue documentation Chaitanya Kulkarni
2021-02-22 5:29 ` [PATCH V3 4/5] blktrace: fix blk_rq_merge documentation Chaitanya Kulkarni
2021-02-22 5:29 ` [PATCH V3 5/5] block: get rid of the trace rq insert wrapper Chaitanya Kulkarni
2021-02-22 13:37 ` [PATCH V3 0/5] blktrace: few cleanup Jens Axboe
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.