lkml.org 
[lkml]   [2020]   [Jun]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 29/51] iomap: Support THPs in write paths
    Date
    From: "Matthew Wilcox (Oracle)" <willy@infradead.org>

    Use thp_size() instead of PAGE_SIZE and offset_in_thp() instead of
    offset_in_page(). Also simplify the logic in iomap_do_writepage()
    for determining end of file.

    Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
    ---
    fs/iomap/buffered-io.c | 44 +++++++++++++++++++++++-------------------
    1 file changed, 24 insertions(+), 20 deletions(-)

    diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
    index e445ee5f0521..9275268ea97e 100644
    --- a/fs/iomap/buffered-io.c
    +++ b/fs/iomap/buffered-io.c
    @@ -460,7 +460,7 @@ iomap_is_partially_uptodate(struct page *page, unsigned long from,
    unsigned i;

    /* Limit range to one page */
    - len = min_t(unsigned, PAGE_SIZE - from, count);
    + len = min_t(unsigned, thp_size(page) - from, count);

    /* First and last blocks in range within page */
    first = from >> inode->i_blkbits;
    @@ -654,8 +654,8 @@ static ssize_t iomap_write_begin(struct inode *inode, loff_t pos, loff_t len,
    else if (iomap->flags & IOMAP_F_BUFFER_HEAD)
    status = __block_write_begin_int(page, pos, len, NULL, srcmap);
    else
    - status = __iomap_write_begin(inode, pos, len, flags, page,
    - srcmap);
    + status = __iomap_write_begin(inode, pos, len, flags,
    + thp_head(page), srcmap);

    if (status < 0)
    goto out_unlock;
    @@ -717,7 +717,7 @@ static size_t __iomap_write_end(struct inode *inode, loff_t pos, size_t len,
    */
    if (unlikely(copied < len && !PageUptodate(page)))
    return 0;
    - iomap_set_range_uptodate(page, offset_in_page(pos), len);
    + iomap_set_range_uptodate(page, offset_in_thp(page, pos), len);
    iomap_set_page_dirty(page);
    return copied;
    }
    @@ -753,7 +753,8 @@ static size_t iomap_write_end(struct inode *inode, loff_t pos, size_t len,
    ret = block_write_end(NULL, inode->i_mapping, pos, len, copied,
    page, NULL);
    } else {
    - ret = __iomap_write_end(inode, pos, len, copied, page);
    + ret = __iomap_write_end(inode, pos, len, copied,
    + thp_head(page));
    }

    /*
    @@ -792,6 +793,10 @@ iomap_write_actor(struct inode *inode, loff_t pos, loff_t length, void *data,
    unsigned long bytes; /* Bytes to write to page */
    size_t copied; /* Bytes copied from user */

    + /*
    + * XXX: We don't know what size page we'll find in the
    + * page cache, so only copy up to a regular page boundary.
    + */
    offset = offset_in_page(pos);
    bytes = min_t(unsigned long, PAGE_SIZE - offset,
    iov_iter_count(i));
    @@ -1116,7 +1121,7 @@ iomap_finish_ioend(struct iomap_ioend *ioend, int error)
    next = bio->bi_private;

    /* walk each page on bio, ending page IO on them */
    - bio_for_each_segment_all(bv, bio, iter_all)
    + bio_for_each_thp_segment_all(bv, bio, iter_all)
    iomap_finish_page_writeback(inode, bv->bv_page, error);
    bio_put(bio);
    }
    @@ -1322,7 +1327,7 @@ iomap_add_to_ioend(struct inode *inode, loff_t offset, struct page *page,
    {
    sector_t sector = iomap_sector(&wpc->iomap, offset);
    unsigned len = i_blocksize(inode);
    - unsigned poff = offset & (PAGE_SIZE - 1);
    + unsigned poff = offset & (thp_size(page) - 1);
    bool merged, same_page = false;

    if (!wpc->ioend || !iomap_can_add_to_ioend(wpc, offset, sector)) {
    @@ -1372,8 +1377,9 @@ iomap_writepage_map(struct iomap_writepage_ctx *wpc,
    struct iomap_page *iop = iomap_page_create(inode, page);
    struct iomap_ioend *ioend, *next;
    unsigned len = i_blocksize(inode);
    - u64 file_offset; /* file offset of page */
    + loff_t pos;
    int error = 0, count = 0, i;
    + int nr_blocks = i_blocks_per_page(inode, page);
    LIST_HEAD(submit_list);

    WARN_ON_ONCE(iop && atomic_read(&iop->write_count) != 0);
    @@ -1383,20 +1389,20 @@ iomap_writepage_map(struct iomap_writepage_ctx *wpc,
    * end of the current map or find the current map invalid, grab a new
    * one.
    */
    - for (i = 0, file_offset = page_offset(page);
    - i < (PAGE_SIZE >> inode->i_blkbits) && file_offset < end_offset;
    - i++, file_offset += len) {
    + for (i = 0, pos = page_offset(page);
    + i < nr_blocks && pos < end_offset;
    + i++, pos += len) {
    if (iop && !test_bit(i, iop->uptodate))
    continue;

    - error = wpc->ops->map_blocks(wpc, inode, file_offset);
    + error = wpc->ops->map_blocks(wpc, inode, pos);
    if (error)
    break;
    if (WARN_ON_ONCE(wpc->iomap.type == IOMAP_INLINE))
    continue;
    if (wpc->iomap.type == IOMAP_HOLE)
    continue;
    - iomap_add_to_ioend(inode, file_offset, page, iop, wpc, wbc,
    + iomap_add_to_ioend(inode, pos, page, iop, wpc, wbc,
    &submit_list);
    count++;
    }
    @@ -1478,7 +1484,6 @@ iomap_do_writepage(struct page *page, struct writeback_control *wbc, void *data)
    {
    struct iomap_writepage_ctx *wpc = data;
    struct inode *inode = page->mapping->host;
    - pgoff_t end_index;
    u64 end_offset;
    loff_t offset;

    @@ -1519,10 +1524,8 @@ iomap_do_writepage(struct page *page, struct writeback_control *wbc, void *data)
    * ---------------------------------^------------------|
    */
    offset = i_size_read(inode);
    - end_index = offset >> PAGE_SHIFT;
    - if (page->index < end_index)
    - end_offset = (loff_t)(page->index + 1) << PAGE_SHIFT;
    - else {
    + end_offset = page_offset(page) + thp_size(page);
    + if (end_offset > offset) {
    /*
    * Check whether the page to write out is beyond or straddles
    * i_size or not.
    @@ -1534,7 +1537,8 @@ iomap_do_writepage(struct page *page, struct writeback_control *wbc, void *data)
    * | | Straddles |
    * ---------------------------------^-----------|--------|
    */
    - unsigned offset_into_page = offset & (PAGE_SIZE - 1);
    + unsigned offset_into_page = offset_in_thp(page, offset);
    + pgoff_t end_index = offset >> PAGE_SHIFT;

    /*
    * Skip the page if it is fully outside i_size, e.g. due to a
    @@ -1565,7 +1569,7 @@ iomap_do_writepage(struct page *page, struct writeback_control *wbc, void *data)
    * memory is zeroed when mapped, and writes to that region are
    * not written out to the file."
    */
    - zero_user_segment(page, offset_into_page, PAGE_SIZE);
    + zero_user_segment(page, offset_into_page, thp_size(page));

    /* Adjust the end_offset to the end of file */
    end_offset = offset;
    --
    2.26.2
    \
     
     \ /
      Last update: 2020-06-10 22:16    [W:5.343 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site