niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

iomap: Convert iomap_add_to_ioend() to take a folio

Browse source 
We still iterate one block at a time, but now we call compound_head()
less often.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2021-11-02 12:45:12 -04:00
parent 81d4782a74
commit e735c00794
1 changed files with 34 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
fs/iomap/buffered-io.c
View file

@ -1263,29 +1263,29 @@ iomap_can_add_to_ioend(struct iomap_writepage_ctx *wpc, loff_t offset,
* first; otherwise finish off the current ioend and start another. * first; otherwise finish off the current ioend and start another.
*/ */
static void static void
iomap_add_to_ioend(struct inode *inode, loff_t offset, struct page *page, iomap_add_to_ioend(struct inode *inode, loff_t pos, struct folio *folio,
struct iomap_page *iop, struct iomap_writepage_ctx *wpc, struct iomap_page *iop, struct iomap_writepage_ctx *wpc,
struct writeback_control *wbc, struct list_head *iolist) struct writeback_control *wbc, struct list_head *iolist)
{ {
sector_t sector = iomap_sector(&wpc->iomap, offset); sector_t sector = iomap_sector(&wpc->iomap, pos);
unsigned len = i_blocksize(inode); unsigned len = i_blocksize(inode);
unsigned poff = offset & (PAGE_SIZE - 1); size_t poff = offset_in_folio(folio, pos);
if (!wpc->ioend || !iomap_can_add_to_ioend(wpc, offset, sector)) { if (!wpc->ioend || !iomap_can_add_to_ioend(wpc, pos, sector)) {
if (wpc->ioend) if (wpc->ioend)
list_add(&wpc->ioend->io_list, iolist); list_add(&wpc->ioend->io_list, iolist);
wpc->ioend = iomap_alloc_ioend(inode, wpc, offset, sector, wbc); wpc->ioend = iomap_alloc_ioend(inode, wpc, pos, sector, wbc);
} }
if (bio_add_page(wpc->ioend->io_bio, page, len, poff) != len) { if (!bio_add_folio(wpc->ioend->io_bio, folio, len, poff)) {
wpc->ioend->io_bio = iomap_chain_bio(wpc->ioend->io_bio); wpc->ioend->io_bio = iomap_chain_bio(wpc->ioend->io_bio);
__bio_add_page(wpc->ioend->io_bio, page, len, poff); bio_add_folio(wpc->ioend->io_bio, folio, len, poff);
} }
if (iop) if (iop)
atomic_add(len, &iop->write_bytes_pending); atomic_add(len, &iop->write_bytes_pending);
wpc->ioend->io_size += len; wpc->ioend->io_size += len;
wbc_account_cgroup_owner(wbc, page, len); wbc_account_cgroup_owner(wbc, &folio->page, len);
} }
/* /*
@ -1307,9 +1307,8 @@ iomap_add_to_ioend(struct inode *inode, loff_t offset, struct page *page,
static int static int
iomap_writepage_map(struct iomap_writepage_ctx *wpc, iomap_writepage_map(struct iomap_writepage_ctx *wpc,
struct writeback_control *wbc, struct inode *inode, struct writeback_control *wbc, struct inode *inode,
struct page *page, u64 end_pos) struct folio *folio, u64 end_pos)
{ {
struct folio *folio = page_folio(page);
struct iomap_page *iop = iomap_page_create(inode, folio); struct iomap_page *iop = iomap_page_create(inode, folio);
struct iomap_ioend *ioend, *next; struct iomap_ioend *ioend, *next;
unsigned len = i_blocksize(inode); unsigned len = i_blocksize(inode);
@ -1336,15 +1335,15 @@ iomap_writepage_map(struct iomap_writepage_ctx *wpc,
continue; continue;
if (wpc->iomap.type == IOMAP_HOLE) if (wpc->iomap.type == IOMAP_HOLE)
continue; continue;
iomap_add_to_ioend(inode, pos, page, iop, wpc, wbc, iomap_add_to_ioend(inode, pos, folio, iop, wpc, wbc,
&submit_list); &submit_list);
count++; count++;
} }
WARN_ON_ONCE(!wpc->ioend && !list_empty(&submit_list)); WARN_ON_ONCE(!wpc->ioend && !list_empty(&submit_list));
WARN_ON_ONCE(!PageLocked(page)); WARN_ON_ONCE(!folio_test_locked(folio));
WARN_ON_ONCE(PageWriteback(page)); WARN_ON_ONCE(folio_test_writeback(folio));
WARN_ON_ONCE(PageDirty(page)); WARN_ON_ONCE(folio_test_dirty(folio));
/* /*
* We cannot cancel the ioend directly here on error. We may have * We cannot cancel the ioend directly here on error. We may have
@ -1362,14 +1361,14 @@ iomap_writepage_map(struct iomap_writepage_ctx *wpc,
if (wpc->ops->discard_folio) if (wpc->ops->discard_folio)
wpc->ops->discard_folio(folio, pos); wpc->ops->discard_folio(folio, pos);
if (!count) { if (!count) {
ClearPageUptodate(page); folio_clear_uptodate(folio);
unlock_page(page); folio_unlock(folio);
goto done; goto done;
} }
} }
set_page_writeback(page); folio_start_writeback(folio);
unlock_page(page); folio_unlock(folio);
/* /*
* Preserve the original error if there was one; catch * Preserve the original error if there was one; catch
@ -1390,9 +1389,9 @@ iomap_writepage_map(struct iomap_writepage_ctx *wpc,
* with a partial page truncate on a sub-page block sized filesystem. * with a partial page truncate on a sub-page block sized filesystem.
*/ */
if (!count) if (!count)
end_page_writeback(page); folio_end_writeback(folio);
done: done:
mapping_set_error(page->mapping, error); mapping_set_error(folio->mapping, error);
return error; return error;
} }
@ -1406,14 +1405,15 @@ done:
static int static int
iomap_do_writepage(struct page *page, struct writeback_control *wbc, void *data) iomap_do_writepage(struct page *page, struct writeback_control *wbc, void *data)
{ {
struct folio *folio = page_folio(page);
struct iomap_writepage_ctx *wpc = data; struct iomap_writepage_ctx *wpc = data;
struct inode *inode = page->mapping->host; struct inode *inode = folio->mapping->host;
u64 end_pos, isize; u64 end_pos, isize;
trace_iomap_writepage(inode, page_offset(page), PAGE_SIZE); trace_iomap_writepage(inode, folio_pos(folio), folio_size(folio));
/* /*
* Refuse to write the page out if we're called from reclaim context. * Refuse to write the folio out if we're called from reclaim context.
* *
* This avoids stack overflows when called from deeply used stacks in * This avoids stack overflows when called from deeply used stacks in
* random callers for direct reclaim or memcg reclaim. We explicitly * random callers for direct reclaim or memcg reclaim. We explicitly
@ -1427,10 +1427,10 @@ iomap_do_writepage(struct page *page, struct writeback_control *wbc, void *data)
goto redirty; goto redirty;
/* /*
* Is this page beyond the end of the file? * Is this folio beyond the end of the file?
* *
* The page index is less than the end_index, adjust the end_offset * The folio index is less than the end_index, adjust the end_pos
* to the highest offset that this page should represent. * to the highest offset that this folio should represent.
* ----------------------------------------------------- * -----------------------------------------------------
* | file mapping | <EOF> | * | file mapping | <EOF> |
* ----------------------------------------------------- * -----------------------------------------------------
@ -1440,7 +1440,7 @@ iomap_do_writepage(struct page *page, struct writeback_control *wbc, void *data)
* ---------------------------------^------------------| * ---------------------------------^------------------|
*/ */
isize = i_size_read(inode); isize = i_size_read(inode);
end_pos = page_offset(page) + PAGE_SIZE; end_pos = folio_pos(folio) + folio_size(folio);
if (end_pos > isize) { if (end_pos > isize) {
/* /*
* Check whether the page to write out is beyond or straddles * Check whether the page to write out is beyond or straddles
@ -1453,7 +1453,7 @@ iomap_do_writepage(struct page *page, struct writeback_control *wbc, void *data)
* | | Straddles | * | | Straddles |
* ---------------------------------^-----------|--------| * ---------------------------------^-----------|--------|
*/ */
size_t poff = offset_in_page(isize); size_t poff = offset_in_folio(folio, isize);
pgoff_t end_index = isize >> PAGE_SHIFT; pgoff_t end_index = isize >> PAGE_SHIFT;
/* /*
@ -1473,8 +1473,8 @@ iomap_do_writepage(struct page *page, struct writeback_control *wbc, void *data)
* checking if the page is totally beyond i_size or if its * checking if the page is totally beyond i_size or if its
* offset is just equal to the EOF. * offset is just equal to the EOF.
*/ */
if (page->index > end_index || if (folio->index > end_index ||
(page->index == end_index && poff == 0)) (folio->index == end_index && poff == 0))
goto redirty; goto redirty;
/* /*
@ -1485,17 +1485,15 @@ iomap_do_writepage(struct page *page, struct writeback_control *wbc, void *data)
* memory is zeroed when mapped, and writes to that region are * memory is zeroed when mapped, and writes to that region are
* not written out to the file." * not written out to the file."
*/ */
zero_user_segment(page, poff, PAGE_SIZE); folio_zero_segment(folio, poff, folio_size(folio));
/* Adjust the end_offset to the end of file */
end_pos = isize; end_pos = isize;
} }
return iomap_writepage_map(wpc, wbc, inode, page, end_pos); return iomap_writepage_map(wpc, wbc, inode, folio, end_pos);
redirty: redirty:
redirty_page_for_writepage(wbc, page); folio_redirty_for_writepage(wbc, folio);
unlock_page(page); folio_unlock(folio);
return 0; return 0;
} }