From: Ming Lei <ming.lei@redhat.com>
To: Jens Axboe <axboe@kernel.dk>,
io-uring@vger.kernel.org, linux-block@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Miklos Szeredi <mszeredi@redhat.com>,
ZiyangZhang <ZiyangZhang@linux.alibaba.com>,
Xiaoguang Wang <xiaoguang.wang@linux.alibaba.com>,
Bernd Schubert <bschubert@ddn.com>,
Pavel Begunkov <asml.silence@gmail.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Dan Williams <dan.j.williams@intel.com>,
Ming Lei <ming.lei@redhat.com>
Subject: [PATCH V5 06/16] block: ublk_drv: add common exit handling
Date: Tue, 28 Mar 2023 23:09:48 +0800 [thread overview]
Message-ID: <20230328150958.1253547-7-ming.lei@redhat.com> (raw)
In-Reply-To: <20230328150958.1253547-1-ming.lei@redhat.com>
Simplify exit handling a bit, and prepare for supporting fused command.
Reviewed-by: Ziyang Zhang <ZiyangZhang@linux.alibaba.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
drivers/block/ublk_drv.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
index c73cc57ec547..bc46616710d4 100644
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@ -655,14 +655,15 @@ static void ublk_complete_rq(struct request *req)
struct ublk_queue *ubq = req->mq_hctx->driver_data;
struct ublk_io *io = &ubq->ios[req->tag];
unsigned int unmapped_bytes;
+ blk_status_t res = BLK_STS_OK;
/* failed read IO if nothing is read */
if (!io->res && req_op(req) == REQ_OP_READ)
io->res = -EIO;
if (io->res < 0) {
- blk_mq_end_request(req, errno_to_blk_status(io->res));
- return;
+ res = errno_to_blk_status(io->res);
+ goto exit;
}
/*
@@ -671,10 +672,8 @@ static void ublk_complete_rq(struct request *req)
*
* Both the two needn't unmap.
*/
- if (req_op(req) != REQ_OP_READ && req_op(req) != REQ_OP_WRITE) {
- blk_mq_end_request(req, BLK_STS_OK);
- return;
- }
+ if (req_op(req) != REQ_OP_READ && req_op(req) != REQ_OP_WRITE)
+ goto exit;
/* for READ request, writing data in iod->addr to rq buffers */
unmapped_bytes = ublk_unmap_io(ubq, req, io);
@@ -691,6 +690,10 @@ static void ublk_complete_rq(struct request *req)
blk_mq_requeue_request(req, true);
else
__blk_mq_end_request(req, BLK_STS_OK);
+
+ return;
+exit:
+ blk_mq_end_request(req, res);
}
/*
--
2.39.2
next prev parent reply other threads:[~2023-03-28 15:14 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-28 15:09 [PATCH V5 00/16] io_uring/ublk: add IORING_OP_FUSED_CMD Ming Lei
2023-03-28 15:09 ` [PATCH V5 01/16] io_uring: increase io_kiocb->flags into 64bit Ming Lei
2023-03-28 15:09 ` [PATCH V5 02/16] io_uring: add IORING_OP_FUSED_CMD Ming Lei
2023-03-28 17:33 ` kernel test robot
2023-03-28 15:09 ` [PATCH V5 03/16] io_uring: support normal SQE for fused command Ming Lei
2023-03-28 15:09 ` [PATCH V5 04/16] io_uring: support OP_READ/OP_WRITE for fused secondary request Ming Lei
2023-03-28 15:09 ` [PATCH V5 05/16] io_uring: support OP_SEND_ZC/OP_RECV " Ming Lei
2023-03-28 15:09 ` Ming Lei [this message]
2023-03-28 15:09 ` [PATCH V5 07/16] block: ublk_drv: don't consider flush request in map/unmap io Ming Lei
2023-03-28 15:09 ` [PATCH V5 08/16] block: ublk_drv: add two helpers to clean up map/unmap request Ming Lei
2023-03-28 15:09 ` [PATCH V5 09/16] block: ublk_drv: clean up several helpers Ming Lei
2023-03-28 15:09 ` [PATCH V5 10/16] block: ublk_drv: cleanup 'struct ublk_map_data' Ming Lei
2023-03-28 15:09 ` [PATCH V5 11/16] block: ublk_drv: cleanup ublk_copy_user_pages Ming Lei
2023-03-28 15:09 ` [PATCH V5 12/16] block: ublk_drv: grab request reference when the request is handled by userspace Ming Lei
2023-03-28 15:09 ` [PATCH V5 13/16] block: ublk_drv: support to copy any part of request pages Ming Lei
2023-03-28 15:09 ` [PATCH V5 14/16] block: ublk_drv: add read()/write() support for ublk char device Ming Lei
2023-03-28 15:09 ` [PATCH V5 15/16] block: ublk_drv: don't check buffer in case of zero copy Ming Lei
2023-03-28 15:09 ` [PATCH V5 16/16] block: ublk_drv: apply io_uring FUSED_CMD for supporting " Ming Lei
2023-03-29 2:57 ` Ziyang Zhang
2023-03-29 9:00 ` Ming Lei
2023-03-29 10:01 ` Ziyang Zhang
2023-03-29 10:52 ` Ming Lei
2023-04-03 8:38 ` Ziyang Zhang
2023-04-03 9:22 ` Ming Lei
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230328150958.1253547-7-ming.lei@redhat.com \
--to=ming.lei@redhat.com \
--cc=ZiyangZhang@linux.alibaba.com \
--cc=asml.silence@gmail.com \
--cc=axboe@kernel.dk \
--cc=bschubert@ddn.com \
--cc=dan.j.williams@intel.com \
--cc=io-uring@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mszeredi@redhat.com \
--cc=stefanha@redhat.com \
--cc=xiaoguang.wang@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).