This is a note to let you know that I've just added the patch titled io_uring: mark task TASK_RUNNING before handling resume/task work to the 5.15-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: io_uring-mark-task-task_running-before-handling-resume-task-work.patch and it can be found in the queue-5.15 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 29b1662142a87b9af6742702730f1bfa255a9dc3 Mon Sep 17 00:00:00 2001 From: Jens Axboe <axboe@xxxxxxxxx> Date: Mon, 6 Mar 2023 13:16:38 -0700 Subject: io_uring: mark task TASK_RUNNING before handling resume/task work From: Jens Axboe <axboe@xxxxxxxxx> commit 2f2bb1ffc9983e227424d0787289da5483b0c74f upstream. Just like for task_work, set the task mode to TASK_RUNNING before doing 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@xxxxxxxxx> Link: https://lore.kernel.org/oe-lkp/202302062208.24d3e563-oliver.sang@xxxxxxxxx Signed-off-by: Jens Axboe <axboe@xxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- io_uring/io_uring.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -2468,8 +2468,10 @@ static inline bool 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); tracehook_notify_resume(NULL); + } if (test_thread_flag(TIF_NOTIFY_SIGNAL) || current->task_works) { __set_current_state(TASK_RUNNING); tracehook_notify_signal(); Patches currently in stable-queue which might be from axboe@xxxxxxxxx are queue-5.15/io_uring-handle-tif_notify_resume-when-checking-for-task_work.patch queue-5.15/brd-return-0-error-from-brd_insert_page.patch queue-5.15/fs-hfsplus-fix-uaf-issue-in-hfsplus_put_super.patch queue-5.15/block-don-t-allow-multiple-bios-for-iocb_nowait-issue.patch queue-5.15/blk-mq-avoid-sleep-in-blk_mq_alloc_request_hctx.patch queue-5.15/io_uring-remove-msg_nosignal-from-recvmsg.patch queue-5.15/io_uring-mark-task-task_running-before-handling-resume-task-work.patch queue-5.15/trace-blktrace-fix-memory-leak-with-using-debugfs_lo.patch queue-5.15/io_uring-rsrc-disallow-multi-source-reg-buffers.patch queue-5.15/io_uring-poll-allow-some-retries-for-poll-triggering-spuriously.patch queue-5.15/blk-mq-remove-stale-comment-for-blk_mq_sched_mark_re.patch queue-5.15/blk-iocost-fix-divide-by-0-error-in-calc_lcoefs.patch queue-5.15/s390-dasd-fix-potential-memleak-in-dasd_eckd_init.patch queue-5.15/blk-mq-correct-stale-comment-of-.get_budget.patch queue-5.15/io_uring-add-a-conditional-reschedule-to-the-iopoll-cancelation-loop.patch queue-5.15/block-bio-integrity-copy-flags-when-bio_integrity_pa.patch