Skip to content

block: Fix deadlock when merging requests with BFQ

Jan Kara linux-block 4 versions – Applied

Status from this message: Applied, thanks.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest2 patches 1 replyApplied
  2. v32 patches 0 repliesSuperseded
  3. v22 patches 3 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v12 patches10 repliesSuperseded

Changes in v4 from the cover letter

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

Patches in v4 Applied

#Subject and filesSizeRepliesApplied
1/2bfq: Remove merged request already in bfq_requests_merged()block/bfq-iosched.c+13 -280 replies
2/2blk: Fix lock inversion between ioc lock and bfqd lockblock/bfq-iosched.c block/blk-merge.c block/blk-mq-sched.c +6 more+43 -220 replies

Reviews trailers per patch

All 2 patches have a Reviewed-by or Acked-by.

PatchPaolo ValenteMing Lei
1/2A-b
2/2A-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v4 thread

Cover letter [PATCH 0/2 v4] block: Fix deadlock when merging requests with BFQ

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