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 v3 03/11] io_uring: don't set TASK_RUNNING in local tw runner
Date: Mon,  9 Jan 2023 14:46:05 +0000	[thread overview]
Message-ID: <9d9422c429ef3f9457b4f4b8288bf4789564f33b.1673274244.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>

The CQ waiting loop sets TASK_RUNNING before trying to execute
task_work, no need to repeat it in io_run_local_work().

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

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 157e6ef6da7c..961ebc031992 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -1339,11 +1339,9 @@ int __io_run_local_work(struct io_ring_ctx *ctx, bool *locked)
 
 int io_run_local_work(struct io_ring_ctx *ctx)
 {
-	bool locked;
+	bool locked = mutex_trylock(&ctx->uring_lock);
 	int ret;
 
-	__set_current_state(TASK_RUNNING);
-	locked = mutex_trylock(&ctx->uring_lock);
 	ret = __io_run_local_work(ctx, &locked);
 	if (locked)
 		mutex_unlock(&ctx->uring_lock);
@@ -2455,6 +2453,7 @@ static int io_wake_function(struct wait_queue_entry *curr, unsigned int mode,
 int io_run_task_work_sig(struct io_ring_ctx *ctx)
 {
 	if (!llist_empty(&ctx->work_llist)) {
+		__set_current_state(TASK_RUNNING);
 		if (io_run_local_work(ctx) > 0)
 			return 1;
 	}
-- 
2.38.1


  parent reply	other threads:[~2023-01-09 14:51 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-09 14:46 [PATCH v3 00/11] CQ waiting / task_work optimisations Pavel Begunkov
2023-01-09 14:46 ` [PATCH v3 01/11] io_uring: move submitter_task out of cold cacheline Pavel Begunkov
2023-01-09 14:46 ` [PATCH v3 02/11] io_uring: refactor io_wake_function Pavel Begunkov
2023-01-09 14:46 ` Pavel Begunkov [this message]
2023-01-09 14:46 ` [PATCH v3 04/11] io_uring: mark io_run_local_work static Pavel Begunkov
2023-01-09 14:46 ` [PATCH v3 05/11] io_uring: move io_run_local_work_locked Pavel Begunkov
2023-01-09 14:46 ` [PATCH v3 06/11] io_uring: separate wq for ring polling Pavel Begunkov
2023-01-09 14:46 ` [PATCH v3 07/11] io_uring: add lazy poll_wq activation Pavel Begunkov
2023-01-09 14:46 ` [PATCH v3 08/11] io_uring: wake up optimisations Pavel Begunkov
2023-01-09 14:46 ` [PATCH v3 09/11] io_uring: waitqueue-less cq waiting Pavel Begunkov
2023-01-09 14:46 ` [PATCH v3 10/11] io_uring: add io_req_local_work_add wake fast path Pavel Begunkov
2023-01-09 14:46 ` [PATCH v3 11/11] io_uring: optimise deferred tw execution Pavel Begunkov
2023-01-11 18:00 ` [PATCH v3 00/11] CQ waiting / task_work 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=9d9422c429ef3f9457b4f4b8288bf4789564f33b.1673274244.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