[PATCH 1/9] io-wq: add a worker flag for individual exit

Hao Xu
2022-04-29T10:19:07Z

Add a worker flag to control exit of an individual worker, this is
needed for fixed worker in the next patches but also as a generic
functionality.

Signed-off-by: Hao Xu <howeyxu@tencent.com>
---
fs/io-wq.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/fs/io-wq.c b/fs/io-wq.c
index 824623bcf1a5..0c26805ca6de 100644
--- a/fs/io-wq.c
+++ b/fs/io-wq.c
@@ -26,6 +26,7 @@ enum {
IO_WORKER_F_RUNNING = 2, /* account as running */
IO_WORKER_F_FREE = 4, /* worker on free list */
IO_WORKER_F_BOUND = 8, /* is doing bounded work */
+ IO_WORKER_F_EXIT = 32, /* worker is exiting */
};

enum {
@@ -639,8 +640,12 @@ static int io_wqe_worker(void *data)
while (!test_bit(IO_WQ_BIT_EXIT, &wq->state)) {
long ret;

+ if (worker->flags & IO_WORKER_F_EXIT)
+ break;
+
set_current_state(TASK_INTERRUPTIBLE);
- while (io_acct_run_queue(acct))
+ while (!(worker->flags & IO_WORKER_F_EXIT) &&
+ io_acct_run_queue(acct))
io_worker_handle_work(worker);

raw_spin_lock(&wqe->lock);
@@ -656,6 +661,10 @@ static int io_wqe_worker(void *data)
raw_spin_unlock(&wqe->lock);
if (io_flush_signals())
continue;
+ if (worker->flags & IO_WORKER_F_EXIT) {
+ __set_current_state(TASK_RUNNING);
+ break;
+ }
ret = schedule_timeout(WORKER_IDLE_TIMEOUT);
if (signal_pending(current)) {
struct ksignal ksig;
--
2.36.0