ublk: abort requests filled in event kfifo

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>

diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
index 90a6d6a123030fbbb82b0bce7e30432d1006f80d..564cf44c238f420342137d152e43da7de22249d2 100644 (file)
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@ -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,
                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))
                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
  * 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)
                        __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)