public inbox for [email protected]
 help / color / mirror / Atom feed
From: Pavel Begunkov <[email protected]>
To: [email protected]
Cc: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCH 2/6] io_uring: remove extra ifs around io_commit_cqring
Date: Mon, 21 Mar 2022 22:02:20 +0000	[thread overview]
Message-ID: <36aed692dff402bba00a444a63a9cd2e97a340ea.1647897811.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>

Now io_commit_cqring() is simple and it tolerates well being called
without a new CQE filled, so kill a bunch of not needed anymore
guards.

Signed-off-by: Pavel Begunkov <[email protected]>
---
 fs/io_uring.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index bb8a1362cb5e..71f3bea34e66 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -1947,8 +1947,7 @@ static bool __io_cqring_overflow_flush(struct io_ring_ctx *ctx, bool force)
 			   ctx->rings->sq_flags & ~IORING_SQ_CQ_OVERFLOW);
 	}
 
-	if (posted)
-		io_commit_cqring(ctx);
+	io_commit_cqring(ctx);
 	spin_unlock(&ctx->completion_lock);
 	if (posted)
 		io_cqring_ev_posted(ctx);
@@ -2382,8 +2381,7 @@ static void __io_req_find_next_prep(struct io_kiocb *req)
 
 	spin_lock(&ctx->completion_lock);
 	posted = io_disarm_next(req);
-	if (posted)
-		io_commit_cqring(ctx);
+	io_commit_cqring(ctx);
 	spin_unlock(&ctx->completion_lock);
 	if (posted)
 		io_cqring_ev_posted(ctx);
@@ -10248,8 +10246,7 @@ static __cold bool io_kill_timeouts(struct io_ring_ctx *ctx,
 		}
 	}
 	spin_unlock_irq(&ctx->timeout_lock);
-	if (canceled != 0)
-		io_commit_cqring(ctx);
+	io_commit_cqring(ctx);
 	spin_unlock(&ctx->completion_lock);
 	if (canceled != 0)
 		io_cqring_ev_posted(ctx);
-- 
2.35.1


  parent reply	other threads:[~2022-03-21 22:51 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-21 22:02 [PATCH 0/6] completion path optimisations Pavel Begunkov
2022-03-21 22:02 ` [PATCH 1/6] io_uring: small optimisation of tctx_task_work Pavel Begunkov
2022-03-21 22:02 ` Pavel Begunkov [this message]
2022-03-21 22:02 ` [PATCH 3/6] io_uring: refactor io_req_find_next Pavel Begunkov
2022-03-21 22:02 ` [PATCH 4/6] io_uring: optimise io_free_batch_list Pavel Begunkov
2022-03-21 22:02 ` [PATCH 5/6] io_uring: move poll recycling later in compl flushing Pavel Begunkov
2022-03-21 22:02 ` [PATCH 6/6] io_uring: clean up io_queue_next() Pavel Begunkov
2022-03-22  2:52 ` [PATCH 0/6] completion path optimisations Jens Axboe

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=36aed692dff402bba00a444a63a9cd2e97a340ea.1647897811.git.asml.silence@gmail.com \
    [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