block: remove the request_queue argument to the block_bio_remap tracepoint

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>

diff --git a/block/blk-core.c b/block/blk-core.c
index cb24654..96e5fcd 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -758,7 +758,7 @@ static inline int blk_partition_remap(struct bio *bio)
                if (bio_check_eod(bio, bdev_nr_sectors(p)))
                        goto out;
                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 -
                                      p->bd_start_sect);
        }

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 9a5bd90..5181907 100644 (file)
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1276,8 +1276,7 @@ static blk_qc_t __map_bio(struct dm_target_io *tio)
                break;
        case DM_MAPIO_REMAPPED:
                /* the bio has been remapped so dispatch it */
-               trace_block_bio_remap(clone->bi_disk->queue, clone,
-                                     bio_dev(io->orig_bio), sector);
+               trace_block_bio_remap(clone, bio_dev(io->orig_bio), sector);
                ret = submit_bio_noacct(clone);
                break;
        case DM_MAPIO_KILL:

diff --git a/drivers/md/md-linear.c b/drivers/md/md-linear.c
index 98f1b4b..68cac7d 100644 (file)
--- a/drivers/md/md-linear.c
+++ b/drivers/md/md-linear.c
@@ -257,8 +257,7 @@ static bool linear_make_request(struct mddev *mddev, struct bio *bio)
                bio_endio(bio);
        } else {
                if (mddev->gendisk)
-                       trace_block_bio_remap(bio->bi_disk->queue,
-                                             bio, disk_devt(mddev->gendisk),
+                       trace_block_bio_remap(bio, disk_devt(mddev->gendisk),
                                              bio_sector);
                mddev_check_writesame(mddev, bio);
                mddev_check_write_zeroes(mddev, bio);

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 0065736..c555be0 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -8591,9 +8591,8 @@ void md_submit_discard_bio(struct mddev *mddev, struct md_rdev *rdev,
        bio_chain(discard_bio, bio);
        bio_clone_blkg_association(discard_bio, bio);
        if (mddev->gendisk)
-               trace_block_bio_remap(bdev_get_queue(rdev->bdev),
-                       discard_bio, disk_devt(mddev->gendisk),
-                       bio->bi_iter.bi_sector);
+               trace_block_bio_remap(discard_bio, disk_devt(mddev->gendisk),
+                                     bio->bi_iter.bi_sector);
        submit_bio_noacct(discard_bio);
 }
 EXPORT_SYMBOL(md_submit_discard_bio);

diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index 6f44177..e5d7411 100644 (file)
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -571,8 +571,8 @@ static bool raid0_make_request(struct mddev *mddev, struct bio *bio)
                tmp_dev->data_offset;
 
        if (mddev->gendisk)
-               trace_block_bio_remap(bio->bi_disk->queue, bio,
-                               disk_devt(mddev->gendisk), bio_sector);
+               trace_block_bio_remap(bio, disk_devt(mddev->gendisk),
+                                     bio_sector);
        mddev_check_writesame(mddev, bio);
        mddev_check_write_zeroes(mddev, bio);
        submit_bio_noacct(bio);

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 960d854..c034799 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1305,8 +1305,8 @@ static void raid1_read_request(struct mddev *mddev, struct bio *bio,
        read_bio->bi_private = r1_bio;
 
        if (mddev->gendisk)
-               trace_block_bio_remap(read_bio->bi_disk->queue, read_bio,
-                               disk_devt(mddev->gendisk), r1_bio->sector);
+               trace_block_bio_remap(read_bio, disk_devt(mddev->gendisk),
+                                     r1_bio->sector);
 
        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);
 
                if (mddev->gendisk)
-                       trace_block_bio_remap(mbio->bi_disk->queue,
-                                             mbio, disk_devt(mddev->gendisk),
+                       trace_block_bio_remap(mbio, disk_devt(mddev->gendisk),
                                              r1_bio->sector);
                /* flush_pending_writes() needs access to the rdev so...*/
                mbio->bi_disk = (void *)conf->mirrors[i].rdev;

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index b7bca67..a6f99fa 100644 (file)
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1200,8 +1200,7 @@ static void raid10_read_request(struct mddev *mddev, struct bio *bio,
        read_bio->bi_private = r10_bio;
 
        if (mddev->gendisk)
-               trace_block_bio_remap(read_bio->bi_disk->queue,
-                                     read_bio, disk_devt(mddev->gendisk),
+               trace_block_bio_remap(read_bio, disk_devt(mddev->gendisk),
                                      r10_bio->sector);
        submit_bio_noacct(read_bio);
        return;
@@ -1250,8 +1249,7 @@ static void raid10_write_one_disk(struct mddev *mddev, struct r10bio *r10_bio,
        mbio->bi_private = r10_bio;
 
        if (conf->mddev->gendisk)
-               trace_block_bio_remap(mbio->bi_disk->queue,
-                                     mbio, disk_devt(conf->mddev->gendisk),
+               trace_block_bio_remap(mbio, disk_devt(conf->mddev->gendisk),
                                      r10_bio->sector);
        /* flush_pending_writes() needs access to the rdev so...*/
        mbio->bi_disk = (void *)rdev;

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

diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
index 74896be..106cf5c 100644 (file)
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -312,8 +312,7 @@ blk_qc_t nvme_ns_head_submit_bio(struct bio *bio)
        if (likely(ns)) {
                bio->bi_disk = ns->disk;
                bio->bi_opf |= REQ_NVME_MPATH;
-               trace_block_bio_remap(bio->bi_disk->queue, bio,
-                                     disk_devt(ns->head->disk),
+               trace_block_bio_remap(bio, disk_devt(ns->head->disk),
                                      bio->bi_iter.bi_sector);
                ret = submit_bio_noacct(bio);
        } else if (nvme_available_path(head)) {

diff --git a/include/trace/events/block.h b/include/trace/events/block.h
index b415e4c..8fb8957 100644 (file)
--- a/include/trace/events/block.h
+++ b/include/trace/events/block.h
@@ -450,9 +450,8 @@ TRACE_EVENT(block_split,
 
 /**
  * block_bio_remap - map request for a logical device to the raw device
- * @q: queue holding the operation
  * @bio: revised operation
- * @dev: device for the operation
+ * @dev: original device for the operation
  * @from: original sector for the operation
  *
  * An operation for a logical device has been mapped to the
@@ -460,10 +459,9 @@ TRACE_EVENT(block_split,
  */
 TRACE_EVENT(block_bio_remap,
 
-       TP_PROTO(struct request_queue *q, struct bio *bio, dev_t dev,
-                sector_t from),
+       TP_PROTO(struct bio *bio, dev_t dev, sector_t from),
 
-       TP_ARGS(q, bio, dev, from),
+       TP_ARGS(bio, dev, from),
 
        TP_STRUCT__entry(
                __field( dev_t,         dev             )

diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 3ca6d62..4056371 100644 (file)
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -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
  * @ignore:    trace callback data parameter (not used)
- * @q:         queue the io is for
  * @bio:       the source bio
- * @dev:       target device
+ * @dev:       source device
  * @from:      source sector
  *
- * Description:
- *     Device mapper or raid target sometimes need to split a bio because
- *     it spans a stripe (or similar). Add a trace for that action.
- *
+ * Called after a bio is remapped to a different device and/or sector.
  **/
-static void blk_add_trace_bio_remap(void *ignore,
-                                   struct request_queue *q, struct bio *bio,
-                                   dev_t dev, sector_t from)
+static void blk_add_trace_bio_remap(void *ignore, struct bio *bio, dev_t dev,
+                                   sector_t from)
 {
+       struct request_queue *q = bio->bi_disk->queue;
        struct blk_trace *bt;
        struct blk_io_trace_remap r;