From: Matthew Wilcox <willy@infradead.org>
To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Subject: [PATCH 02/15] fs: Introduce i_blocks_per_page
Date: Tue, 24 Sep 2019 17:52:01 -0700 [thread overview]
Message-ID: <20190925005214.27240-3-willy@infradead.org> (raw)
In-Reply-To: <20190925005214.27240-1-willy@infradead.org>
From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
This helper is useful for both large pages in the page cache and for
supporting block size larger than page size. Convert some example
users (we have a few different ways of writing this idiom).
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
fs/iomap/buffered-io.c | 4 ++--
fs/jfs/jfs_metapage.c | 2 +-
fs/xfs/xfs_aops.c | 8 ++++----
include/linux/pagemap.h | 13 +++++++++++++
4 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index e25901ae3ff4..0e76a4b6d98a 100644
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -24,7 +24,7 @@ iomap_page_create(struct inode *inode, struct page *page)
{
struct iomap_page *iop = to_iomap_page(page);
- if (iop || i_blocksize(inode) == PAGE_SIZE)
+ if (iop || i_blocks_per_page(inode, page) <= 1)
return iop;
iop = kmalloc(sizeof(*iop), GFP_NOFS | __GFP_NOFAIL);
@@ -128,7 +128,7 @@ iomap_set_range_uptodate(struct page *page, unsigned off, unsigned len)
bool uptodate = true;
if (iop) {
- for (i = 0; i < PAGE_SIZE / i_blocksize(inode); i++) {
+ for (i = 0; i < i_blocks_per_page(inode, page); i++) {
if (i >= first && i <= last)
set_bit(i, iop->uptodate);
else if (!test_bit(i, iop->uptodate))
diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
index a2f5338a5ea1..176580f54af9 100644
--- a/fs/jfs/jfs_metapage.c
+++ b/fs/jfs/jfs_metapage.c
@@ -473,7 +473,7 @@ static int metapage_readpage(struct file *fp, struct page *page)
struct inode *inode = page->mapping->host;
struct bio *bio = NULL;
int block_offset;
- int blocks_per_page = PAGE_SIZE >> inode->i_blkbits;
+ int blocks_per_page = i_blocks_per_page(inode, page);
sector_t page_start; /* address of page in fs blocks */
sector_t pblock;
int xlen;
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index f16d5f196c6b..102cfd8a97d6 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -68,7 +68,7 @@ xfs_finish_page_writeback(
mapping_set_error(inode->i_mapping, -EIO);
}
- ASSERT(iop || i_blocksize(inode) == PAGE_SIZE);
+ ASSERT(iop || i_blocks_per_page(inode, bvec->bv_page) <= 1);
ASSERT(!iop || atomic_read(&iop->write_count) > 0);
if (!iop || atomic_dec_and_test(&iop->write_count))
@@ -839,7 +839,7 @@ xfs_aops_discard_page(
page, ip->i_ino, offset);
error = xfs_bmap_punch_delalloc_range(ip, start_fsb,
- PAGE_SIZE / i_blocksize(inode));
+ i_blocks_per_page(inode, page));
if (error && !XFS_FORCED_SHUTDOWN(mp))
xfs_alert(mp, "page discard unable to remove delalloc mapping.");
out_invalidate:
@@ -877,7 +877,7 @@ xfs_writepage_map(
uint64_t file_offset; /* file offset of page */
int error = 0, count = 0, i;
- ASSERT(iop || i_blocksize(inode) == PAGE_SIZE);
+ ASSERT(iop || i_blocks_per_page(inode, page) <= 1);
ASSERT(!iop || atomic_read(&iop->write_count) == 0);
/*
@@ -886,7 +886,7 @@ xfs_writepage_map(
* one.
*/
for (i = 0, file_offset = page_offset(page);
- i < (PAGE_SIZE >> inode->i_blkbits) && file_offset < end_offset;
+ i < i_blocks_per_page(inode, page) && file_offset < end_offset;
i++, file_offset += len) {
if (iop && !test_bit(i, iop->uptodate))
continue;
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 37a4d9e32cd3..750770a2c685 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -636,4 +636,17 @@ static inline unsigned long dir_pages(struct inode *inode)
PAGE_SHIFT;
}
+/**
+ * i_blocks_per_page - How many blocks fit in this page.
+ * @inode: The inode which contains the blocks.
+ * @page: The (potentially large) page.
+ *
+ * Context: Any context.
+ * Return: The number of filesystem blocks covered by this page.
+ */
+static inline
+unsigned int i_blocks_per_page(struct inode *inode, struct page *page)
+{
+ return page_size(page) >> inode->i_blkbits;
+}
#endif /* _LINUX_PAGEMAP_H */
--
2.23.0
next prev parent reply other threads:[~2019-09-25 0:53 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-25 0:51 [RFC 00/15] Large pages in the page-cache Matthew Wilcox
2019-09-25 0:52 ` [PATCH 01/15] mm: Use vm_fault error code directly Matthew Wilcox
2019-09-26 13:55 ` Kirill A. Shutemov
2019-09-25 0:52 ` Matthew Wilcox [this message]
2019-09-25 8:36 ` [PATCH 02/15] fs: Introduce i_blocks_per_page Dave Chinner
2019-10-04 19:28 ` Matthew Wilcox
2019-10-08 3:53 ` Dave Chinner
2019-09-25 0:52 ` [PATCH 03/15] mm: Add file_offset_of_ helpers Matthew Wilcox
2019-09-26 14:02 ` Kirill A. Shutemov
2019-10-04 19:39 ` Matthew Wilcox
2019-09-25 0:52 ` [PATCH 04/15] iomap: Support large pages Matthew Wilcox
2019-09-25 0:52 ` [PATCH 05/15] xfs: " Matthew Wilcox
2019-09-25 0:52 ` [PATCH 06/15] xfs: Pass a page to xfs_finish_page_writeback Matthew Wilcox
2019-09-25 0:52 ` [PATCH 07/15] mm: Make prep_transhuge_page tail-callable Matthew Wilcox
2019-09-26 14:13 ` Kirill A. Shutemov
2019-09-25 0:52 ` [PATCH 08/15] mm: Add __page_cache_alloc_order Matthew Wilcox
2019-09-26 14:15 ` Kirill A. Shutemov
2019-09-25 0:52 ` [PATCH 09/15] mm: Allow large pages to be added to the page cache Matthew Wilcox
2019-09-26 14:22 ` Kirill A. Shutemov
2019-09-25 0:52 ` [PATCH 10/15] mm: Allow find_get_page to be used for large pages Matthew Wilcox
2019-10-01 10:32 ` Kirill A. Shutemov
2019-09-25 0:52 ` [PATCH 11/15] mm: Remove hpage_nr_pages Matthew Wilcox
2019-10-01 10:35 ` Kirill A. Shutemov
2019-09-25 0:52 ` [PATCH 12/15] mm: Support removing arbitrary sized pages from mapping Matthew Wilcox
2019-10-01 10:39 ` Kirill A. Shutemov
2019-09-25 0:52 ` [PATCH 13/15] mm: Add a huge page fault handler for files Matthew Wilcox
2019-10-01 10:42 ` Kirill A. Shutemov
2019-09-25 0:52 ` [PATCH 14/15] mm: Align THP mappings for non-DAX Matthew Wilcox
2019-10-01 10:45 ` Kirill A. Shutemov
2019-10-01 11:21 ` William Kucharski
2019-10-01 11:32 ` Kirill A. Shutemov
2019-10-01 12:18 ` William Kucharski
2019-10-01 14:20 ` Kirill A. Shutemov
2019-10-01 16:08 ` William Kucharski
2019-10-02 0:15 ` Kirill A. Shutemov
2019-09-25 0:52 ` [PATCH 15/15] xfs: Use filemap_huge_fault Matthew Wilcox
[not found] ` <20191002130753.7680-1-hdanton@sina.com>
2019-10-04 19:33 ` [PATCH 03/15] mm: Add file_offset_of_ helpers Matthew Wilcox
[not found] ` <20191002133211.15696-1-hdanton@sina.com>
2019-10-04 19:34 ` [PATCH 04/15] iomap: Support large pages Matthew Wilcox
[not found] ` <20191003040846.17604-1-hdanton@sina.com>
2019-10-04 19:35 ` [PATCH 06/15] xfs: Pass a page to xfs_finish_page_writeback Matthew Wilcox
[not found] ` <20191003050859.18140-1-hdanton@sina.com>
2019-10-04 19:36 ` [PATCH 11/15] mm: Remove hpage_nr_pages Matthew Wilcox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190925005214.27240-3-willy@infradead.org \
--to=willy@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).