Skip to content

Commit 7f9f7c6

Browse files
AIHCERhailan94
authored andcommitted
md/raid5: fix soft lockup in retry_aligned_read()
When retry_aligned_read() encounters an overlapped stripe, it releases the stripe via raid5_release_stripe() which puts it on the lockless released_stripes llist. In the next raid5d loop iteration, release_stripe_list() drains the stripe onto handle_list (since STRIPE_HANDLE is set by the original IO), but retry_aligned_read() runs before handle_active_stripes() and removes the stripe from handle_list via find_get_stripe() -> list_del_init(). This prevents handle_stripe() from ever processing the stripe to resolve the overlap, causing an infinite loop and soft lockup. Fix this by using __release_stripe() with temp_inactive_list instead of raid5_release_stripe() in the failure path, so the stripe does not go through the released_stripes llist. This allows raid5d to break out of its loop, and the overlap will be resolved when the stripe is eventually processed by handle_stripe(). Fixes: 773ca82 ("raid5: make release_stripe lockless") Cc: stable@vger.kernel.org Signed-off-by: FengWei Shih <dannyshih@synology.com> Signed-off-by: Chia-Ming Chang <chiamingc@synology.com> Link: https://lore.kernel.org/linux-raid/20260402061406.455755-1-chiamingc@synology.com/ Signed-off-by: Yu Kuai <yukuai@fnnas.com>
1 parent cf86bb5 commit 7f9f7c6

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

drivers/md/raid5.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6641,7 +6641,13 @@ static int retry_aligned_read(struct r5conf *conf, struct bio *raid_bio,
66416641
}
66426642

66436643
if (!add_stripe_bio(sh, raid_bio, dd_idx, 0, 0)) {
6644-
raid5_release_stripe(sh);
6644+
int hash;
6645+
6646+
spin_lock_irq(&conf->device_lock);
6647+
hash = sh->hash_lock_index;
6648+
__release_stripe(conf, sh,
6649+
&conf->temp_inactive_list[hash]);
6650+
spin_unlock_irq(&conf->device_lock);
66456651
conf->retry_read_aligned = raid_bio;
66466652
conf->retry_read_offset = scnt;
66476653
return handled;

0 commit comments

Comments
 (0)