moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: remove the request_queue argument to the block_bio_remap tracepoint

Browse Source 
The request_queue can trivially be derived from the bio.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig
2020-12-03 17:21:38 +01:00
committed by Jens Axboe
parent eb6f7f7cd3
commit 1c02fca620
11 changed files with 28 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
block/blk-core.c
View File

@@ -758,7 +758,7 @@ static inline int blk_partition_remap(struct bio *bio)
if (bio_check_eod(bio, bdev_nr_sectors(p))) if (bio_check_eod(bio, bdev_nr_sectors(p)))
goto out; goto out;
bio->bi_iter.bi_sector += p->bd_start_sect; bio->bi_iter.bi_sector += p->bd_start_sect;
trace_block_bio_remap(bio->bi_disk->queue, bio, p->bd_dev, trace_block_bio_remap(bio, p->bd_dev,
bio->bi_iter.bi_sector - bio->bi_iter.bi_sector -
p->bd_start_sect); p->bd_start_sect);
} }

3
drivers/md/dm.c
View File

@@ -1276,8 +1276,7 @@ static blk_qc_t __map_bio(struct dm_target_io *tio)
break; break;
case DM_MAPIO_REMAPPED: case DM_MAPIO_REMAPPED:
/* the bio has been remapped so dispatch it */ /* the bio has been remapped so dispatch it */
trace_block_bio_remap(clone->bi_disk->queue, clone, trace_block_bio_remap(clone, bio_dev(io->orig_bio), sector);
bio_dev(io->orig_bio), sector);
ret = submit_bio_noacct(clone); ret = submit_bio_noacct(clone);
break; break;
case DM_MAPIO_KILL: case DM_MAPIO_KILL:

3
drivers/md/md-linear.c
View File

@@ -257,8 +257,7 @@ static bool linear_make_request(struct mddev *mddev, struct bio *bio)
bio_endio(bio); bio_endio(bio);
} else { } else {
if (mddev->gendisk) if (mddev->gendisk)
trace_block_bio_remap(bio->bi_disk->queue, trace_block_bio_remap(bio, disk_devt(mddev->gendisk),
bio, disk_devt(mddev->gendisk),
bio_sector); bio_sector);
mddev_check_writesame(mddev, bio); mddev_check_writesame(mddev, bio);
mddev_check_write_zeroes(mddev, bio); mddev_check_write_zeroes(mddev, bio);

5
drivers/md/md.c
View File

@@ -8591,9 +8591,8 @@ void md_submit_discard_bio(struct mddev *mddev, struct md_rdev *rdev,
bio_chain(discard_bio, bio); bio_chain(discard_bio, bio);
bio_clone_blkg_association(discard_bio, bio); bio_clone_blkg_association(discard_bio, bio);
if (mddev->gendisk) if (mddev->gendisk)
trace_block_bio_remap(bdev_get_queue(rdev->bdev), trace_block_bio_remap(discard_bio, disk_devt(mddev->gendisk),
discard_bio, disk_devt(mddev->gendisk), bio->bi_iter.bi_sector);
bio->bi_iter.bi_sector);
submit_bio_noacct(discard_bio); submit_bio_noacct(discard_bio);
} }
EXPORT_SYMBOL(md_submit_discard_bio); EXPORT_SYMBOL(md_submit_discard_bio);

4
drivers/md/raid0.c
View File

@@ -571,8 +571,8 @@ static bool raid0_make_request(struct mddev *mddev, struct bio *bio)
tmp_dev->data_offset; tmp_dev->data_offset;
if (mddev->gendisk) if (mddev->gendisk)
trace_block_bio_remap(bio->bi_disk->queue, bio, trace_block_bio_remap(bio, disk_devt(mddev->gendisk),
disk_devt(mddev->gendisk), bio_sector); bio_sector);
mddev_check_writesame(mddev, bio); mddev_check_writesame(mddev, bio);
mddev_check_write_zeroes(mddev, bio); mddev_check_write_zeroes(mddev, bio);
submit_bio_noacct(bio); submit_bio_noacct(bio);

