From: Yu Kuai <yukuai@fygo.io>
Date: Fri, 5 Jun 2026 07:26:39 +0000 (+0800)
Subject: md/raid5: always convert llbitmap bits for discard
X-Git-Tag: v7.2-rc1~31^2~10^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=53528031e7a6e16f0f05347f3826ffb4f957b7e4;p=thirdparty%2Flinux.git

md/raid5: always convert llbitmap bits for discard

llbitmap discard is useful even when no underlying member device supports
it. The discard still converts the llbitmap range to unwritten, so later
reads and recovery do not rely on stale parity for that range.

Let llbitmap discard bypass the raid5 lower discard support check. If lower
discard is not safe or not supported, complete the accounted clone after
md_account_bio() so the llbitmap conversion callbacks run without member
discard bios.

Link: https://patch.msgid.link/20260605072639.2434847-4-yukuai@kernel.org
Signed-off-by: Yu Kuai <yukuai@fygo.io>
---

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 76e736ee48d38..180ff0660b6ad 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -1138,6 +1138,9 @@ static bool raid5_discard_limits(struct mddev *mddev, struct bio *bi)
 {
 	struct r5conf *conf = mddev->private;
 
+	if (mddev->bitmap_id == ID_LLBITMAP)
+		return true;
+
 	if (!conf->raid5_discard_unsupported)
 		return true;
 
@@ -5740,6 +5743,12 @@ static void make_discard_request(struct mddev *mddev, struct bio *bi)
 	bi->bi_iter = bi_iter;
 	bi->bi_next = NULL;
 
+	if (mddev->bitmap_id == ID_LLBITMAP &&
+	    conf->raid5_discard_unsupported) {
+		bio_endio(bi);
+		return;
+	}
+
 	logical_sector = first_stripe * conf->chunk_sectors;
 	last_sector = last_stripe * conf->chunk_sectors;