Skip to content

block/scsi/dm-rq: fix leak of request private data in dm-mpath

Ming Lei dm-devel linux-block stable 4 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest2 patches 3 repliesIn review
  2. v32 patches 2 repliesSuperseded
  3. v22 patches 8 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v12 patches4 repliesSuperseded

Changes in v4 from the cover letter

- add more commit log on the new .cleanup_rq callback, as suggested by Mike

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2blk-mq: add callback of .cleanup_rqdrivers/md/dm-rq.c include/linux/blk-mq.h+14 -00 replies
2/2scsi: implement .cleanup_rq callbackdrivers/scsi/scsi_lib.c+13 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v4 yet.

Read the v4 thread

Cover letter [PATCH V4 0/2] block/scsi/dm-rq: fix leak of request private data in dm-mpath

Hi,

When one request is dispatched to LLD via dm-rq, if the result is BLK_STS_*RESOURCE, dm-rq will free the request. However, LLD may allocate private data for this request, so this way will cause memory leak.

Add .cleanup_rq() callback and implement it in SCSI for fixing the issue, since SCSI is the only driver which allocates private requst data in .queue_rq() path.

Another use case of this callback is to free the request and re-submit bios during cpu hotplug when the hctx is dead, see the following link:

https://lore.kernel.org/linux-block/[email protected]/T/#t

V4:
- add more commit log on the new .cleanup_rq callback, as suggested by Mike

V3:
- run .cleanup_rq() from dm-rq because this issue is dm-rq specific, and even in future it should be still very unusual to free request in this way. If we call .cleanup_rq() in generic rq free code(fast path), cost will be introduced unnecessarily, also we have to consider related race.

V2:
- run .cleanup_rq() in blk_mq_free_request(), as suggested by Mike

Ming Lei (2):
blk-mq: add callback of .cleanup_rq
scsi: implement .cleanup_rq callback

 drivers/md/dm-rq.c      |  1 +
 drivers/scsi/scsi_lib.c | 13 +++++++++++++
 include/linux/blk-mq.h  | 13 +++++++++++++
 3 files changed, 27 insertions(+)
Cc Ewan D. Milne <[email protected]>
Cc Bart Van Assche <[email protected]>
Cc Hannes Reinecke <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Mike Snitzer <[email protected]>
Fixes 396eaf21ee17 ("blk-mq: improve DM's blk-mq IO merging via blk_insert_cloned_request feedback")
Signature · 1 line
2.20.1