md: add md_submit_discard_bio() for submitting discard bio

BugLink: https://bugs.launchpad.net/bugs/1896578
Move these logic from raid0.c to md.c, so that we can also use it in
raid10.c.

Reviewed-by: Coly Li <colyli@suse.de>
Reviewed-by: Guoqing Jiang <guoqing.jiang@cloud.ionos.com>
Tested-by: Adrian Huang <ahuang12@lenovo.com>
Signed-off-by: Xiao Ni <xni@redhat.com>
Signed-off-by: Song Liu <songliubraving@fb.com>
(cherry picked from commit cf78408f937a67f59f5e90ee8e6cadeed7c128a8)
Signed-off-by: Matthew Ruffell <matthew.ruffell@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/drivers/md/md.c b/drivers/md/md.c
index b15a96708a6d24dc78d0063558c817d67b6da66d..ace264d22f6e2f0ef92e1003e6abba0d9b876c3b 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -8613,6 +8613,26 @@ void md_write_end(struct mddev *mddev)
 
 EXPORT_SYMBOL(md_write_end);
 
+/* This is used by raid0 and raid10 */
+void md_submit_discard_bio(struct mddev *mddev, struct md_rdev *rdev,
+                       struct bio *bio, sector_t start, sector_t size)
+{
+       struct bio *discard_bio = NULL;
+
+       if (__blkdev_issue_discard(rdev->bdev, start, size, GFP_NOIO, 0,
+                       &discard_bio) || !discard_bio)
+               return;
+
+       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);
+       submit_bio_noacct(discard_bio);
+}
+EXPORT_SYMBOL_GPL(md_submit_discard_bio);
+
 /* md_allow_write(mddev)
  * Calling this ensures that the array is marked 'active' so that writes
  * may proceed without blocking.  It is important to call this before

diff --git a/drivers/md/md.h b/drivers/md/md.h
index 34070ab30a8ae26855aac220fc6675183ffbd5df..af1f78c5eca09cae3cd36872459bc6ba3800f39c 100644 (file)
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -713,6 +713,8 @@ extern void md_write_end(struct mddev *mddev);
 extern void md_done_sync(struct mddev *mddev, int blocks, int ok);
 extern void md_error(struct mddev *mddev, struct md_rdev *rdev);
 extern void md_finish_reshape(struct mddev *mddev);
+void md_submit_discard_bio(struct mddev *mddev, struct md_rdev *rdev,
+                       struct bio *bio, sector_t start, sector_t size);
 
 extern bool __must_check md_flush_request(struct mddev *mddev, struct bio *bio);
 extern void md_super_write(struct mddev *mddev, struct md_rdev *rdev,

diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index fdada0bf221700b85a35e98c5b459c5c747bc00e..cbc3fbe7b54aa22966deb22df2d36a3886fb57e8 100644 (file)
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -478,7 +478,6 @@ static void raid0_handle_discard(struct mddev *mddev, struct bio *bio)
 
        for (disk = 0; disk < zone->nb_dev; disk++) {
                sector_t dev_start, dev_end;
-               struct bio *discard_bio = NULL;
                struct md_rdev *rdev;
 
                if (disk < start_disk_index)
@@ -501,18 +500,9 @@ static void raid0_handle_discard(struct mddev *mddev, struct bio *bio)
 
                rdev = conf->devlist[(zone - conf->strip_zone) *
                        conf->strip_zone[0].nb_dev + disk];
-               if (__blkdev_issue_discard(rdev->bdev,
+               md_submit_discard_bio(mddev, rdev, bio,
                        dev_start + zone->dev_start + rdev->data_offset,
-                       dev_end - dev_start, GFP_NOIO, 0, &discard_bio) ||
-                   !discard_bio)
-                       continue;
-               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);
-               submit_bio_noacct(discard_bio);
+                       dev_end - dev_start);
        }
        bio_endio(bio);
 }