md: add a mddev_trace_remap helper

Add a helper to trace bio remapping that hides some argument
dereferences and the check for a DM-mapped MD device.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed--by: Song Liu <song@kernel.org>
Tested-by: Song Liu <song@kernel.org>
Signed-off-by: Song Liu <song@kernel.org>
Link: https://lore.kernel.org/r/20240303140150.5435-2-hch@lst.de

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 64d544f..a52642e 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -65,7 +65,6 @@
 #include <linux/percpu-refcount.h>
 #include <linux/part_stat.h>
 
-#include <trace/events/block.h>
 #include "md.h"
 #include "md-bitmap.h"
 #include "md-cluster.h"
@@ -8686,10 +8685,7 @@ 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(discard_bio,
-                               disk_devt(mddev->gendisk),
-                               bio->bi_iter.bi_sector);
+       mddev_trace_remap(mddev, discard_bio, bio->bi_iter.bi_sector);
        submit_bio_noacct(discard_bio);
 }
 EXPORT_SYMBOL_GPL(md_submit_discard_bio);

diff --git a/drivers/md/md.h b/drivers/md/md.h
index 556db28..928086b 100644 (file)
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -18,6 +18,7 @@
 #include <linux/timer.h>
 #include <linux/wait.h>
 #include <linux/workqueue.h>
+#include <trace/events/block.h>
 #include "md-cluster.h"
 
 #define MaxSector (~(sector_t)0)
@@ -910,4 +911,11 @@ int do_md_run(struct mddev *mddev);
 
 extern const struct block_device_operations md_fops;
 
+static inline void mddev_trace_remap(struct mddev *mddev, struct bio *bio,
+               sector_t sector)
+{
+       if (mddev->gendisk)
+               trace_block_bio_remap(bio, disk_devt(mddev->gendisk), sector);
+}
+
 #endif /* _MD_MD_H */

diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index c50a7ab..aff094d 100644 (file)
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -578,10 +578,7 @@ static void raid0_map_submit_bio(struct mddev *mddev, struct bio *bio)
        bio_set_dev(bio, tmp_dev->bdev);
        bio->bi_iter.bi_sector = sector + zone->dev_start +
                tmp_dev->data_offset;
-
-       if (mddev->gendisk)
-               trace_block_bio_remap(bio, disk_devt(mddev->gendisk),
-                                     bio_sector);
+       mddev_trace_remap(mddev, bio, bio_sector);
        mddev_check_write_zeroes(mddev, bio);
        submit_bio_noacct(bio);
 }

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index afca975..4211544 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1418,11 +1418,7 @@ static void raid1_read_request(struct mddev *mddev, struct bio *bio,
            test_bit(R1BIO_FailFast, &r1_bio->state))
                read_bio->bi_opf |= MD_FAILFAST;
        read_bio->bi_private = r1_bio;
-
-       if (mddev->gendisk)
-               trace_block_bio_remap(read_bio, disk_devt(mddev->gendisk),
-                                     r1_bio->sector);
-
+       mddev_trace_remap(mddev, read_bio, r1_bio->sector);
        submit_bio_noacct(read_bio);
 }
 
@@ -1655,10 +1651,7 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,
                mbio->bi_private = r1_bio;
 
                atomic_inc(&r1_bio->remaining);
-
-               if (mddev->gendisk)
-                       trace_block_bio_remap(mbio, disk_devt(mddev->gendisk),
-                                             r1_bio->sector);
+               mddev_trace_remap(mddev, mbio, r1_bio->sector);
                /* flush_pending_writes() needs access to the rdev so...*/
                mbio->bi_bdev = (void *)rdev;
                if (!raid1_add_bio_to_plug(mddev, mbio, raid1_unplug, disks)) {

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 8aecdb1..9335a16 100644 (file)
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1235,10 +1235,7 @@ static void raid10_read_request(struct mddev *mddev, struct bio *bio,
            test_bit(R10BIO_FailFast, &r10_bio->state))
                read_bio->bi_opf |= MD_FAILFAST;
        read_bio->bi_private = r10_bio;
-
-       if (mddev->gendisk)
-               trace_block_bio_remap(read_bio, disk_devt(mddev->gendisk),
-                                     r10_bio->sector);
+       mddev_trace_remap(mddev, read_bio, r10_bio->sector);
        submit_bio_noacct(read_bio);
        return;
 }
@@ -1274,10 +1271,7 @@ static void raid10_write_one_disk(struct mddev *mddev, struct r10bio *r10_bio,
                         && enough(conf, devnum))
                mbio->bi_opf |= MD_FAILFAST;
        mbio->bi_private = r10_bio;
-
-       if (conf->mddev->gendisk)
-               trace_block_bio_remap(mbio, disk_devt(conf->mddev->gendisk),
-                                     r10_bio->sector);
+       mddev_trace_remap(mddev, mbio, r10_bio->sector);
        /* flush_pending_writes() needs access to the rdev so...*/
        mbio->bi_bdev = (void *)rdev;
 

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 58f8395..f0bc96f 100644 (file)
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -1295,10 +1295,7 @@ again:
                        if (rrdev)
                                set_bit(R5_DOUBLE_LOCKED, &sh->dev[i].flags);
 
-                       if (conf->mddev->gendisk)
-                               trace_block_bio_remap(bi,
-                                               disk_devt(conf->mddev->gendisk),
-                                               sh->dev[i].sector);
+                       mddev_trace_remap(conf->mddev, bi, sh->dev[i].sector);
                        if (should_defer && op_is_write(op))
                                bio_list_add(&pending_bios, bi);
                        else
@@ -1342,10 +1339,7 @@ again:
                         */
                        if (op == REQ_OP_DISCARD)
                                rbi->bi_vcnt = 0;
-                       if (conf->mddev->gendisk)
-                               trace_block_bio_remap(rbi,
-                                               disk_devt(conf->mddev->gendisk),
-                                               sh->dev[i].sector);
+                       mddev_trace_remap(conf->mddev, rbi, sh->dev[i].sector);
                        if (should_defer && op_is_write(op))
                                bio_list_add(&pending_bios, rbi);
                        else
@@ -5523,9 +5517,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_bio, disk_devt(mddev->gendisk),
-                                     raid_bio->bi_iter.bi_sector);
+       mddev_trace_remap(mddev, align_bio, raid_bio->bi_iter.bi_sector);
        submit_bio_noacct(align_bio);
        return 1;
 }