public inbox for [email protected]
 help / color / mirror / Atom feed
From: Hao Xu <[email protected]>
To: [email protected]
Cc: Jens Axboe <[email protected]>, Pavel Begunkov <[email protected]>
Subject: [PATCH 10/11] io-wq: add an work list for fixed worker
Date: Mon, 27 Jun 2022 21:35:40 +0800	[thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>

From: Hao Xu <[email protected]>

Previously when a fixed worker handles its private works, it get all of
them from worker->acct.work_list to a temporary acct->work_list. This
prevents work cancellation since the cancellation process cannot find
works from this temporary work list. Thus add a new acct so to address
it.

Signed-off-by: Hao Xu <[email protected]>
---
 io_uring/io-wq.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/io_uring/io-wq.c b/io_uring/io-wq.c
index d54056b98e2b..38d88da70a40 100644
--- a/io_uring/io-wq.c
+++ b/io_uring/io-wq.c
@@ -126,6 +126,7 @@ struct io_worker {
 	};
 	int index;
 	struct io_wqe_acct acct;
+	struct io_wqe_acct exec_acct;
 };
 
 #if BITS_PER_LONG == 64
@@ -723,14 +724,17 @@ static void io_worker_handle_work(struct io_worker *worker,
 
 static inline void io_worker_handle_private_work(struct io_worker *worker)
 {
-	struct io_wqe_acct acct;
+	struct io_wqe_acct *acct = &worker->acct;
+	struct io_wqe_acct *exec_acct = &worker->exec_acct;
 
-	raw_spin_lock(&worker->acct.lock);
-	acct = worker->acct;
-	wq_list_clean(&worker->acct.work_list);
-	worker->acct.nr_works = 0;
-	raw_spin_unlock(&worker->acct.lock);
-	io_worker_handle_work(worker, &acct, false);
+	raw_spin_lock(&acct->lock);
+	exec_acct->nr_works = acct->nr_works;
+	exec_acct->max_works = acct->max_works;
+	exec_acct->work_list = acct->work_list;
+	wq_list_clean(&acct->work_list);
+	acct->nr_works = 0;
+	raw_spin_unlock(&acct->lock);
+	io_worker_handle_work(worker, exec_acct, false);
 }
 
 static inline void io_worker_handle_public_work(struct io_worker *worker)
@@ -866,6 +870,7 @@ static void io_init_new_fixed_worker(struct io_wqe *wqe,
 {
 	struct io_wqe_acct *acct = io_wqe_get_acct(worker);
 	struct io_wqe_acct *iw_acct = &worker->acct;
+	struct io_wqe_acct *exec_acct = &worker->exec_acct;
 	unsigned index = acct->index;
 	unsigned *nr_fixed;
 
@@ -878,6 +883,7 @@ static void io_init_new_fixed_worker(struct io_wqe *wqe,
 	iw_acct->index = index;
 	INIT_WQ_LIST(&iw_acct->work_list);
 	raw_spin_lock_init(&iw_acct->lock);
+	raw_spin_lock_init(&exec_acct->lock);
 	raw_spin_unlock(&acct->lock);
 }
 
-- 
2.25.1



  parent reply	other threads:[~2022-06-27 13:36 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-27 13:35 [PATCH v5 00/11] fixed worker Hao Xu
2022-06-27 13:35 ` [PATCH 01/11] io-wq: add a worker flag for individual exit Hao Xu
2022-06-27 13:35 ` [PATCH 02/11] io-wq: change argument of create_io_worker() for convienence Hao Xu
2022-06-27 13:35 ` [PATCH 03/11] io-wq: add infra data structure for fixed workers Hao Xu
2022-06-27 13:35 ` [PATCH 04/11] io-wq: tweak io_get_acct() Hao Xu
2022-06-27 13:35 ` [PATCH 05/11] io-wq: fixed worker initialization Hao Xu
2022-06-27 13:35 ` [PATCH 06/11] io-wq: fixed worker exit Hao Xu
2022-06-27 13:35 ` [PATCH 07/11] io-wq: implement fixed worker logic Hao Xu
2022-06-27 13:35 ` [PATCH 08/11] io-wq: batch the handling of fixed worker private works Hao Xu
2022-06-27 13:35 ` [PATCH 09/11] io_uring: add register fixed worker interface Hao Xu
2022-06-27 13:35 ` Hao Xu [this message]
2022-06-27 13:35 ` [PATCH 11/11] io_uring: cancel works in exec work list for fixed worker Hao Xu
2022-07-12  8:32 ` [PATCH v5 00/11] " Hao Xu

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] \
    /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