diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-02-06 18:20:46 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-02-06 18:23:21 +0300 |
| commit | 2f2bb1ffc9983e227424d0787289da5483b0c74f (patch) | |
| tree | d029d7d0d7b191900346eb183a6df1ceca679ea0 | |
| parent | 0ffae640ad83de46865c6b8dc3fda370823e4f1d (diff) | |
| download | linux-2f2bb1ffc9983e227424d0787289da5483b0c74f.tar.xz | |
io_uring: mark task TASK_RUNNING before handling resume/task work
Just like for task_work, set the task mode to TASK_RUNNING before doing
any potential resume work. We're not holding any locks at this point,
but we may have already set the task state to TASK_INTERRUPTIBLE in
preparation for going to sleep waiting for events. Ensure that we set it
back to TASK_RUNNING if we have work to process, to avoid warnings on
calling blocking operations with !TASK_RUNNING.
Fixes: b5d3ae202fbf ("io_uring: handle TIF_NOTIFY_RESUME when checking for task_work")
Reported-by: kernel test robot <oliver.sang@intel.com>
Link: https://lore.kernel.org/oe-lkp/202302062208.24d3e563-oliver.sang@intel.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | io_uring/io_uring.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h index f90816aac896..2711865f1e19 100644 --- a/io_uring/io_uring.h +++ b/io_uring/io_uring.h @@ -281,8 +281,10 @@ static inline int io_run_task_work(void) * notify work that needs processing. */ if (current->flags & PF_IO_WORKER && - test_thread_flag(TIF_NOTIFY_RESUME)) + test_thread_flag(TIF_NOTIFY_RESUME)) { + __set_current_state(TASK_RUNNING); resume_user_mode_work(NULL); + } if (task_work_pending(current)) { __set_current_state(TASK_RUNNING); task_work_run(); |