This is a note to let you know that I've just added the patch titled
io_uring: fix clear IORING_SETUP_R_DISABLED in wrong function
to the 5.10-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-fix-clear-ioring_setup_r_disabled-in-wrong-function.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From yangyingliang@xxxxxxxxxx Thu Jul 15 19:31:46 2021
From: Yang Yingliang <yangyingliang@xxxxxxxxxx>
Date: Thu, 15 Jul 2021 21:18:25 +0800
Subject: io_uring: fix clear IORING_SETUP_R_DISABLED in wrong function
To: <linux-kernel@xxxxxxxxxxxxxxx>, <stable@xxxxxxxxxxxxxxx>
Cc: <gregkh@xxxxxxxxxxxxxxxxxxx>, <axboe@xxxxxxxxx>
Message-ID: <20210715131825.2410912-1-yangyingliang@xxxxxxxxxx>
From: Yang Yingliang <yangyingliang@xxxxxxxxxx>
In commit 3ebba796fa25 ("io_uring: ensure that SQPOLL thread is started for exit"),
the IORING_SETUP_R_DISABLED is cleared in io_sq_offload_start(), but when backport
it to stable-5.10, IORING_SETUP_R_DISABLED is cleared in __io_req_task_submit(),
move clearing IORING_SETUP_R_DISABLED to io_sq_offload_start() to fix this.
Fixes: 6cae8095490ca ("io_uring: ensure that SQPOLL thread is started for exit")
Signed-off-by: Yang Yingliang <yangyingliang@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/io_uring.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2087,7 +2087,6 @@ static void __io_req_task_submit(struct
__io_req_task_cancel(req, -EFAULT);
mutex_unlock(&ctx->uring_lock);
- ctx->flags &= ~IORING_SETUP_R_DISABLED;
if (ctx->flags & IORING_SETUP_SQPOLL)
io_sq_thread_drop_mm();
}
@@ -7992,6 +7991,7 @@ static void io_sq_offload_start(struct i
{
struct io_sq_data *sqd = ctx->sq_data;
+ ctx->flags &= ~IORING_SETUP_R_DISABLED;
if ((ctx->flags & IORING_SETUP_SQPOLL) && sqd->thread)
wake_up_process(sqd->thread);
}
Patches currently in stable-queue which might be from yangyingliang@xxxxxxxxxx are
queue-5.10/net-ipa-add-missing-of_node_put-in-ipa_firmware_load.patch
queue-5.10/io_uring-fix-clear-ioring_setup_r_disabled-in-wrong-function.patch
queue-5.10/net-sched-fix-error-return-code-in-tcf_del_walker.patch
queue-5.10/net-moxa-use-devm_platform_get_and_ioremap_resource.patch
queue-5.10/net-micrel-check-return-value-after-calling-platform.patch
queue-5.10/net-mscc-ocelot-check-return-value-after-calling-pla.patch
queue-5.10/fjes-check-return-value-after-calling-platform_get_r.patch
queue-5.10/net-bcmgenet-check-return-value-after-calling-platfo.patch
queue-5.10/net-mvpp2-check-return-value-after-calling-platform_.patch
queue-5.10/net-sgi-ioc3-eth-check-return-value-after-calling-pl.patch
