Re: [PATCH] io_uring: fix wrong condition to grab uring lock

[Pavel Begunkov <asml.silence@gmail.com>]

On 10/14/21 15:04, Hao Xu wrote:
> Grab uring lock when we are in io-worker rather than in the original
> or system-wq context since we already hold it in these two situation.

Good catch, lgtm


> Signed-off-by: Hao Xu <haoxu@linux.alibaba.com>
> ---
>   fs/io_uring.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index 73135c5c6168..e2ed21c65f71 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -2890,7 +2890,7 @@ static void kiocb_done(struct kiocb *kiocb, ssize_t ret,
>   			struct io_ring_ctx *ctx = req->ctx;
>   
>   			req_set_fail(req);
> -			if (issue_flags & IO_URING_F_NONBLOCK) {
> +			if (!(issue_flags & IO_URING_F_NONBLOCK)) {
>   				mutex_lock(&ctx->uring_lock);
>   				__io_req_complete(req, issue_flags, ret, cflags);
>   				mutex_unlock(&ctx->uring_lock);
> 

-- 
Pavel Begunkov