[0/2,v4] block: Fix deadlock when merging requests with BFQ

Message

Jan Kara June 23, 2021, 9:36 a.m. UTC

Hello,

This patch series fixes a lockdep complaint and a possible deadlock that
can happen when blk_mq_sched_try_insert_merge() merges and frees a request.
Jens, can you please merge the series? It seems to have slipped through last
time when I posted it. Thanks!

Changes since v3:
* Rebased on top of for-next branch in axboe/linux-block.git

Changes since v2:
* Added reviewed-by tags

Changes since v1:
* Remove patch disabling recursing request merging during request insertion
* Modified BFQ to cleanup merged request already in its .merge_requests handler
* Added code to handle multiple requests that need freeing after being merged

								Honza

Comments

Jens Axboe June 25, 2021, 12:44 a.m. UTC | #1

On 6/23/21 3:36 AM, Jan Kara wrote:
> Hello,
> 
> This patch series fixes a lockdep complaint and a possible deadlock that
> can happen when blk_mq_sched_try_insert_merge() merges and frees a request.
> Jens, can you please merge the series? It seems to have slipped through last
> time when I posted it. Thanks!

Applied, thanks.