7
drivers/md/raid1.c
View File

@@ -1305,8 +1305,8 @@ static void raid1_read_request(struct mddev *mddev, struct bio *bio,
read_bio->bi_private = r1_bio; read_bio->bi_private = r1_bio;
if (mddev->gendisk) if (mddev->gendisk)
trace_block_bio_remap(read_bio->bi_disk->queue, read_bio, trace_block_bio_remap(read_bio, disk_devt(mddev->gendisk),
disk_devt(mddev->gendisk), r1_bio->sector); r1_bio->sector);
submit_bio_noacct(read_bio); submit_bio_noacct(read_bio);
} }
@@ -1517,8 +1517,7 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,
atomic_inc(&r1_bio->remaining); atomic_inc(&r1_bio->remaining);
if (mddev->gendisk) if (mddev->gendisk)
trace_block_bio_remap(mbio->bi_disk->queue, trace_block_bio_remap(mbio, disk_devt(mddev->gendisk),
mbio, disk_devt(mddev->gendisk),
r1_bio->sector); r1_bio->sector);
/* flush_pending_writes() needs access to the rdev so...*/ /* flush_pending_writes() needs access to the rdev so...*/
mbio->bi_disk = (void *)conf->mirrors[i].rdev; mbio->bi_disk = (void *)conf->mirrors[i].rdev;

6
drivers/md/raid10.c
View File

