From: Song Liu Date: Wed, 9 Dec 2020 21:53:31 +0000 (-0800) Subject: Revert "dm raid: remove unnecessary discard limits for raid10" X-Git-Tag: v5.10.7~1008^2~1^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e2782f560c298efc2e23c7e54b3acf54e8a6ba72;p=platform%2Fkernel%2Flinux-rpi.git Revert "dm raid: remove unnecessary discard limits for raid10" This reverts commit f0e90b6c663a7e3b4736cb318c6c7c589f152c28. Matthew Ruffell reported data corruption in raid10 due to the changes in discard handling [1]. Revert these changes before we find a proper fix. [1] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1907262/ Cc: Matthew Ruffell Cc: Xiao Ni Cc: Mike Snitzer Acked-by: Mike Snitzer Signed-off-by: Song Liu --- diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c index 9c1f7c4..dc8568a 100644 --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c @@ -3728,6 +3728,17 @@ static void raid_io_hints(struct dm_target *ti, struct queue_limits *limits) blk_limits_io_min(limits, chunk_size_bytes); blk_limits_io_opt(limits, chunk_size_bytes * mddev_data_stripes(rs)); + + /* + * RAID10 personality requires bio splitting, + * RAID0/1/4/5/6 don't and process large discard bios properly. + */ + if (rs_is_raid10(rs)) { + limits->discard_granularity = max(chunk_size_bytes, + limits->discard_granularity); + limits->max_discard_sectors = min_not_zero(rs->md.chunk_sectors, + limits->max_discard_sectors); + } } static void raid_postsuspend(struct dm_target *ti)