Skip to contentSkip to conversation

md: factor out cloned bio cleanup into md_free_bio()

PATCH In review Abd-Alrhman Masalkhi 3 participants 5 messages Apr 14 – Apr 20 MD RAID

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 md: factor out cloned bio cleanup into md_free_bio()

Refactor duplicated cloned bio completion and cleanup logic into a new helper, md_free_bio().

md_end_clone_io() and md_free_cloned_bio() previously shared nearly identical teardown code, differing only in whether the original bio’s endio callback was invoked. Introduce a boolean parameter orig_endio to control this behavior and consolidate the logic.

---
 drivers/md/md.c | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)
drivers/md/md.c +9 -17
index ac71640ff3a8..707d605fee61 100644
@@ -9208,7 +9208,7 @@ static void md_bitmap_end(struct mddev *mddev, struct md_io_clone *md_io_clone)
 	fn(mddev, md_io_clone->offset, md_io_clone->sectors);
 }
 
-static void md_end_clone_io(struct bio *bio)
+static void md_free_bio(struct bio *bio, bool orig_endio)
 {
 	struct md_io_clone *md_io_clone = bio->bi_private;
 	struct bio *orig_bio = md_io_clone->orig_bio;
@@ -9224,10 +9224,16 @@ static void md_end_clone_io(struct bio *bio)
 		bio_end_io_acct(orig_bio, md_io_clone->start_time);
 
 	bio_put(bio);
-	bio_endio(orig_bio);
+	if (orig_endio)
+		bio_endio(orig_bio);
 	percpu_ref_put(&mddev->active_io);
 }
 
+static void md_end_clone_io(struct bio *bio)
+{
+	md_free_bio(bio, true);
+}
+
 static void md_clone_bio(struct mddev *mddev, struct bio **bio)
 {
 	struct block_device *bdev = (*bio)->bi_bdev;
@@ -9262,21 +9268,7 @@ EXPORT_SYMBOL_GPL(md_account_bio);
 
 void md_free_cloned_bio(struct bio *bio)
 {
-	struct md_io_clone *md_io_clone = bio->bi_private;
-	struct bio *orig_bio = md_io_clone->orig_bio;
-	struct mddev *mddev = md_io_clone->mddev;
-
-	if (bio_data_dir(orig_bio) == WRITE && md_bitmap_enabled(mddev, false))
-		md_bitmap_end(mddev, md_io_clone);
-
-	if (bio->bi_status && !orig_bio->bi_status)
-		orig_bio->bi_status = bio->bi_status;
-
-	if (md_io_clone->start_time)
-		bio_end_io_acct(orig_bio, md_io_clone->start_time);
-
-	bio_put(bio);
-	percpu_ref_put(&mddev->active_io);
+	md_free_bio(bio, false);
 }
 EXPORT_SYMBOL_GPL(md_free_cloned_bio);
 
Signature · 1 line
2.43.0
#1 lore raw
Quoted 57 lines · Abd-Alrhman Masalkhi

Refactor duplicated cloned bio completion and cleanup logic into a new helper, md_free_bio().

md_end_clone_io() and md_free_cloned_bio() previously shared nearly identical teardown code, differing only in whether the original bio’s endio callback was invoked. Introduce a boolean parameter orig_endio to control this behavior and consolidate the logic.

---
  drivers/md/md.c | 26 +++++++++-----------------
  1 file changed, 9 insertions(+), 17 deletions(-)
drivers/md/md.c +8 -11
index ac71640ff3a8..707d605fee61 100644
@@ -9208,7 +9208,7 @@ static void md_bitmap_end(struct mddev *mddev, struct md_io_clone *md_io_clone)
  	fn(mddev, md_io_clone->offset, md_io_clone->sectors);
  }
 
