[10/11] io-wq: add an work list for fixed worker

Commit Message

Hao Xu May 15, 2022, 1:12 p.m. UTC

From: Hao Xu <[e-mail]>

From: Hao Xu <[e-mail]>

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 <[e-mail]>
---
 fs/io-wq.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

Patch

diff --git a/fs/io-wq.c b/fs/io-wq.c
index 66d3c741613f..c6e4179a9961 100644
--- a/fs/io-wq.c
+++ b/fs/io-wq.c
@@ -128,6 +128,7 @@  struct io_worker {
 	};
 	int index;
 	struct io_wqe_acct acct;
+	struct io_wqe_acct exec_acct;
 };
 
 #if BITS_PER_LONG == 64
@@ -725,14 +726,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)
@@ -868,6 +872,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;
 
@@ -880,6 +885,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);
 }