lkml.org 
[lkml]   [2020]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 103/142] Revert "block: end bio with BLK_STS_AGAIN in case of non-mq devs and REQ_NOWAIT"
    Date
    From: Jens Axboe <axboe@kernel.dk>

    [ Upstream commit b0beb28097fa04177b3769f4bb7a0d0d9c4ae76e ]

    This reverts commit c58c1f83436b501d45d4050fd1296d71a9760bcb.

    io_uring does do the right thing for this case, and we're still returning
    -EAGAIN to userspace for the cases we don't support. Revert this change
    to avoid doing endless spins of resubmits.

    Cc: stable@vger.kernel.org # v5.6
    Reported-by: Bijan Mottahedeh <bijan.mottahedeh@oracle.com>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    block/blk-core.c | 11 ++++-------
    1 file changed, 4 insertions(+), 7 deletions(-)

    diff --git a/block/blk-core.c b/block/blk-core.c
    index 1075aaff606d..d5e668ec751b 100644
    --- a/block/blk-core.c
    +++ b/block/blk-core.c
    @@ -886,14 +886,11 @@ generic_make_request_checks(struct bio *bio)
    }

    /*
    - * Non-mq queues do not honor REQ_NOWAIT, so complete a bio
    - * with BLK_STS_AGAIN status in order to catch -EAGAIN and
    - * to give a chance to the caller to repeat request gracefully.
    + * For a REQ_NOWAIT based request, return -EOPNOTSUPP
    + * if queue is not a request based queue.
    */
    - if ((bio->bi_opf & REQ_NOWAIT) && !queue_is_mq(q)) {
    - status = BLK_STS_AGAIN;
    - goto end_io;
    - }
    + if ((bio->bi_opf & REQ_NOWAIT) && !queue_is_mq(q))
    + goto not_supported;

    if (should_fail_bio(bio))
    goto end_io;
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-01 21:09    [W:2.516 / U:0.380 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site