-static void md_end_clone_io(struct bio *bio)
+static void md_free_bio(struct bio *bio, bool orig_endio)
  {
  	struct md_io_clone *md_io_clone = bio->bi_private;
  	struct bio *orig_bio = md_io_clone->orig_bio;
@@ -9224,10 +9224,16 @@ static void md_end_clone_io(struct bio *bio)
  		bio_end_io_acct(orig_bio, md_io_clone->start_time);
 
  	bio_put(bio);
-	bio_endio(orig_bio);
+	if (orig_endio)
+		bio_endio(orig_bio);
  	percpu_ref_put(&mddev->active_io);
  }
 
+static void md_end_clone_io(struct bio *bio)
+{
+	md_free_bio(bio, true);
+}
+
  static void md_clone_bio(struct mddev *mddev, struct bio **bio)
  {
  	struct block_device *bdev = (*bio)->bi_bdev;
@@ -9262,21 +9268,7 @@ EXPORT_SYMBOL_GPL(md_account_bio);
 
  void md_free_cloned_bio(struct bio *bio)
  {
-	struct md_io_clone *md_io_clone = bio->bi_private;
-	struct bio *orig_bio = md_io_clone->orig_bio;
-	struct mddev *mddev = md_io_clone->mddev;
-
-	if (bio_data_dir(orig_bio) == WRITE && md_bitmap_enabled(mddev, false))
-		md_bitmap_end(mddev, md_io_clone);
-
-	if (bio->bi_status && !orig_bio->bi_status)
-		orig_bio->bi_status = bio->bi_status;

drivers/md/md.c EXPORT_SYMBOL_GPL(md_account_bio); · line 9274

Quoted 10 lines
drivers/md/md.c +1 -6
-
-	if (md_io_clone->start_time)
-		bio_end_io_acct(orig_bio, md_io_clone->start_time);
-
-	bio_put(bio);
-	percpu_ref_put(&mddev->active_io);
+	md_free_bio(bio, false);
  }
  EXPORT_SYMBOL_GPL(md_free_cloned_bio);
 

md_free_bio() is redundant. Can md_end_clone_io() directly call md_free_cloned_bio()?

We do not need to consider the compatibility of the EXPORT_SYMBOL in mainline.

Signature · 2 lines
Thanks,
Nan
#2 lore raw
Quoted 72 lines · Li Nan
Quoted 57 lines · Abd-Alrhman Masalkhi

Refactor duplicated cloned bio completion and cleanup logic into a new helper, md_free_bio().

md_end_clone_io() and md_free_cloned_bio() previously shared nearly identical teardown code, differing only in whether the original bio’s endio callback was invoked. Introduce a boolean parameter orig_endio to control this behavior and consolidate the logic.

---
  drivers/md/md.c | 26 +++++++++-----------------
  1 file changed, 9 insertions(+), 17 deletions(-)
drivers/md/md.c +8 -11
index ac71640ff3a8..707d605fee61 100644
@@ -9208,7 +9208,7 @@ static void md_bitmap_end(struct mddev *mddev, struct md_io_clone *md_io_clone)
  	fn(mddev, md_io_clone->offset, md_io_clone->sectors);
  }
 
-static void md_end_clone_io(struct bio *bio)
+static void md_free_bio(struct bio *bio, bool orig_endio)
  {
  	struct md_io_clone *md_io_clone = bio->bi_private;
  	struct bio *orig_bio = md_io_clone->orig_bio;
@@ -9224,10 +9224,16 @@ static void md_end_clone_io(struct bio *bio)
  		bio_end_io_acct(orig_bio, md_io_clone->start_time);
 
  	bio_put(bio);
-	bio_endio(orig_bio);
+	if (orig_endio)
+		bio_endio(orig_bio);
  	percpu_ref_put(&mddev->active_io);
  }
 
