Skip to contentSkip to conversation

io_uring: mark task TASK_RUNNING before handling resume/task work

PATCH New Jens Axboe 1 participant 1 message Feb 6, 2023 io_uring

lore
Share & tools
lore

Jens Axboe

author maintainer
#0 lore raw

PATCH 1/1 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")

---

io_uring/io_uring.h +3 -1
index f90816aac896..2711865f1e19 100644
@@ -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();
Signature · 1 line
Jens Axboe