lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 0884/1157] block: ensure iov_iter advances for added pages
    Date
    From: Keith Busch <kbusch@kernel.org>

    [ Upstream commit 325347d965e7ccf5424a05398807a6d801846612 ]

    There are cases where a bio may not accept additional pages, and the iov
    needs to advance to the last data length that was accepted. The zone
    append used to handle this correctly, but was inadvertently broken when
    the setup was made common with the normal r/w case.

    Fixes: 576ed9135489c ("block: use bio_add_page in bio_iov_iter_get_pages")
    Fixes: c58c0074c54c2 ("block/bio: remove duplicate append pages code")
    Signed-off-by: Keith Busch <kbusch@kernel.org>
    Link: https://lore.kernel.org/r/20220712153256.2202024-1-kbusch@fb.com
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    block/bio.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/block/bio.c b/block/bio.c
    index ee5fe1bb015e..eb7cc591ee93 100644
    --- a/block/bio.c
    +++ b/block/bio.c
    @@ -1211,6 +1211,7 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)
    ssize_t size, left;
    unsigned len, i;
    size_t offset;
    + int ret = 0;

    /*
    * Move page array up in the allocated memory for the bio vecs as far as
    @@ -1226,7 +1227,6 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)

    for (left = size, i = 0; left > 0; left -= len, i++) {
    struct page *page = pages[i];
    - int ret;

    len = min_t(size_t, PAGE_SIZE - offset, left);
    if (bio_op(bio) == REQ_OP_ZONE_APPEND)
    @@ -1237,13 +1237,13 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)

    if (ret) {
    bio_put_pages(pages + i, left, offset);
    - return ret;
    + break;
    }
    offset = 0;
    }

    - iov_iter_advance(iter, size);
    - return 0;
    + iov_iter_advance(iter, size - left);
    + return ret;
    }

    /**
    --
    2.35.1


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