+static void md_end_clone_io(struct bio *bio)
+{
+	md_free_bio(bio, true);
+}
+
  static void md_clone_bio(struct mddev *mddev, struct bio **bio)
  {
  	struct block_device *bdev = (*bio)->bi_bdev;
@@ -9262,21 +9268,7 @@ EXPORT_SYMBOL_GPL(md_account_bio);
 
  void md_free_cloned_bio(struct bio *bio)
  {
-	struct md_io_clone *md_io_clone = bio->bi_private;
-	struct bio *orig_bio = md_io_clone->orig_bio;
-	struct mddev *mddev = md_io_clone->mddev;
-
-	if (bio_data_dir(orig_bio) == WRITE && md_bitmap_enabled(mddev, false))
-		md_bitmap_end(mddev, md_io_clone);
-
-	if (bio->bi_status && !orig_bio->bi_status)
-		orig_bio->bi_status = bio->bi_status;

drivers/md/md.c EXPORT_SYMBOL_GPL(md_account_bio); · line 9274

Quoted 10 lines
drivers/md/md.c +1 -6
-
-	if (md_io_clone->start_time)
-		bio_end_io_acct(orig_bio, md_io_clone->start_time);
-
-	bio_put(bio);
-	percpu_ref_put(&mddev->active_io);
+	md_free_bio(bio, false);
  }
  EXPORT_SYMBOL_GPL(md_free_cloned_bio);
 

md_free_bio() is redundant. Can md_end_clone_io() directly call md_free_cloned_bio()?

Quoted 3 lines

We do not need to consider the compatibility of the EXPORT_SYMBOL in mainline.

Thanks for the feedback!

You're right, this can be simplified. I'll send a v2 shortly.

Quoted 4 lines
Signature · 2 lines
Thanks,
Nan
Signature · 2 lines
Best Regards,
Abd-Alrhman
#3 lore raw
In reply to Abd-Alrhman Masalkhi

Hi,

Quoted 56 lines · Abd-Alrhman Masalkhi

Refactor duplicated cloned bio completion and cleanup logic into a new helper, md_free_bio().

md_end_clone_io() and md_free_cloned_bio() previously shared nearly identical teardown code, differing only in whether the original bio’s endio callback was invoked. Introduce a boolean parameter orig_endio to control this behavior and consolidate the logic.

---
  drivers/md/md.c | 26 +++++++++-----------------
  1 file changed, 9 insertions(+), 17 deletions(-)
drivers/md/md.c +8 -10
index ac71640ff3a8..707d605fee61 100644
@@ -9208,7 +9208,7 @@ static void md_bitmap_end(struct mddev *mddev, struct md_io_clone *md_io_clone)
  	fn(mddev, md_io_clone->offset, md_io_clone->sectors);
  }
 
-static void md_end_clone_io(struct bio *bio)
+static void md_free_bio(struct bio *bio, bool orig_endio)
  {
  	struct md_io_clone *md_io_clone = bio->bi_private;
  	struct bio *orig_bio = md_io_clone->orig_bio;
@@ -9224,10 +9224,16 @@ static void md_end_clone_io(struct bio *bio)
  		bio_end_io_acct(orig_bio, md_io_clone->start_time);
 
  	bio_put(bio);
-	bio_endio(orig_bio);
+	if (orig_endio)
+		bio_endio(orig_bio);
  	percpu_ref_put(&mddev->active_io);
  }
 
