Skip to content

Commit aa6df8d

Browse files
committed
dm: fix free_rq_clone() NULL pointer when requeueing unmapped request
Commit 0223334 ("dm: optimize dm_mq_queue_rq to _not_ use kthread if using pure blk-mq") mistakenly removed free_rq_clone()'s clone->q check before testing clone->q->mq_ops. It was an oversight to discontinue that check for 1 of the 2 use-cases for free_rq_clone(): 1) free_rq_clone() called when an unmapped original request is requeued 2) free_rq_clone() called in the request-based IO completion path The clone->q check made sense for case #1 but not for #2. However, we cannot just reinstate the check as it'd mask a serious bug in the IO completion case #2 -- no in-flight request should have an uninitialized request_queue (basic block layer refcounting _should_ ensure this). The NULL pointer seen for case #1 is detailed here: https://www.redhat.com/archives/dm-devel/2015-April/msg00160.html Fix this free_rq_clone() NULL pointer by simply checking if the mapped_device's type is DM_TYPE_MQ_REQUEST_BASED (clone's queue is blk-mq) rather than checking clone->q->mq_ops. This avoids the need to dereference clone->q, but a WARN_ON_ONCE is added to let us know if an uninitialized clone request is being completed. Reported-by: Bart Van Assche <[email protected]> Signed-off-by: Mike Snitzer <[email protected]>
1 parent 3e6180f commit aa6df8d

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

drivers/md/dm.c

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,18 +1082,26 @@ static void rq_completed(struct mapped_device *md, int rw, bool run_queue)
10821082
dm_put(md);
10831083
}
10841084

1085-
static void free_rq_clone(struct request *clone)
1085+
static void free_rq_clone(struct request *clone, bool must_be_mapped)
10861086
{
10871087
struct dm_rq_target_io *tio = clone->end_io_data;
10881088
struct mapped_device *md = tio->md;
10891089

1090+
WARN_ON_ONCE(must_be_mapped && !clone->q);
1091+
10901092
blk_rq_unprep_clone(clone);
10911093

1092-
if (clone->q->mq_ops)
1094+
if (md->type == DM_TYPE_MQ_REQUEST_BASED)
1095+
/* stacked on blk-mq queue(s) */
10931096
tio->ti->type->release_clone_rq(clone);
10941097
else if (!md->queue->mq_ops)
10951098
/* request_fn queue stacked on request_fn queue(s) */
10961099
free_clone_request(md, clone);
1100+
/*
1101+
* NOTE: for the blk-mq queue stacked on request_fn queue(s) case:
1102+
* no need to call free_clone_request() because we leverage blk-mq by
1103+
* allocating the clone at the end of the blk-mq pdu (see: clone_rq)
1104+
*/
10971105

10981106
if (!md->queue->mq_ops)
10991107
free_rq_tio(tio);
@@ -1124,7 +1132,7 @@ static void dm_end_request(struct request *clone, int error)
11241132
rq->sense_len = clone->sense_len;
11251133
}
11261134

1127-
free_rq_clone(clone);
1135+
free_rq_clone(clone, true);
11281136
if (!rq->q->mq_ops)
11291137
blk_end_request_all(rq, error);
11301138
else
@@ -1143,7 +1151,7 @@ static void dm_unprep_request(struct request *rq)
11431151
}
11441152

11451153
if (clone)
1146-
free_rq_clone(clone);
1154+
free_rq_clone(clone, false);
11471155
}
11481156

11491157
/*

0 commit comments

Comments
 (0)