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 6.1-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-6.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 2f2bb1ffc9983e227424d0787289da5483b0c74f Mon Sep 17 00:00:00 2001 From: Jens Axboe <axboe@xxxxxxxxx> Date: Mon, 6 Feb 2023 08:20:46 -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 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@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.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/io_uring/io_uring.h +++ b/io_uring/io_uring.h @@ -261,8 +261,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(); Patches currently in stable-queue which might be from axboe@xxxxxxxxx are queue-6.1/sbitmap-use-single-per-bitmap-counting-to-wake-up-qu.patch queue-6.1/io_uring-handle-tif_notify_resume-when-checking-for-task_work.patch queue-6.1/block-don-t-allow-multiple-bios-for-iocb_nowait-issue.patch queue-6.1/sbitmap-correct-wake_batch-recalculation-to-avoid-po.patch queue-6.1/blk-mq-avoid-sleep-in-blk_mq_alloc_request_hctx.patch queue-6.1/io_uring-add-reschedule-point-to-handle_tw_list.patch queue-6.1/ublk_drv-remove-nr_aborted_queues-from-ublk_device.patch queue-6.1/io_uring-remove-msg_nosignal-from-recvmsg.patch queue-6.1/io_uring-mark-task-task_running-before-handling-resume-task-work.patch queue-6.1/blk-mq-fix-potential-io-hung-for-shared-sbitmap-per-.patch queue-6.1/blk-mq-wait-on-correct-sbitmap_queue-in-blk_mq_mark_.patch queue-6.1/block-clear-bio-bi_bdev-when-putting-a-bio-back-in-the-cache.patch queue-6.1/io_uring-fix-fget-leak-when-fs-don-t-support-nowait-buffered-read.patch queue-6.1/ublk_drv-don-t-probe-partitions-if-the-ubq-daemon-is.patch queue-6.1/trace-blktrace-fix-memory-leak-with-using-debugfs_lo.patch queue-6.1/io_uring-rsrc-disallow-multi-source-reg-buffers.patch queue-6.1/x86-fpu-don-t-set-tif_need_fpu_load-for-pf_io_worker.patch queue-6.1/io_uring-replace-0-length-array-with-flexible-array.patch queue-6.1/blk-cgroup-dropping-parent-refcount-after-pd_free_fn.patch queue-6.1/block-be-a-bit-more-careful-in-checking-for-null-bdev-while-polling.patch queue-6.1/block-use-proper-return-value-from-bio_failfast.patch queue-6.1/block-fix-io-statistics-for-cgroup-in-throttle-path.patch queue-6.1/block-ublk-check-io-buffer-based-on-flag-need_get_da.patch queue-6.1/io_uring-use-user-visible-tail-in-io_uring_poll.patch queue-6.1/blk-cgroup-synchronize-pd_free_fn-from-blkg_free_wor.patch queue-6.1/sbitmap-remove-redundant-check-in-__sbitmap_queue_ge.patch queue-6.1/block-sync-mixed-merged-request-s-failfast-with-1st-.patch queue-6.1/blk-mq-remove-stale-comment-for-blk_mq_sched_mark_re.patch queue-6.1/blk-iocost-fix-divide-by-0-error-in-calc_lcoefs.patch queue-6.1/s390-dasd-fix-potential-memleak-in-dasd_eckd_init.patch queue-6.1/blk-mq-correct-stale-comment-of-.get_budget.patch queue-6.1/io_uring-add-a-conditional-reschedule-to-the-iopoll-cancelation-loop.patch queue-6.1/block-bio-integrity-copy-flags-when-bio_integrity_pa.patch