+static void md_end_clone_io(struct bio *bio)
+{
+	md_free_bio(bio, true);
+}
+
  static void md_clone_bio(struct mddev *mddev, struct bio **bio)
  {
  	struct block_device *bdev = (*bio)->bi_bdev;
@@ -9262,21 +9268,7 @@ EXPORT_SYMBOL_GPL(md_account_bio);
 
  void md_free_cloned_bio(struct bio *bio)
  {
-	struct md_io_clone *md_io_clone = bio->bi_private;
-	struct bio *orig_bio = md_io_clone->orig_bio;
-	struct mddev *mddev = md_io_clone->mddev;
-
-	if (bio_data_dir(orig_bio) == WRITE && md_bitmap_enabled(mddev, false))
-		md_bitmap_end(mddev, md_io_clone);
-
-	if (bio->bi_status && !orig_bio->bi_status)

drivers/md/md.c EXPORT_SYMBOL_GPL(md_account_bio); · line 9273

Quoted 10 lines
drivers/md/md.c +1 -7
-		orig_bio->bi_status = bio->bi_status;
-
-	if (md_io_clone->start_time)
-		bio_end_io_acct(orig_bio, md_io_clone->start_time);
-
-	bio_put(bio);
-	percpu_ref_put(&mddev->active_io);
+	md_free_bio(bio, false);
  }
  EXPORT_SYMBOL_GPL(md_free_cloned_bio);

This patch is no longer needed after following patch:
https://lore.kernel.org/r/[email protected]

Quoted 1 line
Signature · 2 lines
Thansk,
Kuai
#4 lore raw
Quoted 64 lines · Yu Kuai

Hi,

Quoted 61 lines · Abd-Alrhman Masalkhi

Refactor duplicated cloned bio completion and cleanup logic into a new helper, md_free_bio().

md_end_clone_io() and md_free_cloned_bio() previously shared nearly identical teardown code, differing only in whether the original bio’s endio callback was invoked. Introduce a boolean parameter orig_endio to control this behavior and consolidate the logic.

---
  drivers/md/md.c | 26 +++++++++-----------------
  1 file changed, 9 insertions(+), 17 deletions(-)
drivers/md/md.c +8 -15
index ac71640ff3a8..707d605fee61 100644
@@ -9208,7 +9208,7 @@ static void md_bitmap_end(struct mddev *mddev, struct md_io_clone *md_io_clone)
  	fn(mddev, md_io_clone->offset, md_io_clone->sectors);
  }
 
-static void md_end_clone_io(struct bio *bio)
+static void md_free_bio(struct bio *bio, bool orig_endio)
  {
  	struct md_io_clone *md_io_clone = bio->bi_private;
  	struct bio *orig_bio = md_io_clone->orig_bio;
@@ -9224,10 +9224,16 @@ static void md_end_clone_io(struct bio *bio)
  		bio_end_io_acct(orig_bio, md_io_clone->start_time);
 
  	bio_put(bio);
-	bio_endio(orig_bio);
+	if (orig_endio)
+		bio_endio(orig_bio);
  	percpu_ref_put(&mddev->active_io);
  }
 
+static void md_end_clone_io(struct bio *bio)
+{
+	md_free_bio(bio, true);
+}
+
  static void md_clone_bio(struct mddev *mddev, struct bio **bio)
  {
  	struct block_device *bdev = (*bio)->bi_bdev;
@@ -9262,21 +9268,7 @@ EXPORT_SYMBOL_GPL(md_account_bio);
 
  void md_free_cloned_bio(struct bio *bio)
  {
-	struct md_io_clone *md_io_clone = bio->bi_private;
-	struct bio *orig_bio = md_io_clone->orig_bio;
-	struct mddev *mddev = md_io_clone->mddev;
-
-	if (bio_data_dir(orig_bio) == WRITE && md_bitmap_enabled(mddev, false))
-		md_bitmap_end(mddev, md_io_clone);
-
-	if (bio->bi_status && !orig_bio->bi_status)
-		orig_bio->bi_status = bio->bi_status;
-
-	if (md_io_clone->start_time)
-		bio_end_io_acct(orig_bio, md_io_clone->start_time);
-
Quoted 8 lines

drivers/md/md.c EXPORT_SYMBOL_GPL(md_account_bio); · line 9273

Quoted 5 lines
drivers/md/md.c +1 -2
-	bio_put(bio);
-	percpu_ref_put(&mddev->active_io);
+	md_free_bio(bio, false);
  }
  EXPORT_SYMBOL_GPL(md_free_cloned_bio);

This patch is no longer needed after following patch:
https://lore.kernel.org/r/[email protected]

Thanks, I'll drop this patch.

Quoted 6 lines
Quoted 2 lines
Signature · 2 lines
Thansk,
Kuai
Signature · 2 lines
Best Regards,
Abd-Alrhman