lkml.org 
[lkml]   [2021]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 106/157] io_uring: clear IOCB_WAITQ for non -EIOCBQUEUED return
    Date
    From: Jens Axboe <axboe@kernel.dk>

    [ Upstream commit b5b0ecb736f1ce1e68eb50613c0cfecff10198eb ]

    The callback can only be armed, if we get -EIOCBQUEUED returned. It's
    important that we clear the WAITQ bit for other cases, otherwise we can
    queue for async retry and filemap will assume that we're armed and
    return -EAGAIN instead of just blocking for the IO.

    Cc: stable@vger.kernel.org # 5.9+
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/io_uring.c | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/fs/io_uring.c b/fs/io_uring.c
    index 7625b3e2db2c..06e9c2181995 100644
    --- a/fs/io_uring.c
    +++ b/fs/io_uring.c
    @@ -3501,6 +3501,7 @@ static int io_read(struct io_kiocb *req, bool force_nonblock,
    goto out_free;
    } else if (ret > 0 && ret < io_size) {
    /* we got some bytes, but not all. retry. */
    + kiocb->ki_flags &= ~IOCB_WAITQ;
    goto retry;
    }
    done:
    --
    2.30.1


    \
     
     \ /
      Last update: 2022-09-17 16:10    [W:13.683 / U:0.672 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site