Skip to content

Commit 666eed4

Browse files
author
Mike Snitzer
committed
dm: fix __send_duplicate_bios() to always allow for splitting IO
Commit 7dd76d1 ("dm: improve bio splitting and associated IO accounting") only called setup_split_accounting() from __send_duplicate_bios() if a single bio were being issued. But the case where duplicate bios are issued must call it too. Otherwise the bio won't be split and resubmitted (via recursion through block core back to DM) to submit the later portions of a bio (which may map to an entirely different target). For example, when discarding an entire DM striped device with the following DM table: vg-lvol0: 0 159744 striped 2 128 7:0 2048 7:1 2048 vg-lvol0: 159744 45056 striped 2 128 7:2 2048 7:3 2048 Before (broken, discards the first striped target's devices twice): device-mapper: striped: target_stripe=0, bdev=7:0, start=2048 len=79872 device-mapper: striped: target_stripe=1, bdev=7:1, start=2048 len=79872 device-mapper: striped: target_stripe=0, bdev=7:0, start=2049 len=22528 device-mapper: striped: target_stripe=1, bdev=7:1, start=2048 len=22528 After (works as expected): device-mapper: striped: target_stripe=0, bdev=7:0, start=2048 len=79872 device-mapper: striped: target_stripe=1, bdev=7:1, start=2048 len=79872 device-mapper: striped: target_stripe=0, bdev=7:2, start=2048 len=22528 device-mapper: striped: target_stripe=1, bdev=7:3, start=2048 len=22528 Fixes: 7dd76d1 ("dm: improve bio splitting and associated IO accounting") Cc: [email protected] Reported-by: Orange Kao <[email protected]> Signed-off-by: Mike Snitzer <[email protected]>
1 parent f7b58a6 commit 666eed4

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/md/dm.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1514,6 +1514,8 @@ static int __send_duplicate_bios(struct clone_info *ci, struct dm_target *ti,
15141514
ret = 1;
15151515
break;
15161516
default:
1517+
if (len)
1518+
setup_split_accounting(ci, *len);
15171519
/* dm_accept_partial_bio() is not supported with shared tio->len_ptr */
15181520
alloc_multiple_bios(&blist, ci, ti, num_bios, len);
15191521
while ((clone = bio_list_pop(&blist))) {

0 commit comments

Comments
 (0)