bybrooklyn/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-04-18 06:44:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

ublk: abort requests filled in event kfifo

Browse Source 
In case of BATCH_IO, any request filled in event kfifo, they don't get
chance to be dispatched any more when releasing ublk char device, so
we have to abort them too.

Add ublk_abort_batch_queue() for aborting this kind of requests.

Reviewed-by: Caleb Sander Mateos <csander@purestorage.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Ming Lei
2026-01-16 22:18:43 +08:00
committed by Jens Axboe
parent 3ac4796b88
commit 29d0a927f9
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/block/ublk_drv.c
View File

@@ -2470,7 +2470,8 @@ static int ublk_ch_mmap(struct file *filp, struct vm_area_struct *vma)
static void __ublk_fail_req(struct ublk_device *ub, struct ublk_io *io, static void __ublk_fail_req(struct ublk_device *ub, struct ublk_io *io,
struct request *req) struct request *req)
{ {
WARN_ON_ONCE(io->flags & UBLK_IO_FLAG_ACTIVE); WARN_ON_ONCE(!ublk_dev_support_batch_io(ub) &&
io->flags & UBLK_IO_FLAG_ACTIVE);
if (ublk_nosrv_should_reissue_outstanding(ub)) if (ublk_nosrv_should_reissue_outstanding(ub))
blk_mq_requeue_request(req, false); blk_mq_requeue_request(req, false);
@@ -2480,6 +2481,24 @@ static void __ublk_fail_req(struct ublk_device *ub, struct ublk_io *io,
} }
} }
/*
* Request tag may just be filled to event kfifo, not get chance to
* dispatch, abort these requests too
*/
static void ublk_abort_batch_queue(struct ublk_device *ub,
struct ublk_queue *ubq)
{
unsigned short tag;
while (kfifo_out(&ubq->evts_fifo, &tag, 1)) {
struct request *req = blk_mq_tag_to_rq(
ub->tag_set.tags[ubq->q_id], tag);
if (!WARN_ON_ONCE(!req || !blk_mq_request_started(req)))
__ublk_fail_req(ub, &ubq->ios[tag], req);
}
}
/* /*
* Called from ublk char device release handler, when any uring_cmd is * Called from ublk char device release handler, when any uring_cmd is
* done, meantime request queue is "quiesced" since all inflight requests * done, meantime request queue is "quiesced" since all inflight requests
@@ -2498,6 +2517,9 @@ static void ublk_abort_queue(struct ublk_device *ub, struct ublk_queue *ubq)
if (io->flags & UBLK_IO_FLAG_OWNED_BY_SRV) if (io->flags & UBLK_IO_FLAG_OWNED_BY_SRV)
__ublk_fail_req(ub, io, io->req); __ublk_fail_req(ub, io, io->req);
} }
if (ublk_support_batch_io(ubq))
ublk_abort_batch_queue(ub, ubq);
} }
static void ublk_start_cancel(struct ublk_device *ub) static void ublk_start_cancel(struct ublk_device *ub)