io_uring: prevent sq_thread from spinning when it should stop
PATCH 1/1 io_uring: prevent sq_thread from spinning when it should stop
This patch drops 'cur_mm' before calling cond_resched(), to prevent the sq_thread from spinning even when the user process is finished.
Before this patch, if the user process ended without closing the io_uring fd, the sq_thread continues to spin until the 'sq_thread_idle' timeout ends.
In the worst case where the 'sq_thread_idle' parameter is bigger than INT_MAX, the sq_thread will spin forever.
---
Hi Jens,
I'm also sending a test to liburing for this case.
Cheers,
Stefano
--- fs/io_uring.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
fs/io_uring.c +12 -12
@@ -5138,6 +5138,18 @@ static int io_sq_thread(void *data)* to enter the kernel to reap and flush events. */ if (!to_submit || ret == -EBUSY ) { +/* +* Drop cur_mm before scheduling, we can't hold it for +* long periods (or over schedule()). Do this before +* adding ourselves to the waitqueue, as the unuse/drop +* may sleep. +*/ +if (cur_mm) { +unuse_mm (cur_mm); +mmput (cur_mm); + cur_mm =NULL ; + } +/* * We're polling. If we're within the defined idle * period, then let us spin without work before going
@@ -5152,18 +5164,6 @@ static int io_sq_thread(void *data)continue ; } -/* -* Drop cur_mm before scheduling, we can't hold it for -* long periods (or over schedule()). Do this before -* adding ourselves to the waitqueue, as the unuse/drop -* may sleep. -*/ -if (cur_mm) { -unuse_mm (cur_mm); -mmput (cur_mm); - cur_mm =NULL ; - } -prepare_to_wait (&ctx->sqo_wait, &wait,TASK_INTERRUPTIBLE );
Signature · 1 line
2.24.1
Quoted 9 lines · Stefano Garzarella
This patch drops '
cur_mm' before callingcond_resched(), to prevent thesq_threadfrom spinning even when the user process is finished.Before this patch, if the user process ended without closing the
io_uringfd, thesq_threadcontinues to spin until the 'sq_thread_idle' timeout ends.In the worst case where the '
sq_thread_idle' parameter is bigger thanINT_MAX, thesq_threadwill spin forever.
Thanks, applied.
Signature · 1 line
Jens Axboe