@@ -1200,8 +1200,7 @@ static void raid10_read_request(struct mddev *mddev, struct bio *bio,
read_bio->bi_private = r10_bio; read_bio->bi_private = r10_bio;
if (mddev->gendisk) if (mddev->gendisk)
trace_block_bio_remap(read_bio->bi_disk->queue, trace_block_bio_remap(read_bio, disk_devt(mddev->gendisk),
read_bio, disk_devt(mddev->gendisk),
r10_bio->sector); r10_bio->sector);
submit_bio_noacct(read_bio); submit_bio_noacct(read_bio);
return; return;
@@ -1250,8 +1249,7 @@ static void raid10_write_one_disk(struct mddev *mddev, struct r10bio *r10_bio,
mbio->bi_private = r10_bio; mbio->bi_private = r10_bio;
if (conf->mddev->gendisk) if (conf->mddev->gendisk)
trace_block_bio_remap(mbio->bi_disk->queue, trace_block_bio_remap(mbio, disk_devt(conf->mddev->gendisk),
mbio, disk_devt(conf->mddev->gendisk),
r10_bio->sector); r10_bio->sector);
/* flush_pending_writes() needs access to the rdev so...*/ /* flush_pending_writes() needs access to the rdev so...*/
mbio->bi_disk = (void *)rdev; mbio->bi_disk = (void *)rdev;

15
drivers/md/raid5.c
View File

@@ -1222,9 +1222,9 @@ again:
set_bit(R5_DOUBLE_LOCKED, &sh->dev[i].flags); set_bit(R5_DOUBLE_LOCKED, &sh->dev[i].flags);
if (conf->mddev->gendisk) if (conf->mddev->gendisk)
trace_block_bio_remap(bi->bi_disk->queue, trace_block_bio_remap(bi,
bi, disk_devt(conf->mddev->gendisk), disk_devt(conf->mddev->gendisk),
sh->dev[i].sector); sh->dev[i].sector);
if (should_defer && op_is_write(op)) if (should_defer && op_is_write(op))
bio_list_add(&pending_bios, bi); bio_list_add(&pending_bios, bi);
else else
@@ -1272,9 +1272,9 @@ again:
if (op == REQ_OP_DISCARD) if (op == REQ_OP_DISCARD)
rbi->bi_vcnt = 0; rbi->bi_vcnt = 0;
if (conf->mddev->gendisk) if (conf->mddev->gendisk)
trace_block_bio_remap(rbi->bi_disk->queue, trace_block_bio_remap(rbi,
rbi, disk_devt(conf->mddev->gendisk), disk_devt(conf->mddev->gendisk),
sh->dev[i].sector); sh->dev[i].sector);
if (should_defer && op_is_write(op)) if (should_defer && op_is_write(op))
bio_list_add(&pending_bios, rbi); bio_list_add(&pending_bios, rbi);
else else
@@ -5468,8 +5468,7 @@ static int raid5_read_one_chunk(struct mddev *mddev, struct bio *raid_bio)
spin_unlock_irq(&conf->device_lock); spin_unlock_irq(&conf->device_lock);
if (mddev->gendisk) if (mddev->gendisk)
trace_block_bio_remap(align_bi->bi_disk->queue, trace_block_bio_remap(align_bi, disk_devt(mddev->gendisk),
align_bi, disk_devt(mddev->gendisk),
raid_bio->bi_iter.bi_sector); raid_bio->bi_iter.bi_sector);
submit_bio_noacct(align_bi); submit_bio_noacct(align_bi);
return 1; return 1;

3
drivers/nvme/host/multipath.c
View File

@@ -312,8 +312,7 @@ blk_qc_t nvme_ns_head_submit_bio(struct bio *bio)
if (likely(ns)) { if (likely(ns)) {
bio->bi_disk = ns->disk; bio->bi_disk = ns->disk;
bio->bi_opf |= REQ_NVME_MPATH; bio->bi_opf |= REQ_NVME_MPATH;
trace_block_bio_remap(bio->bi_disk->queue, bio, trace_block_bio_remap(bio, disk_devt(ns->head->disk),
disk_devt(ns->head->disk),
bio->bi_iter.bi_sector); bio->bi_iter.bi_sector);
ret = submit_bio_noacct(bio); ret = submit_bio_noacct(bio);
} else if (nvme_available_path(head)) { } else if (nvme_available_path(head)) {

8
include/trace/events/block.h
View File

@@ -450,9 +450,8 @@ TRACE_EVENT(block_split,
/** /**
* block_bio_remap - map request for a logical device to the raw device * block_bio_remap - map request for a logical device to the raw device
* @q: queue holding the operation
* @bio: revised operation * @bio: revised operation
* @dev: device for the operation * @dev: original device for the operation
* @from: original sector for the operation * @from: original sector for the operation
* *
* An operation for a logical device has been mapped to the * An operation for a logical device has been mapped to the
@@ -460,10 +459,9 @@ TRACE_EVENT(block_split,
*/ */
TRACE_EVENT(block_bio_remap, TRACE_EVENT(block_bio_remap,
TP_PROTO(struct request_queue *q, struct bio *bio, dev_t dev, TP_PROTO(struct bio *bio, dev_t dev, sector_t from),
sector_t from),
TP_ARGS(q, bio, dev, from), TP_ARGS(bio, dev, from),
TP_STRUCT__entry( TP_STRUCT__entry(
__field( dev_t, dev ) __field( dev_t, dev )

14
kernel/trace/blktrace.c
View File

@@ -993,20 +993,16 @@ static void blk_add_trace_split(void *ignore, struct bio *bio, unsigned int pdu)
/** /**
* blk_add_trace_bio_remap - Add a trace for a bio-remap operation * blk_add_trace_bio_remap - Add a trace for a bio-remap operation
* @ignore: trace callback data parameter (not used) * @ignore: trace callback data parameter (not used)
* @q: queue the io is for
* @bio: the source bio * @bio: the source bio
* @dev: target device * @dev: source device
* @from: source sector * @from: source sector
* *
* Description: * Called after a bio is remapped to a different device and/or sector.
* Device mapper or raid target sometimes need to split a bio because
* it spans a stripe (or similar). Add a trace for that action.
*
**/ **/
static void blk_add_trace_bio_remap(void *ignore, static void blk_add_trace_bio_remap(void *ignore, struct bio *bio, dev_t dev,
struct request_queue *q, struct bio *bio, sector_t from)
dev_t dev, sector_t from)
{ {
struct request_queue *q = bio->bi_disk->queue;
struct blk_trace *bt; struct blk_trace *bt;
struct blk_io_trace_remap r; struct blk_io_trace_remap r;