diff options
Diffstat (limited to 'block/blktrace.c')
-rw-r--r-- | block/blktrace.c | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/block/blktrace.c b/block/blktrace.c index 8ff33441d8a2..135593c8e45b 100644 --- a/block/blktrace.c +++ b/block/blktrace.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2006 Jens Axboe <axboe@suse.de> | 2 | * Copyright (C) 2006 Jens Axboe <axboe@kernel.dk> |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |
5 | * it under the terms of the GNU General Public License version 2 as | 5 | * it under the terms of the GNU General Public License version 2 as |
@@ -69,7 +69,7 @@ static u32 ddir_act[2] __read_mostly = { BLK_TC_ACT(BLK_TC_READ), BLK_TC_ACT(BLK | |||
69 | /* | 69 | /* |
70 | * Bio action bits of interest | 70 | * Bio action bits of interest |
71 | */ | 71 | */ |
72 | static u32 bio_act[5] __read_mostly = { 0, BLK_TC_ACT(BLK_TC_BARRIER), BLK_TC_ACT(BLK_TC_SYNC), 0, BLK_TC_ACT(BLK_TC_AHEAD) }; | 72 | static u32 bio_act[9] __read_mostly = { 0, BLK_TC_ACT(BLK_TC_BARRIER), BLK_TC_ACT(BLK_TC_SYNC), 0, BLK_TC_ACT(BLK_TC_AHEAD), 0, 0, 0, BLK_TC_ACT(BLK_TC_META) }; |
73 | 73 | ||
74 | /* | 74 | /* |
75 | * More could be added as needed, taking care to increment the decrementer | 75 | * More could be added as needed, taking care to increment the decrementer |
@@ -81,6 +81,8 @@ static u32 bio_act[5] __read_mostly = { 0, BLK_TC_ACT(BLK_TC_BARRIER), BLK_TC_AC | |||
81 | (((rw) & (1 << BIO_RW_SYNC)) >> (BIO_RW_SYNC - 1)) | 81 | (((rw) & (1 << BIO_RW_SYNC)) >> (BIO_RW_SYNC - 1)) |
82 | #define trace_ahead_bit(rw) \ | 82 | #define trace_ahead_bit(rw) \ |
83 | (((rw) & (1 << BIO_RW_AHEAD)) << (2 - BIO_RW_AHEAD)) | 83 | (((rw) & (1 << BIO_RW_AHEAD)) << (2 - BIO_RW_AHEAD)) |
84 | #define trace_meta_bit(rw) \ | ||
85 | (((rw) & (1 << BIO_RW_META)) >> (BIO_RW_META - 3)) | ||
84 | 86 | ||
85 | /* | 87 | /* |
86 | * The worker for the various blk_add_trace*() types. Fills out a | 88 | * The worker for the various blk_add_trace*() types. Fills out a |
@@ -103,6 +105,7 @@ void __blk_add_trace(struct blk_trace *bt, sector_t sector, int bytes, | |||
103 | what |= bio_act[trace_barrier_bit(rw)]; | 105 | what |= bio_act[trace_barrier_bit(rw)]; |
104 | what |= bio_act[trace_sync_bit(rw)]; | 106 | what |= bio_act[trace_sync_bit(rw)]; |
105 | what |= bio_act[trace_ahead_bit(rw)]; | 107 | what |= bio_act[trace_ahead_bit(rw)]; |
108 | what |= bio_act[trace_meta_bit(rw)]; | ||
106 | 109 | ||
107 | pid = tsk->pid; | 110 | pid = tsk->pid; |
108 | if (unlikely(act_log_check(bt, what, sector, pid))) | 111 | if (unlikely(act_log_check(bt, what, sector, pid))) |
@@ -473,6 +476,9 @@ static void blk_check_time(unsigned long long *t) | |||
473 | *t -= (a + b) / 2; | 476 | *t -= (a + b) / 2; |
474 | } | 477 | } |
475 | 478 | ||
479 | /* | ||
480 | * calibrate our inter-CPU timings | ||
481 | */ | ||
476 | static void blk_trace_check_cpu_time(void *data) | 482 | static void blk_trace_check_cpu_time(void *data) |
477 | { | 483 | { |
478 | unsigned long long *t; | 484 | unsigned long long *t; |
@@ -490,20 +496,6 @@ static void blk_trace_check_cpu_time(void *data) | |||
490 | put_cpu(); | 496 | put_cpu(); |
491 | } | 497 | } |
492 | 498 | ||
493 | /* | ||
494 | * Call blk_trace_check_cpu_time() on each CPU to calibrate our inter-CPU | ||
495 | * timings | ||
496 | */ | ||
497 | static void blk_trace_calibrate_offsets(void) | ||
498 | { | ||
499 | unsigned long flags; | ||
500 | |||
501 | smp_call_function(blk_trace_check_cpu_time, NULL, 1, 1); | ||
502 | local_irq_save(flags); | ||
503 | blk_trace_check_cpu_time(NULL); | ||
504 | local_irq_restore(flags); | ||
505 | } | ||
506 | |||
507 | static void blk_trace_set_ht_offsets(void) | 499 | static void blk_trace_set_ht_offsets(void) |
508 | { | 500 | { |
509 | #if defined(CONFIG_SCHED_SMT) | 501 | #if defined(CONFIG_SCHED_SMT) |
@@ -532,7 +524,7 @@ static void blk_trace_set_ht_offsets(void) | |||
532 | static __init int blk_trace_init(void) | 524 | static __init int blk_trace_init(void) |
533 | { | 525 | { |
534 | mutex_init(&blk_tree_mutex); | 526 | mutex_init(&blk_tree_mutex); |
535 | blk_trace_calibrate_offsets(); | 527 | on_each_cpu(blk_trace_check_cpu_time, NULL, 1, 1); |
536 | blk_trace_set_ht_offsets(); | 528 | blk_trace_set_ht_offsets(); |
537 | 529 | ||
538 | return 0; | 530 | return 0; |