Commit 226b4fc7 authored Jul 25, 2019 by Ming Lei Committed by Jens Axboe Aug 04, 2019

blk-mq: add callback of .cleanup_rq



SCSI maintains its own driver private data hooked off of each SCSI
request, and the pridate data won't be freed after scsi_queue_rq()
returns BLK_STS_RESOURCE or BLK_STS_DEV_RESOURCE. An upper layer driver
(e.g. dm-rq) may need to retry these SCSI requests, before SCSI has
fully dispatched them, due to a lower level SCSI driver's resource
limitation identified in scsi_queue_rq(). Currently SCSI's per-request
private data is leaked when the upper layer driver (dm-rq) frees and
then retries these requests in response to BLK_STS_RESOURCE or
BLK_STS_DEV_RESOURCE returns from scsi_queue_rq().

This usecase is so specialized that it doesn't warrant training an
existing blk-mq interface (e.g. blk_mq_free_request) to allow SCSI to
account for freeing its driver private data -- doing so would add an
extra branch for handling a special case that all other consumers of
SCSI (and blk-mq) won't ever need to worry about.

So the most pragmatic way forward is to delegate freeing SCSI driver
private data to the upper layer driver (dm-rq).  Do so by adding
new .cleanup_rq callback and calling a new blk_mq_cleanup_rq() method
from dm-rq.  A following commit will implement the .cleanup_rq() hook
in scsi_mq_ops.

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: 396eaf21 ("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>

parent a61dbfb1

drivers/md/dm-rq.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -408,6 +408,7 @@ static int map_request(struct dm_rq_target_io *tio)
		ret = dm_dispatch_clone_request(clone, rq);
		if (ret == BLK_STS_RESOURCE \|\| ret == BLK_STS_DEV_RESOURCE) {
		blk_rq_unprep_clone(clone);
		blk_mq_cleanup_rq(clone);
		tio->ti->type->release_clone_rq(clone, &tio->info);
		tio->clone = NULL;
		return DM_MAPIO_REQUEUE;

include/linux/blk-mq.h

+13 −0

Original line number	Diff line number	Diff line
		@@ -140,6 +140,7 @@ typedef int (poll_fn)(struct blk_mq_hw_ctx *);
		typedef int (map_queues_fn)(struct blk_mq_tag_set *set);
		typedef bool (busy_fn)(struct request_queue *);
		typedef void (complete_fn)(struct request *);
		typedef void (cleanup_rq_fn)(struct request *);


		struct blk_mq_ops {
		@@ -200,6 +201,12 @@ struct blk_mq_ops {
		/* Called from inside blk_get_request() */
		void (initialize_rq_fn)(struct request rq);

		/*
		* Called before freeing one request which isn't completed yet,
		* and usually for freeing the driver private data
		*/
		cleanup_rq_fn *cleanup_rq;

		/*
		* If set, returns whether or not this queue currently is busy
		*/
		@@ -367,4 +374,10 @@ static inline blk_qc_t request_to_qc_t(struct blk_mq_hw_ctx *hctx,
		BLK_QC_T_INTERNAL;
		}

		static inline void blk_mq_cleanup_rq(struct request *rq)
		{
		if (rq->q->mq_ops->cleanup_rq)
		rq->q->mq_ops->cleanup_rq(rq);
		}

		#endif

Admin message