lkml.org 
[lkml]   [2021]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 208/215] io_uring: fix clear IORING_SETUP_R_DISABLED in wrong function
    Date
    From: Yang Yingliang <yangyingliang@huawei.com>

    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@huawei.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    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);
    }

    \
     
     \ /
      Last update: 2021-07-15 21:04    [W:4.227 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site