public inbox for [email protected]
 help / color / mirror / Atom feed
From: Ming Lei <[email protected]>
To: Jens Axboe <[email protected]>,
	[email protected], [email protected]
Cc: [email protected],
	Miklos Szeredi <[email protected]>,
	ZiyangZhang <[email protected]>,
	Xiaoguang Wang <[email protected]>,
	Bernd Schubert <[email protected]>,
	Pavel Begunkov <[email protected]>,
	Stefan Hajnoczi <[email protected]>,
	Ming Lei <[email protected]>
Subject: [PATCH V4 08/17] block: ublk_drv: don't consider flush request in map/unmap io
Date: Fri, 24 Mar 2023 21:57:59 +0800	[thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>

There isn't data in request of REQ_OP_FLUSH always, so don't consider
it in both ublk_map_io() and ublk_unmap_io().

Reviewed-by: Ziyang Zhang <[email protected]>
Signed-off-by: Ming Lei <[email protected]>
---
 drivers/block/ublk_drv.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
index b8998ed87a0f..4fe324da97a0 100644
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@ -529,15 +529,13 @@ static int ublk_map_io(const struct ublk_queue *ubq, const struct request *req,
 		struct ublk_io *io)
 {
 	const unsigned int rq_bytes = blk_rq_bytes(req);
+
 	/*
 	 * no zero copy, we delay copy WRITE request data into ublksrv
 	 * context and the big benefit is that pinning pages in current
 	 * context is pretty fast, see ublk_pin_user_pages
 	 */
-	if (req_op(req) != REQ_OP_WRITE && req_op(req) != REQ_OP_FLUSH)
-		return rq_bytes;
-
-	if (ublk_rq_has_data(req)) {
+	if (ublk_rq_has_data(req) && req_op(req) == REQ_OP_WRITE) {
 		struct ublk_map_data data = {
 			.ubq	=	ubq,
 			.rq	=	req,
@@ -772,9 +770,7 @@ static inline void __ublk_rq_task_work(struct request *req)
 		return;
 	}
 
-	if (ublk_need_get_data(ubq) &&
-			(req_op(req) == REQ_OP_WRITE ||
-			req_op(req) == REQ_OP_FLUSH)) {
+	if (ublk_need_get_data(ubq) && (req_op(req) == REQ_OP_WRITE)) {
 		/*
 		 * We have not handled UBLK_IO_NEED_GET_DATA command yet,
 		 * so immepdately pass UBLK_IO_RES_NEED_GET_DATA to ublksrv
-- 
2.39.2


  parent reply	other threads:[~2023-03-24 14:00 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CGME20230324135916epcas5p37aad4c49c76c05567a484377d8909092@epcas5p3.samsung.com>
2023-03-24 13:57 ` [PATCH V4 00/17] io_uring/ublk: add IORING_OP_FUSED_CMD Ming Lei
2023-03-24 13:57   ` [PATCH V4 01/17] io_uring: increase io_kiocb->flags into 64bit Ming Lei
2023-03-24 13:57   ` [PATCH V4 02/17] io_uring: add IORING_OP_FUSED_CMD Ming Lei
2023-03-24 13:57   ` [PATCH V4 03/17] io_uring: support normal SQE for fused command Ming Lei
2023-03-24 13:57   ` [PATCH V4 04/17] io_uring: support OP_READ/OP_WRITE for fused slave request Ming Lei
2023-03-24 13:57   ` [PATCH V4 05/17] io_uring: support OP_SEND_ZC/OP_RECV " Ming Lei
2023-03-24 13:57   ` [PATCH V4 06/17] block: ublk_drv: mark device as LIVE before adding disk Ming Lei
2023-03-24 13:57   ` [PATCH V4 07/17] block: ublk_drv: add common exit handling Ming Lei
2023-03-24 13:57   ` Ming Lei [this message]
2023-03-24 13:58   ` [PATCH V4 09/17] block: ublk_drv: add two helpers to clean up map/unmap request Ming Lei
2023-03-24 13:58   ` [PATCH V4 10/17] block: ublk_drv: clean up several helpers Ming Lei
2023-03-24 13:58   ` [PATCH V4 11/17] block: ublk_drv: cleanup 'struct ublk_map_data' Ming Lei
2023-03-24 13:58   ` [PATCH V4 12/17] block: ublk_drv: cleanup ublk_copy_user_pages Ming Lei
2023-03-24 13:58   ` [PATCH V4 13/17] block: ublk_drv: grab request reference when the request is handled by userspace Ming Lei
2023-03-24 13:58   ` [PATCH V4 14/17] block: ublk_drv: support to copy any part of request pages Ming Lei
2023-03-24 13:58   ` [PATCH V4 15/17] block: ublk_drv: add read()/write() support for ublk char device Ming Lei
2023-03-24 13:58   ` [PATCH V4 16/17] block: ublk_drv: don't check buffer in case of zero copy Ming Lei
2023-03-24 13:58   ` [PATCH V4 17/17] block: ublk_drv: apply io_uring FUSED_CMD for supporting " Ming Lei
2023-03-28  0:36   ` [PATCH V4 00/17] io_uring/ublk: add IORING_OP_FUSED_CMD Dan Williams
2023-03-28  1:16     ` Ming Lei
2023-03-28  1:29       ` Jens Axboe
2023-03-28  1:35         ` Ming Lei
2023-03-28  1:31       ` Dan Williams
2023-03-28  2:02         ` Ming Lei
2023-03-28  6:32           ` Dan Williams
2023-03-28  3:13       ` Gao Xiang
2023-03-28  3:33         ` Ming Lei
2023-03-28  5:10   ` Kanchan Joshi

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 \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    /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