Skip to content

Commit 2fd7b0f

Browse files
David Jefferyliu-song-6
authored andcommitted
md/raid5: release batch_last before waiting for another stripe_head
When raid5_get_active_stripe is called with a ctx containing a stripe_head in its batch_last pointer, it can cause a deadlock if the task sleeps waiting on another stripe_head to become available. The stripe_head held by batch_last can be blocking the advancement of other stripe_heads, leading to no stripe_heads being released so raid5_get_active_stripe waits forever. Like with the quiesce state handling earlier in the function, batch_last needs to be released by raid5_get_active_stripe before it waits for another stripe_head. Fixes: 3312e6c ("md/raid5: Keep a reference to last stripe_head for batch") Cc: [email protected] # v6.0+ Signed-off-by: David Jeffery <[email protected]> Reviewed-by: Logan Gunthorpe <[email protected]> Signed-off-by: Song Liu <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent a578a25 commit 2fd7b0f

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

drivers/md/raid5.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -854,6 +854,13 @@ struct stripe_head *raid5_get_active_stripe(struct r5conf *conf,
854854

855855
set_bit(R5_INACTIVE_BLOCKED, &conf->cache_state);
856856
r5l_wake_reclaim(conf->log, 0);
857+
858+
/* release batch_last before wait to avoid risk of deadlock */
859+
if (ctx && ctx->batch_last) {
860+
raid5_release_stripe(ctx->batch_last);
861+
ctx->batch_last = NULL;
862+
}
863+
857864
wait_event_lock_irq(conf->wait_for_stripe,
858865
is_inactive_blocked(conf, hash),
859866
*(conf->hash_locks + hash));

0 commit comments

Comments
 (0)