Skip to content

Commit d10bf66

Browse files
damien-lemoalgregkh
authored andcommitted
dm: Always split write BIOs to zoned device limits
commit 2df7168 upstream. Any zoned DM target that requires zone append emulation will use the block layer zone write plugging. In such case, DM target drivers must not split BIOs using dm_accept_partial_bio() as doing so can potentially lead to deadlocks with queue freeze operations. Regular write operations used to emulate zone append operations also cannot be split by the target driver as that would result in an invalid writen sector value return using the BIO sector. In order for zoned DM target drivers to avoid such incorrect BIO splitting, we must ensure that large BIOs are split before being passed to the map() function of the target, thus guaranteeing that the limits for the mapped device are not exceeded. dm-crypt and dm-flakey are the only target drivers supporting zoned devices and using dm_accept_partial_bio(). In the case of dm-crypt, this function is used to split BIOs to the internal max_write_size limit (which will be suppressed in a different patch). However, since crypt_alloc_buffer() uses a bioset allowing only up to BIO_MAX_VECS (256) vectors in a BIO. The dm-crypt device max_segments limit, which is not set and so default to BLK_MAX_SEGMENTS (128), must thus be respected and write BIOs split accordingly. In the case of dm-flakey, since zone append emulation is not required, the block layer zone write plugging is not used and no splitting of BIOs required. Modify the function dm_zone_bio_needs_split() to use the block layer helper function bio_needs_zone_write_plugging() to force a call to bio_split_to_limits() in dm_split_and_process_bio(). This allows DM target drivers to avoid using dm_accept_partial_bio() for write operations on zoned DM devices. Fixes: f211268 ("dm: Use the block layer zone append emulation") Cc: stable@vger.kernel.org Signed-off-by: Damien Le Moal <dlemoal@kernel.org> Reviewed-by: Mikulas Patocka <mpatocka@redhat.com> Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Link: https://lore.kernel.org/r/20250625093327.548866-4-dlemoal@kernel.org Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 8263f32 commit d10bf66

File tree

1 file changed

+22
-7
lines changed

1 file changed

+22
-7
lines changed

drivers/md/dm.c

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1792,12 +1792,29 @@ static inline bool dm_zone_bio_needs_split(struct mapped_device *md,
17921792
struct bio *bio)
17931793
{
17941794
/*
1795-
* For mapped device that need zone append emulation, we must
1796-
* split any large BIO that straddles zone boundaries.
1795+
* Special case the zone operations that cannot or should not be split.
17971796
*/
1798-
return dm_emulate_zone_append(md) && bio_straddles_zones(bio) &&
1799-
!bio_flagged(bio, BIO_ZONE_WRITE_PLUGGING);
1797+
switch (bio_op(bio)) {
1798+
case REQ_OP_ZONE_APPEND:
1799+
case REQ_OP_ZONE_FINISH:
1800+
case REQ_OP_ZONE_RESET:
1801+
case REQ_OP_ZONE_RESET_ALL:
1802+
return false;
1803+
default:
1804+
break;
1805+
}
1806+
1807+
/*
1808+
* Mapped devices that require zone append emulation will use the block
1809+
* layer zone write plugging. In such case, we must split any large BIO
1810+
* to the mapped device limits to avoid potential deadlocks with queue
1811+
* freeze operations.
1812+
*/
1813+
if (!dm_emulate_zone_append(md))
1814+
return false;
1815+
return bio_needs_zone_write_plugging(bio) || bio_straddles_zones(bio);
18001816
}
1817+
18011818
static inline bool dm_zone_plug_bio(struct mapped_device *md, struct bio *bio)
18021819
{
18031820
if (!bio_needs_zone_write_plugging(bio))
@@ -1946,9 +1963,7 @@ static void dm_split_and_process_bio(struct mapped_device *md,
19461963

19471964
is_abnormal = is_abnormal_io(bio);
19481965
if (static_branch_unlikely(&zoned_enabled)) {
1949-
/* Special case REQ_OP_ZONE_RESET_ALL as it cannot be split. */
1950-
need_split = (bio_op(bio) != REQ_OP_ZONE_RESET_ALL) &&
1951-
(is_abnormal || dm_zone_bio_needs_split(md, bio));
1966+
need_split = is_abnormal || dm_zone_bio_needs_split(md, bio);
19521967
} else {
19531968
need_split = is_abnormal;
19541969
}

0 commit comments

Comments
 (0)