FAILED: patch "[PATCH] scsi: implement .cleanup_rq callback" failed to apply to 5.3-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 5.3-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From b7e9e1fb7a9227be34ad4a5e778022c3164494cf Mon Sep 17 00:00:00 2001
From: Ming Lei <[email protected]>
Date: Thu, 25 Jul 2019 10:05:00 +0800
Subject: [PATCH] scsi: implement .cleanup_rq callback
Implement .cleanup_rq() callback for freeing driver private part of the request. Then we can avoid to leak this part if the request isn't completed by SCSI, and freed by blk-mq or upper layer(such as dm-rq) finally.
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]>
Cc <[email protected]>
Fixes 396eaf21ee17 ("blk-mq: improve DM's blk-mq IO merging via blk_insert_cloned_request feedback")
Signed-off-by Ming Lei <[email protected]>
Signed-off-by Jens Axboe <[email protected]>
drivers/scsi/scsi_lib.c +13 -0
@@ -1089,6 +1089,18 @@ static void scsi_initialize_rq(struct request *rq) cmd->retries =0 ; } +/* +* Only called when the request isn't completed by SCSI, and not freed by +* SCSI +*/ +static void scsi_cleanup_rq (struct request *rq) +{ +if (rq->rq_flags &RQF_DONTPREP ) { +scsi_mq_uninit_cmd (blk_mq_rq_to_pdu (rq)); + rq->rq_flags &= ~RQF_DONTPREP ; + } +} +/* Add a command to the list used by the aacraid and dpt_i2o drivers */ void scsi_add_cmd_to_list (struct scsi_cmnd *cmd) {
@@ -1821,6 +1833,7 @@ static const struct blk_mq_ops scsi_mq_ops = { .init_request = scsi_mq_init_request, .exit_request = scsi_mq_exit_request, .initialize_rq_fn = scsi_initialize_rq, + .cleanup_rq = scsi_cleanup_rq, .busy = scsi_mq_lld_busy, .map_queues = scsi_map_queues, };