mm: add page_cache_readahead_unbounded

ext4 and f2fs have duplicated the guts of the readahead code so they can
read past i_size.  Instead, separate out the guts of the readahead code
so they can call it directly.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Tested-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: William Kucharski <william.kucharski@oracle.com>
Reviewed-by: Eric Biggers <ebiggers@google.com>
Cc: Chao Yu <yuchao0@huawei.com>
Cc: Cong Wang <xiyou.wangcong@gmail.com>
Cc: Darrick J. Wong <darrick.wong@oracle.com>
Cc: Dave Chinner <dchinner@redhat.com>
Cc: Gao Xiang <gaoxiang25@huawei.com>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Zi Yan <ziy@nvidia.com>
Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Cc: Miklos Szeredi <mszeredi@redhat.com>
Link: http://lkml.kernel.org/r/20200414150233.24495-14-willy@infradead.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/ext4/verity.c b/fs/ext4/verity.c
index dc5ec724d889108b2c62940942e1c14013a33c98..dec1244dd062b02aa74f3ef1c5225d6e4e4a101c 100644 (file)
--- a/fs/ext4/verity.c
+++ b/fs/ext4/verity.c
@@ -342,37 +342,6 @@ static int ext4_get_verity_descriptor(struct inode *inode, void *buf,
        return desc_size;
 }
 
-/*
- * Prefetch some pages from the file's Merkle tree.
- *
- * This is basically a stripped-down version of __do_page_cache_readahead()
- * which works on pages past i_size.
- */
-static void ext4_merkle_tree_readahead(struct address_space *mapping,
-                                      pgoff_t start_index, unsigned long count)
-{
-       LIST_HEAD(pages);
-       unsigned int nr_pages = 0;
-       struct page *page;
-       pgoff_t index;
-       struct blk_plug plug;
-
-       for (index = start_index; index < start_index + count; index++) {
-               page = xa_load(&mapping->i_pages, index);
-               if (!page || xa_is_value(page)) {
-                       page = __page_cache_alloc(readahead_gfp_mask(mapping));
-                       if (!page)
-                               break;
-                       page->index = index;
-                       list_add(&page->lru, &pages);
-                       nr_pages++;
-               }
-       }
-       blk_start_plug(&plug);
-       ext4_mpage_readpages(mapping, &pages, NULL, nr_pages, true);
-       blk_finish_plug(&plug);
-}
-
 static struct page *ext4_read_merkle_tree_page(struct inode *inode,
                                               pgoff_t index,
                                               unsigned long num_ra_pages)
@@ -386,8 +355,8 @@ static struct page *ext4_read_merkle_tree_page(struct inode *inode,
                if (page)
                        put_page(page);
                else if (num_ra_pages > 1)
-                       ext4_merkle_tree_readahead(inode->i_mapping, index,
-                                                  num_ra_pages);
+                       page_cache_readahead_unbounded(inode->i_mapping, NULL,
+                                       index, num_ra_pages, 0);
                page = read_mapping_page(inode->i_mapping, index, NULL);
        }
        return page;

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index cdf2f626bea7abc896a5379a1fa815b5367f0afc..ae14e952df4ff45163368135a11c28c5d774e7d1 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -2177,7 +2177,7 @@ out:
  * use ->readpage() or do the necessary surgery to decouple ->readpages()
  * from read-ahead.
  */
