This is a note to let you know that I've just added the patch titled io_uring/io-wq: kill off now unused IO_WQ_WORK_NO_CANCEL to the 5.11-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-io-wq-kill-off-now-unused-io_wq_work_no_cancel.patch and it can be found in the queue-5.11 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Wed Mar 10 01:03:15 PM CET 2021 From: Pavel Begunkov <asml.silence@xxxxxxxxx> Date: Wed, 10 Mar 2021 11:30:43 +0000 Subject: io_uring/io-wq: kill off now unused IO_WQ_WORK_NO_CANCEL To: stable@xxxxxxxxxxxxxxx Cc: Jens Axboe <axboe@xxxxxxxxx> Message-ID: <0a53f04021951888af40f5e487d593c4ac39b244.1615375332.git.asml.silence@xxxxxxxxx> From: Jens Axboe <axboe@xxxxxxxxx> commit 4014d943cb62db892eb023d385a966a3fce5ee4c upstream It's no longer used as IORING_OP_CLOSE got rid for the need of flagging it as uncancelable, kill it of. Signed-off-by: Jens Axboe <axboe@xxxxxxxxx> Signed-off-by: Pavel Begunkov <asml.silence@xxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- fs/io-wq.c | 1 - fs/io-wq.h | 1 - fs/io_uring.c | 5 +---- 3 files changed, 1 insertion(+), 6 deletions(-) --- a/fs/io-wq.c +++ b/fs/io-wq.c @@ -944,7 +944,6 @@ static bool io_wq_worker_cancel(struct i */ spin_lock_irqsave(&worker->lock, flags); if (worker->cur_work && - !(worker->cur_work->flags & IO_WQ_WORK_NO_CANCEL) && match->fn(worker->cur_work, match->data)) { send_sig(SIGINT, worker->task, 1); match->nr_running++; --- a/fs/io-wq.h +++ b/fs/io-wq.h @@ -9,7 +9,6 @@ enum { IO_WQ_WORK_CANCEL = 1, IO_WQ_WORK_HASHED = 2, IO_WQ_WORK_UNBOUND = 4, - IO_WQ_WORK_NO_CANCEL = 8, IO_WQ_WORK_CONCURRENT = 16, IO_WQ_WORK_FILES = 32, --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -6388,11 +6388,8 @@ static struct io_wq_work *io_wq_submit_w if (timeout) io_queue_linked_timeout(timeout); - /* if NO_CANCEL is set, we must still run the work */ - if ((work->flags & (IO_WQ_WORK_CANCEL|IO_WQ_WORK_NO_CANCEL)) == - IO_WQ_WORK_CANCEL) { + if (work->flags & IO_WQ_WORK_CANCEL) ret = -ECANCELED; - } if (!ret) { do { Patches currently in stable-queue which might be from asml.silence@xxxxxxxxx are queue-5.11/io_uring-io-wq-kill-off-now-unused-io_wq_work_no_cancel.patch queue-5.11/io_uring-get-rid-of-intermediate-ioring_op_close-stage.patch queue-5.11/io_uring-fix-inconsistent-lock-state.patch queue-5.11/fs-provide-locked-helper-variant-of-close_fd_get_file.patch queue-5.11/io_uring-io-wq-return-2-step-work-swap-scheme.patch queue-5.11/io_uring-deduplicate-core-cancellations-sequence.patch queue-5.11/io_uring-unpark-sqpoll-thread-for-cancelation.patch queue-5.11/io_uring-don-t-take-uring_lock-during-iowq-cancel.patch queue-5.11/io_uring-deduplicate-failing-task_work_add.patch