Skip to content

blk-mq-sched: fix put_rq_private() lock inconsistency

Jens Axboe linux-block 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest2 patches 3 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2blk-merge: return the merged requestblock/blk-merge.c block/blk.h+18 -171 reply
2/2block: free merged request in the callerblock/blk-core.c block/blk-merge.c block/blk-mq-sched.c +2 more+35 -122 replies

Reviews trailers per patch

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

PatchOmar Sandoval
1/2R-b
2/2R-b

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

Read the v1 thread

Cover letter [PATCH 0/2] blk-mq-sched: fix put_rq_private() lock inconsistency

I tested the patch I sent to Paolo yesterday, and it seems to work fine. I broke it up into two pieces, so the functional change is restricted to patch #2.

Basically this fixes the case where we can invoke the blk-mq-sched put request functions in an inconsistent state. Most of the time we invoke them without any locks held, but for the case where we get a successful request-to-request merge on the back of a bio-to-request merge, we can invoke it with whatever lock the scheduler held when it called blk_mq_sched_try_merge().

Signature · 1 line
Jens Axboe