lkml.org 
[lkml]   [2019]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 230/313] scsi: implement .cleanup_rq callback
    Date
    From: Ming Lei <ming.lei@redhat.com>

    [ Upstream commit b7e9e1fb7a9227be34ad4a5e778022c3164494cf ]

    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 <emilne@redhat.com>
    Cc: Bart Van Assche <bvanassche@acm.org>
    Cc: Hannes Reinecke <hare@suse.com>
    Cc: Christoph Hellwig <hch@lst.de>
    Cc: Mike Snitzer <snitzer@redhat.com>
    Cc: dm-devel@redhat.com
    Cc: <stable@vger.kernel.org>
    Fixes: 396eaf21ee17 ("blk-mq: improve DM's blk-mq IO merging via blk_insert_cloned_request feedback")
    Signed-off-by: Ming Lei <ming.lei@redhat.com>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/scsi_lib.c | 13 +++++++++++++
    1 file changed, 13 insertions(+)

    diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
    index 40f392569664b..506062081d8e2 100644
    --- a/drivers/scsi/scsi_lib.c
    +++ b/drivers/scsi/scsi_lib.c
    @@ -1073,6 +1073,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)
    {
    @@ -1800,6 +1812,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,
    };
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-10-03 18:34    [W:4.096 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site