Skip to content

Commit 60ef51c

Browse files
Ming Leigregkh
authored andcommitted
ublk: fix handling recovery & reissue in ublk_abort_queue()
[ Upstream commit 6ee6bd5 ] Commit 8284066 ("ublk: grab request reference when the request is handled by userspace") doesn't grab request reference in case of recovery reissue. Then the request can be requeued & re-dispatch & failed when canceling uring command. If it is one zc request, the request can be freed before io_uring returns the zc buffer back, then cause kernel panic: [ 126.773061] BUG: kernel NULL pointer dereference, address: 00000000000000c8 [ 126.773657] #PF: supervisor read access in kernel mode [ 126.774052] #PF: error_code(0x0000) - not-present page [ 126.774455] PGD 0 P4D 0 [ 126.774698] Oops: Oops: 0000 [#1] SMP NOPTI [ 126.775034] CPU: 13 UID: 0 PID: 1612 Comm: kworker/u64:55 Not tainted 6.14.0_blk+ torvalds#182 PREEMPT(full) [ 126.775676] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.3-1.fc39 04/01/2014 [ 126.776275] Workqueue: iou_exit io_ring_exit_work [ 126.776651] RIP: 0010:ublk_io_release+0x14/0x130 [ublk_drv] Fixes it by always grabbing request reference for aborting the request. Reported-by: Caleb Sander Mateos <[email protected]> Closes: https://lore.kernel.org/linux-block/CADUfDZodKfOGUeWrnAxcZiLT+puaZX8jDHoj_sfHZCOZwhzz6A@mail.gmail.com/ Fixes: 8284066 ("ublk: grab request reference when the request is handled by userspace") Signed-off-by: Ming Lei <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent a006cb9 commit 60ef51c

File tree

1 file changed

+26
-4
lines changed

1 file changed

+26
-4
lines changed

drivers/block/ublk_drv.c

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,6 +1081,25 @@ static void ublk_complete_rq(struct kref *ref)
10811081
__ublk_complete_rq(req);
10821082
}
10831083

1084+
static void ublk_do_fail_rq(struct request *req)
1085+
{
1086+
struct ublk_queue *ubq = req->mq_hctx->driver_data;
1087+
1088+
if (ublk_nosrv_should_reissue_outstanding(ubq->dev))
1089+
blk_mq_requeue_request(req, false);
1090+
else
1091+
__ublk_complete_rq(req);
1092+
}
1093+
1094+
static void ublk_fail_rq_fn(struct kref *ref)
1095+
{
1096+
struct ublk_rq_data *data = container_of(ref, struct ublk_rq_data,
1097+
ref);
1098+
struct request *req = blk_mq_rq_from_pdu(data);
1099+
1100+
ublk_do_fail_rq(req);
1101+
}
1102+
10841103
/*
10851104
* Since __ublk_rq_task_work always fails requests immediately during
10861105
* exiting, __ublk_fail_req() is only called from abort context during
@@ -1094,10 +1113,13 @@ static void __ublk_fail_req(struct ublk_queue *ubq, struct ublk_io *io,
10941113
{
10951114
WARN_ON_ONCE(io->flags & UBLK_IO_FLAG_ACTIVE);
10961115

1097-
if (ublk_nosrv_should_reissue_outstanding(ubq->dev))
1098-
blk_mq_requeue_request(req, false);
1099-
else
1100-
ublk_put_req_ref(ubq, req);
1116+
if (ublk_need_req_ref(ubq)) {
1117+
struct ublk_rq_data *data = blk_mq_rq_to_pdu(req);
1118+
1119+
kref_put(&data->ref, ublk_fail_rq_fn);
1120+
} else {
1121+
ublk_do_fail_rq(req);
1122+
}
11011123
}
11021124

11031125
static void ubq_complete_io_cmd(struct ublk_io *io, int res,

0 commit comments

Comments
 (0)