-int f2fs_mpage_readpages(struct address_space *mapping,
+static int f2fs_mpage_readpages(struct address_space *mapping,
                        struct list_head *pages, struct page *page,
                        unsigned nr_pages, bool is_readahead)
 {

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 157eec34897046545c16a9b78f36f012811bfc72..b5a5da74c0133ce095f349cbd5aefb18c4ec6514 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3373,9 +3373,6 @@ int f2fs_reserve_new_block(struct dnode_of_data *dn);
 int f2fs_get_block(struct dnode_of_data *dn, pgoff_t index);
 int f2fs_preallocate_blocks(struct kiocb *iocb, struct iov_iter *from);
 int f2fs_reserve_block(struct dnode_of_data *dn, pgoff_t index);
-int f2fs_mpage_readpages(struct address_space *mapping,
-                       struct list_head *pages, struct page *page,
-                       unsigned nr_pages, bool is_readahead);
 struct page *f2fs_get_read_data_page(struct inode *inode, pgoff_t index,
                        int op_flags, bool for_write);
 struct page *f2fs_find_data_page(struct inode *inode, pgoff_t index);

diff --git a/fs/f2fs/verity.c b/fs/f2fs/verity.c
index d7d430a6f130555997847557794562a80c39b9e0..865c9fb774fbeb5209824bd68fb46d1544dfb703 100644 (file)
--- a/fs/f2fs/verity.c
+++ b/fs/f2fs/verity.c
@@ -222,37 +222,6 @@ static int f2fs_get_verity_descriptor(struct inode *inode, void *buf,
        return size;
 }
 
-/*
- * Prefetch some pages from the file's Merkle tree.
- *
- * This is basically a stripped-down version of __do_page_cache_readahead()
- * which works on pages past i_size.
- */
-static void f2fs_merkle_tree_readahead(struct address_space *mapping,
-                                      pgoff_t start_index, unsigned long count)
-{
-       LIST_HEAD(pages);
-       unsigned int nr_pages = 0;
-       struct page *page;
-       pgoff_t index;
-       struct blk_plug plug;
-
-       for (index = start_index; index < start_index + count; index++) {
-               page = xa_load(&mapping->i_pages, index);
-               if (!page || xa_is_value(page)) {
-                       page = __page_cache_alloc(readahead_gfp_mask(mapping));
-                       if (!page)
-                               break;
-                       page->index = index;
-                       list_add(&page->lru, &pages);
-                       nr_pages++;
-               }
-       }
-       blk_start_plug(&plug);
-       f2fs_mpage_readpages(mapping, &pages, NULL, nr_pages, true);
-       blk_finish_plug(&plug);
-}
-
 static struct page *f2fs_read_merkle_tree_page(struct inode *inode,
                                               pgoff_t index,
                                               unsigned long num_ra_pages)
@@ -266,8 +235,8 @@ static struct page *f2fs_read_merkle_tree_page(struct inode *inode,
                if (page)
                        put_page(page);
                else if (num_ra_pages > 1)
-                       f2fs_merkle_tree_readahead(inode->i_mapping, index,
-                                                  num_ra_pages);
+                       page_cache_readahead_unbounded(inode->i_mapping, NULL,
+                                       index, num_ra_pages, 0);
                page = read_mapping_page(inode->i_mapping, index, NULL);
        }
        return page;

diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index c3bf73263ec991048b0a18e1b455e205c5defa10..c6348c50136f3c045cd756906395e89f6b9fa7d4 100644 (file)
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -625,6 +625,9 @@ void page_cache_sync_readahead(struct address_space *, struct file_ra_state *,
 void page_cache_async_readahead(struct address_space *, struct file_ra_state *,
                struct file *, struct page *, pgoff_t index,
                unsigned long req_count);
+void page_cache_readahead_unbounded(struct address_space *, struct file *,
+               pgoff_t index, unsigned long nr_to_read,
+               unsigned long lookahead_count);
 
 /*
  * Like add_to_page_cache_locked, but used to add newly allocated pages:

diff --git a/mm/readahead.c b/mm/readahead.c
index 998fdd23c0b17fe0f17495a9c2f88aa58397d8a9..ae231a5312cbe421af69e8cf5aca35edb2a2439b 100644 (file)
--- a/mm/readahead.c
+++ b/mm/readahead.c
@@ -156,37 +156,34 @@ out:
                rac->_index++;
 }
 
-/*
- * __do_page_cache_readahead() actually reads a chunk of disk.  It allocates
- * the pages first, then submits them for I/O. This avoids the very bad
- * behaviour which would occur if page allocations are causing VM writeback.
- * We really don't want to intermingle reads and writes like that.
+/**
+ * page_cache_readahead_unbounded - Start unchecked readahead.
+ * @mapping: File address space.
+ * @file: This instance of the open file; used for authentication.
+ * @index: First page index to read.
+ * @nr_to_read: The number of pages to read.
+ * @lookahead_size: Where to start the next readahead.
+ *
+ * This function is for filesystems to call when they want to start
+ * readahead beyond a file's stated i_size.  This is almost certainly
+ * not the function you want to call.  Use page_cache_async_readahead()
+ * or page_cache_sync_readahead() instead.
+ *
+ * Context: File is referenced by caller.  Mutexes may be held by caller.
+ * May sleep, but will not reenter filesystem to reclaim memory.
  */
-void __do_page_cache_readahead(struct address_space *mapping,
-               struct file *filp, pgoff_t index, unsigned long nr_to_read,
+void page_cache_readahead_unbounded(struct address_space *mapping,
+               struct file *file, pgoff_t index, unsigned long nr_to_read,
                unsigned long lookahead_size)
 {
-       struct inode *inode = mapping->host;
        LIST_HEAD(page_pool);
-       loff_t isize = i_size_read(inode);
        gfp_t gfp_mask = readahead_gfp_mask(mapping);
        struct readahead_control rac = {
                .mapping = mapping,
-               .file = filp,
+               .file = file,
                ._index = index,
        };
        unsigned long i;
-       pgoff_t end_index;      /* The last page we want to read */
-
-       if (isize == 0)
-               return;
-
-       end_index = (isize - 1) >> PAGE_SHIFT;
-       if (index > end_index)
-               return;
-       /* Don't read past the page containing the last byte of the file */
-       if (nr_to_read > end_index - index)
-               nr_to_read = end_index - index + 1;
 
        /*
         * Preallocate as many pages as we will need.
@@ -230,6 +227,35 @@ void __do_page_cache_readahead(struct address_space *mapping,
         */
        read_pages(&rac, &page_pool, false);
 }
+EXPORT_SYMBOL_GPL(page_cache_readahead_unbounded);
+
+/*
+ * __do_page_cache_readahead() actually reads a chunk of disk.  It allocates
+ * the pages first, then submits them for I/O. This avoids the very bad
+ * behaviour which would occur if page allocations are causing VM writeback.
+ * We really don't want to intermingle reads and writes like that.
+ */
+void __do_page_cache_readahead(struct address_space *mapping,
+               struct file *file, pgoff_t index, unsigned long nr_to_read,
+               unsigned long lookahead_size)
+{
+       struct inode *inode = mapping->host;
+       loff_t isize = i_size_read(inode);
+       pgoff_t end_index;      /* The last page we want to read */
+
+       if (isize == 0)
+               return;
+
+       end_index = (isize - 1) >> PAGE_SHIFT;
+       if (index > end_index)
+               return;
+       /* Don't read past the page containing the last byte of the file */
+       if (nr_to_read > end_index - index)
+               nr_to_read = end_index - index + 1;
+
+       page_cache_readahead_unbounded(mapping, file, index, nr_to_read,
+                       lookahead_size);
+}
 
 /*
  * Chunk the readahead into 2 megabyte units, so that we don't pin too much