Change readahead API
Subsystems (29)
Matthew Wilcox
maintainerv8 cover Change readahead API
From: "Matthew Wilcox (Oracle)" <[email protected]>
This series adds a readahead address_space operation to replace the readpages operation. The key difference is that pages are added to the page cache as they are allocated (and then looked up by the filesystem) instead of passing them on a list to the readpages operation and having the filesystem add them to the page cache. It's a net reduction in code for each implementation, more efficient than walking a list, and solves the direct-write vs buffered-read problem reported by yu kuai at
https://lore.kernel.org/linux-fsdevel/20200116063601.39201-1-yukuai3 at huawei.com/
The only unconverted filesystems are those which use fscache. Their conversion is pending Dave Howells' rewrite which will make the conversion substantially easier.
I want to thank the reviewers/testers; Dave Chinner, John Hubbard, Eric Biggers, Johannes Thumshirn, Dave Sterba, Zi Yan and Christoph Hellwig have done a marvellous job of providing constructive criticism. I've tried to take it all on board, but I may have missed something simply because you've done such a thorough job.
This series can also be found at
http://git.infradead.org/users/willy/linux-dax.git/shortlog/refs/tags/readahead_v8
v8:
- btrfs, ext4 and xfs all survive an xfstests run (thanks to Kent Overstreet for providing the ktest framework)
- iomap restructuring dropped due to Christoph's opposition and the redesign of readahead_page() meaning it wasn't needed any more.
- f2fs_mpage_readpages() made static again
- Made iomap_readahead() comment more useful
- Added kernel-doc for the entire readahead_control API
- Conditionally zero batch_count in readahead_page() (requested by John)
- Hold RCU read lock while iterating over the xarray in readahead_page_batch()
- Iterate over the correct pages in readahead_page_batch()
- Correct the return type of readahead_index() (spotted by Zi Yan)
- Added a 'skip_page' parameter to read_pages for better documentation purposes and so we can reuse the readahead_control higher in the call chain in future.
- Removed the use_list bool (requested by Christoph)
- Removed the explicit initialisation of _nr_pages to 0 (requested by Christoph & John)
- Add comments explaining why nr_to_read is being capped (requested by John)
- Reshuffled some of the patches:
- Split out adding the readahead_control API from the three patches which added it piecemeal
- Shift the final two mm patches to be with the other mm patches
- Split the f2fs "pass the inode" patch from the "convert to readahead" patch, like ext4
v7:
- Now passes an xfstests run on ext4!
- Documentation improvements
- Move the readahead prototypes out of mm.h (new patch)
- readahead_for_each* iterators are gone; replaced with readahead_page() and readahead_page_batch()
- page_cache_readahead_limit() renamed to page_cache_readahead_unbounded() and arguments changed
- iomap_readahead_actor() restructured differently
- The readahead code no longer uses the word 'offset' to reduce ambiguity
- read_pages() now maintains the rac so we can just call it and continue instead of mucking around with branches
- More assertions
- More readahead functions return void
v6:
- Name the private members of readahead_control with a leading underscore (suggested by Christoph Hellwig)
- Fix whitespace in rst file
- Remove misleading comment in btrfs patch
- Add readahead_next() API and use it in iomap
- Add iomap_readahead kerneldoc.
- Fix the mpage_readahead kerneldoc
- Make various readahead functions return void
- Keep readahead_index() and readahead_offset() pointing to the start of this batch through the body. No current user requires this, but it's less surprising.
- Add kerneldoc for page_cache_readahead_limit
- Make page_idx an unsigned long, and rename it to just 'i'
- Get rid of page_offset local variable
- Add patch to call memalloc_nofs_save() before allocating pages (suggested by Michal Hocko)
- Resplit a lot of patches for more logical progression and easier review (suggested by John Hubbard)
- Added sign-offs where received, and I deemed still relevant
v5 switched to passing a readahead_control struct (mirroring the writepages_control struct passed to writepages). This has a number of advantages:
- It fixes a number of bugs in various implementations, eg forgetting to increment 'start', an off-by-one error in 'nr_pages' or treating 'start' as a byte offset instead of a page offset.
- It allows us to change the arguments without changing all the implementations of ->readahead which just call mpage_readahead() or iomap_readahead()
- Figuring out which pages haven't been attempted by the implementation is more natural this way.
- There's less code in each implementation.
Matthew Wilcox (Oracle) (25):
mm: Move readahead prototypes from mm.h
mm: Return void from various readahead functions
mm: Ignore return value of ->readpages
mm: Move readahead nr_pages check into read_pages
mm: Add new readahead_control API
mm: Use readahead_control to pass arguments
mm: Rename various 'offset' parameters to 'index'
mm: rename readahead loop variable to 'i'
mm: Remove 'page_offset' from readahead loop
mm: Put readahead pages in cache earlier
mm: Add readahead address space operation
mm: Move end_index check out of readahead loop
mm: Add page_cache_readahead_unbounded
mm: Document why we don't set PageReadahead
mm: Use memalloc_nofs_save in readahead path
fs: Convert mpage_readpages to mpage_readahead
btrfs: Convert from readpages to readahead
erofs: Convert uncompressed files from readpages to readahead
erofs: Convert compressed files from readpages to readahead
ext4: Convert from readpages to readahead
ext4: Pass the inode to ext4_mpage_readpages
f2fs: Convert from readpages to readahead
f2fs: Pass the inode to f2fs_mpage_readpages
fuse: Convert from readpages to readahead
iomap: Convert from readpages to readahead
Documentation/filesystems/locking.rst | 6 +- Documentation/filesystems/vfs.rst | 15 ++ block/blk-core.c | 1 + drivers/staging/exfat/exfat_super.c | 7 +- fs/block_dev.c | 7 +- fs/btrfs/extent_io.c | 46 ++--- fs/btrfs/extent_io.h | 3 +- fs/btrfs/inode.c | 16 +- fs/erofs/data.c | 39 ++-- fs/erofs/zdata.c | 29 +-- fs/ext2/inode.c | 10 +- fs/ext4/ext4.h | 5 +- fs/ext4/inode.c | 21 +- fs/ext4/readpage.c | 25 +-- fs/ext4/verity.c | 35 +--- fs/f2fs/data.c | 50 ++--- fs/f2fs/f2fs.h | 3 - fs/f2fs/verity.c | 35 +--- fs/fat/inode.c | 7 +- fs/fuse/file.c | 46 ++--- fs/gfs2/aops.c | 23 +-- fs/hpfs/file.c | 7 +- fs/iomap/buffered-io.c | 92 +++------ fs/iomap/trace.h | 2 +- fs/isofs/inode.c | 7 +- fs/jfs/inode.c | 7 +- fs/mpage.c | 38 +--- fs/nilfs2/inode.c | 15 +- fs/ocfs2/aops.c | 34 ++-- fs/omfs/file.c | 7 +- fs/qnx6/inode.c | 7 +- fs/reiserfs/inode.c | 8 +- fs/udf/inode.c | 7 +- fs/xfs/xfs_aops.c | 13 +- fs/zonefs/super.c | 7 +- include/linux/fs.h | 2 + include/linux/iomap.h | 3 +- include/linux/mm.h | 19 -- include/linux/mpage.h | 4 +- include/linux/pagemap.h | 151 ++++++++++++++ include/trace/events/erofs.h | 6 +- include/trace/events/f2fs.h | 6 +- mm/fadvise.c | 6 +- mm/internal.h | 12 +- mm/migrate.c | 2 +- mm/readahead.c | 278 ++++++++++++++++---------- 46 files changed, 580 insertions(+), 589 deletions(-)
base-commit: 11a48a5a18c63fd7621bb050228cebf13566e4d8
Signature · 1 line
2.25.0
Matthew Wilcox
maintainerPATCH v8 1/25 mm: Move readahead prototypes from mm.h
From: "Matthew Wilcox (Oracle)" <[email protected]>
The readahead code is part of the page cache so should be found in the pagemap.h file. force_page_cache_readahead is only used within mm, so move it to mm/internal.h instead. Remove the parameter names where they add no value, and rename the ones which were actively misleading.
--- block/blk-core.c | 1 + include/linux/mm.h | 19 ------------------- include/linux/pagemap.h | 8 ++++++++ mm/fadvise.c | 2 ++ mm/internal.h | 2 ++ 5 files changed, 13 insertions(+), 19 deletions(-)
block/blk-core.c +1 -0
@@ -20,6 +20,7 @@#include <linux/blk-mq.h> #include <linux/highmem.h> #include <linux/mm.h> +#include <linux/pagemap.h> #include <linux/kernel_stat.h> #include <linux/string.h> #include <linux/init.h>
include/linux/mm.h +0 -19
@@ -2401,25 +2401,6 @@ extern vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf);int __must_check write_one_page (struct page *page);void task_dirty_inc (struct task_struct *tsk); -/* readahead.c */ -#define VM_READAHEAD_PAGES (SZ_128K / PAGE_SIZE) - -int force_page_cache_readahead (struct address_space *mapping,struct file *filp, -pgoff_t offset,unsigned long nr_to_read); - -void page_cache_sync_readahead (struct address_space *mapping, -struct file_ra_state *ra, -struct file *filp, -pgoff_t offset, -unsigned long size); - -void page_cache_async_readahead (struct address_space *mapping, -struct file_ra_state *ra, -struct file *filp, -struct page *pg, -pgoff_t offset, -unsigned long size); -extern unsigned long stack_guard_gap;/* Generic expand stack which grows the stack according to GROWS{UP,DOWN} */ extern int expand_stack (struct vm_area_struct *vma,unsigned long address);
include/linux/pagemap.h +8 -0
@@ -614,6 +614,14 @@ int replace_page_cache_page(struct page *old, struct page *new, gfp_t gfp_mask);void delete_from_page_cache_batch (struct address_space *mapping,struct pagevec *pvec); +#define VM_READAHEAD_PAGES (SZ_128K / PAGE_SIZE) + +void page_cache_sync_readahead (struct address_space *,struct file_ra_state *, +struct file *,pgoff_t index,unsigned long req_count); +void page_cache_async_readahead (struct address_space *,struct file_ra_state *, +struct file *,struct page *,pgoff_t index, +unsigned long req_count); +/* * Like add_to_page_cache_locked, but used to add newly allocated pages: * the page is new, so we can just run __SetPageLocked() against it.
mm/fadvise.c +2 -0
@@ -22,6 +22,8 @@#include <asm/unistd.h> +#include "internal.h" +/* * POSIX_FADV_WILLNEED could set PG_Referenced, and POSIX_FADV_NOREUSE could * deactivate the pages and clear PG_Referenced.
mm/internal.h +2 -0
@@ -49,6 +49,8 @@ void unmap_page_range(struct mmu_gather *tlb, unsigned long addr, unsigned long end, struct zap_details *details); +int force_page_cache_readahead (struct address_space *,struct file *, +pgoff_t index,unsigned long nr_to_read);extern unsigned int __do_page_cache_readahead (struct address_space *mapping,struct file *filp,pgoff_t offset,unsigned long nr_to_read,unsigned long lookahead_size);
Signature · 1 line
2.25.0
Matthew Wilcox
maintainerPATCH v8 2/25 mm: Return void from various readahead functions
In reply to Matthew WilcoxFrom: "Matthew Wilcox (Oracle)" <[email protected]>
ondemand_readahead has two callers, neither of which use the return value. That means that both ra_submit and __do_page_cache_readahead() can return void, and we don't need to worry that a present page in the readahead window causes us to return a smaller nr_pages than we ought to have.
Similarly, no caller uses the return value from force_page_cache_readahead().
--- mm/fadvise.c | 4 ---- mm/internal.h | 12 ++++++------ mm/readahead.c | 31 +++++++++++++------------------ 3 files changed, 19 insertions(+), 28 deletions(-)
mm/fadvise.c +0 -4
@@ -104,10 +104,6 @@ int generic_fadvise(struct file *file, loff_t offset, loff_t len, int advice)if (!nrpages) nrpages = ~0UL ; -/* -* Ignore return value because fadvise() shall return -* success even if filesystem can't retrieve a hint, -*/ force_page_cache_readahead (mapping, file, start_index, nrpages);break ;case POSIX_FADV_NOREUSE :
mm/internal.h +6 -6
@@ -49,20 +49,20 @@ void unmap_page_range(struct mmu_gather *tlb, unsigned long addr, unsigned long end, struct zap_details *details); -int force_page_cache_readahead (struct address_space *,struct file *, +void force_page_cache_readahead (struct address_space *,struct file *,pgoff_t index,unsigned long nr_to_read); -extern unsigned int __do_page_cache_readahead (struct address_space *mapping, -struct file *filp,pgoff_t offset,unsigned long nr_to_read, +void __do_page_cache_readahead (struct address_space *,struct file *, +pgoff_t index,unsigned long nr_to_read,unsigned long lookahead_size);/* * Submit IO for the read-ahead request in file_ra_state. */ -static inline unsigned long ra_submit (struct file_ra_state *ra, +static inline void ra_submit (struct file_ra_state *ra,struct address_space *mapping,struct file *filp) { -return __do_page_cache_readahead (mapping, filp, - ra->start, ra->size, ra->async_size); +__do_page_cache_readahead (mapping, filp, + ra->start, ra->size, ra->async_size); }/*
mm/readahead.c +13 -18
@@ -149,10 +149,8 @@ static int read_pages(struct address_space *mapping, struct file *filp,* 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. -* -* Returns the number of pages requested, or the maximum amount of I/O allowed. */ -unsigned int __do_page_cache_readahead (struct address_space *mapping, +void __do_page_cache_readahead (struct address_space *mapping,struct file *filp,pgoff_t offset,unsigned long nr_to_read,unsigned long lookahead_size) {
@@ -166,7 +164,7 @@ unsigned int __do_page_cache_readahead(struct address_space *mapping,gfp_t gfp_mask =readahead_gfp_mask (mapping);if (isize ==0 ) - goto out; +return ; end_index = ((isize -1 ) >>PAGE_SHIFT );
@@ -211,23 +209,21 @@ unsigned int __do_page_cache_readahead(struct address_space *mapping,if (nr_pages)read_pages (mapping, filp, &page_pool, nr_pages, gfp_mask);BUG_ON (!list_empty (&page_pool)); -out: -return nr_pages; }/* * Chunk the readahead into 2 megabyte units, so that we don't pin too much * memory at once. */ -int force_page_cache_readahead (struct address_space *mapping,struct file *filp, -pgoff_t offset,unsigned long nr_to_read) +void force_page_cache_readahead (struct address_space *mapping, +struct file *filp,pgoff_t offset,unsigned long nr_to_read) {struct backing_dev_info *bdi =inode_to_bdi (mapping->host);struct file_ra_state *ra = &filp->f_ra;unsigned long max_pages;if (unlikely (!mapping->a_ops->readpage && !mapping->a_ops->readpages)) -return -EINVAL ; +return ;/* * If the request exceeds the readahead window, allow the read to
@@ -245,7 +241,6 @@ int force_page_cache_readahead(struct address_space *mapping, struct file *filp, offset += this_chunk; nr_to_read -= this_chunk; } -return 0 ; }/*
@@ -378,11 +373,10 @@ static int try_context_readahead(struct address_space *mapping,/* * A minimal readahead algorithm for trivial sequential/random reads. */ -static unsigned long -ondemand_readahead (struct address_space *mapping, -struct file_ra_state *ra,struct file *filp, -bool hit_readahead_marker,pgoff_t offset, -unsigned long req_size) +static void ondemand_readahead (struct address_space *mapping, +struct file_ra_state *ra,struct file *filp, +bool hit_readahead_marker,pgoff_t offset, +unsigned long req_size) {struct backing_dev_info *bdi =inode_to_bdi (mapping->host);unsigned long max_pages = ra->ra_pages;
@@ -428,7 +422,7 @@ ondemand_readahead(struct address_space *mapping,rcu_read_unlock ();if (!start || start - offset > max_pages) -return 0 ; +return ; ra->start = start; ra->size = start - offset;/* old async_size */
@@ -464,7 +458,8 @@ ondemand_readahead(struct address_space *mapping,* standalone, small random read * Read as is, and do not pollute the readahead state. */ -return __do_page_cache_readahead (mapping, filp, offset, req_size,0 ); +__do_page_cache_readahead (mapping, filp, offset, req_size,0 ); +return ; initial_readahead: ra->start = offset;
@@ -489,7 +484,7 @@ ondemand_readahead(struct address_space *mapping, } } -return ra_submit (ra, mapping, filp); +ra_submit (ra, mapping, filp); }/**
Signature · 1 line
2.25.0
Matthew Wilcox
maintainerPATCH v8 3/25 mm: Ignore return value of ->readpages
In reply to Matthew WilcoxFrom: "Matthew Wilcox (Oracle)" <[email protected]>
We used to assign the return value to a variable, which we then ignored. Remove the pretence of caring.
--- mm/readahead.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
mm/readahead.c +2 -6
@@ -113,17 +113,16 @@ int read_cache_pages(struct address_space *mapping, struct list_head *pages,EXPORT_SYMBOL (read_cache_pages); -static int read_pages (struct address_space *mapping,struct file *filp, +static void read_pages (struct address_space *mapping,struct file *filp,struct list_head *pages,unsigned int nr_pages,gfp_t gfp) {struct blk_plug plug;unsigned page_idx; -int ret;blk_start_plug (&plug);if (mapping->a_ops->readpages) { - ret = mapping->a_ops->readpages (filp, mapping, pages, nr_pages); + mapping->a_ops->readpages (filp, mapping, pages, nr_pages);/* Clean up the remaining pages */ put_pages_list (pages); goto out;
@@ -136,12 +135,9 @@ static int read_pages(struct address_space *mapping, struct file *filp, mapping->a_ops->readpage (filp, page);put_page (page); } - ret =0 ; out:blk_finish_plug (&plug); - -return ret; }/*
Signature · 1 line
2.25.0
Matthew Wilcox
maintainerPATCH v8 4/25 mm: Move readahead nr_pages check into read_pages
In reply to Matthew WilcoxFrom: "Matthew Wilcox (Oracle)" <[email protected]>
Simplify the callers by moving the check for nr_pages and the BUG_ON into read_pages().
--- mm/readahead.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
mm/readahead.c +7 -5
@@ -119,6 +119,9 @@ static void read_pages(struct address_space *mapping, struct file *filp,struct blk_plug plug;unsigned page_idx; +if (!nr_pages) +return ; +blk_start_plug (&plug);if (mapping->a_ops->readpages) {
@@ -138,6 +141,8 @@ static void read_pages(struct address_space *mapping, struct file *filp, out:blk_finish_plug (&plug); + +BUG_ON (!list_empty (pages)); }/*
@@ -180,8 +185,7 @@ void __do_page_cache_readahead(struct address_space *mapping,* contiguous pages before continuing with the next * batch. */ -if (nr_pages) -read_pages (mapping, filp, &page_pool, nr_pages, +read_pages (mapping, filp, &page_pool, nr_pages, gfp_mask); nr_pages =0 ;continue ;
@@ -202,9 +206,7 @@ void __do_page_cache_readahead(struct address_space *mapping,* uptodate then the caller will launch readpage again, and * will then handle the error. */ -if (nr_pages) -read_pages (mapping, filp, &page_pool, nr_pages, gfp_mask); -BUG_ON (!list_empty (&page_pool)); +read_pages (mapping, filp, &page_pool, nr_pages, gfp_mask); }/*
Signature · 1 line
2.25.0
Matthew Wilcox
maintainerPATCH v8 5/25 mm: Add new readahead_control API
In reply to Matthew WilcoxFrom: "Matthew Wilcox (Oracle)" <[email protected]>
Filesystems which implement the upcoming ->readahead method will get their pages by calling readahead_page() or readahead_page_batch(). These functions support large pages, even though none of the filesystems to be converted do yet.
--- include/linux/pagemap.h | 140 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+)
include/linux/pagemap.h +140 -0
@@ -638,6 +638,146 @@ static inline int add_to_page_cache(struct page *page,return error; } +/** +* struct readahead_control - Describes a readahead request. +* +* A readahead request is for consecutive pages. Filesystems which +* implement the ->readahead method should call readahead_page() or +* readahead_page_batch() in a loop and attempt to start I/O against +* each page in the request. +* +* Most of the fields in this struct are private and should be accessed +* by the functions below. +* +* @file: The file, used primarily by network filesystems for authentication. +* May be NULL if invoked internally by the filesystem. +* @mapping: Readahead this filesystem object. +*/ +struct readahead_control { +struct file *file; +struct address_space *mapping; +/* private: use the readahead_* accessors instead */ +pgoff_t _index; +unsigned int _nr_pages; +unsigned int _batch_count; +}; + +/** +* readahead_page - Get the next page to read. +* @rac: The current readahead request. +* +* Context: The page is locked and has an elevated refcount. The caller +* should decreases the refcount once the page has been submitted for I/O +* and unlock the page once all I/O to that page has completed. +* Return: A pointer to the next page, or %NULL if we are done. +*/ +static inline struct page *readahead_page (struct readahead_control *rac) +{ +struct page *page; + +BUG_ON (rac->_batch_count > rac->_nr_pages); + rac->_nr_pages -= rac->_batch_count; + rac->_index += rac->_batch_count; + +if (!rac->_nr_pages) { + rac->_batch_count =0 ; +return NULL ; + } + + page =xa_load (&rac->mapping->i_pages, rac->_index); +VM_BUG_ON_PAGE (!PageLocked (page), page); + rac->_batch_count =hpage_nr_pages (page); + +return page; +} + +static inline unsigned int __readahead_batch (struct readahead_control *rac, +struct page **array,unsigned int array_sz) +{ +unsigned int i =0 ; +XA_STATE (xas, &rac->mapping->i_pages,0 ); +struct page *page; + +BUG_ON (rac->_batch_count > rac->_nr_pages); + rac->_nr_pages -= rac->_batch_count; + rac->_index += rac->_batch_count; + rac->_batch_count =0 ; + +xas_set (&xas, rac->_index); +rcu_read_lock (); +xas_for_each (&xas, page, rac->_index + rac->_nr_pages -1 ) { +VM_BUG_ON_PAGE (!PageLocked (page), page); +VM_BUG_ON_PAGE (PageTail (page), page); + array[i++] = page; + rac->_batch_count +=hpage_nr_pages (page); + +/* +* The page cache isn't using multi-index entries yet, +* so the xas cursor needs to be manually moved to the +* next index. This can be removed once the page cache +* is converted. +*/ +if (PageHead (page)) +xas_set (&xas, rac->_index + rac->_batch_count); + +if (i == array_sz) +break ; + } +rcu_read_unlock (); + +return i; +} + +/** +* readahead_page_batch - Get a batch of pages to read. +* @rac: The current readahead request. +* @array: An array of pointers to struct page. +* +* Context: The pages are locked and have an elevated refcount. The caller +* should decreases the refcount once the page has been submitted for I/O +* and unlock the page once all I/O to that page has completed. +* Return: The number of pages placed in the array. 0 indicates the request +* is complete. +*/ +#define readahead_page_batch (rac, array) \ + __readahead_batch(rac, array, ARRAY_SIZE(array)) + +/** +* readahead_pos - The byte offset into the file of this readahead request. +* @rac: The readahead request. +*/ +static inline loff_t readahead_pos (struct readahead_control *rac) +{ +return (loff_t )rac->_index *PAGE_SIZE ; +} + +/** +* readahead_length - The number of bytes in this readahead request. +* @rac: The readahead request. +*/ +static inline loff_t readahead_length (struct readahead_control *rac) +{ +return (loff_t )rac->_nr_pages *PAGE_SIZE ; +} + +/** +* readahead_index - The index of the first page in this readahead request. +* @rac: The readahead request. +*/ +static inline pgoff_t readahead_index (struct readahead_control *rac) +{ +return rac->_index; +} + +/** +* readahead_count - The number of pages in this readahead request. +* @rac: The readahead request. +*/ +static inline unsigned int readahead_count (struct readahead_control *rac) +{ +return rac->_nr_pages; +} +static inline unsigned long dir_pages (struct inode *inode) { return (unsigned long)(inode->i_size + PAGE_SIZE - 1) >>
Signature · 1 line
2.25.0
Re: [PATCH v8 05/25] mm: Add new readahead_control API
Quoted 8 lines · Matthew Wilcox
From: "Matthew Wilcox (Oracle)" <[email protected]>
Filesystems which implement the upcoming ->readahead method will get their pages by calling
readahead_page()orreadahead_page_batch(). These functions support large pages, even though none of the filesystems to be converted do yet.Signed-off-by Matthew Wilcox (Oracle) <[email protected]>
Looks good,
Matthew Wilcox
maintainerPATCH v8 6/25 mm: Use readahead_control to pass arguments
In reply to Matthew WilcoxFrom: "Matthew Wilcox (Oracle)" <[email protected]>
In this patch, only between __do_page_cache_readahead() and read_pages(), but it will be extended in upcoming patches. The read_pages() function becomes aops centric, as this makes the most sense by the end of the patchset.
--- mm/readahead.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-)
mm/readahead.c +19 -14
@@ -113,29 +113,32 @@ int read_cache_pages(struct address_space *mapping, struct list_head *pages,EXPORT_SYMBOL (read_cache_pages); -static void read_pages (struct address_space *mapping,struct file *filp, -struct list_head *pages,unsigned int nr_pages,gfp_t gfp) +static void read_pages (struct readahead_control *rac,struct list_head *pages, +gfp_t gfp) { +const struct address_space_operations *aops = rac->mapping->a_ops;struct blk_plug plug;unsigned page_idx; -if (!nr_pages) +if (!readahead_count (rac))return ;blk_start_plug (&plug); -if (mapping->a_ops->readpages) { - mapping->a_ops->readpages (filp, mapping, pages, nr_pages); +if (aops->readpages) { + aops->readpages (rac->file, rac->mapping, pages, +readahead_count (rac));/* Clean up the remaining pages */ put_pages_list (pages); goto out; } -for (page_idx =0 ; page_idx < nr_pages; page_idx++) { +for (page_idx =0 ; page_idx <readahead_count (rac); page_idx++) {struct page *page =lru_to_page (pages);list_del (&page->lru); -if (!add_to_page_cache_lru (page, mapping, page->index, gfp)) - mapping->a_ops->readpage (filp, page); +if (!add_to_page_cache_lru (page, rac->mapping, page->index, + gfp)) + aops->readpage (rac->file, page);put_page (page); }
@@ -143,6 +146,7 @@ static void read_pages(struct address_space *mapping, struct file *filp,blk_finish_plug (&plug);BUG_ON (!list_empty (pages)); + rac->_nr_pages =0 ; }/*
@@ -160,9 +164,12 @@ void __do_page_cache_readahead(struct address_space *mapping,unsigned long end_index;/* The last page we want to read */ LIST_HEAD (page_pool);int page_idx; -unsigned int nr_pages =0 ;loff_t isize =i_size_read (inode);gfp_t gfp_mask =readahead_gfp_mask (mapping); +struct readahead_control rac = { + .mapping = mapping, + .file = filp, + };if (isize ==0 )return ;
@@ -185,9 +192,7 @@ void __do_page_cache_readahead(struct address_space *mapping,* contiguous pages before continuing with the next * batch. */ -read_pages (mapping, filp, &page_pool, nr_pages, - gfp_mask); - nr_pages =0 ; +read_pages (&rac, &page_pool, gfp_mask);continue ; }
@@ -198,7 +203,7 @@ void __do_page_cache_readahead(struct address_space *mapping,list_add (&page->lru, &page_pool);if (page_idx == nr_to_read - lookahead_size)SetPageReadahead (page); - nr_pages++; + rac._nr_pages++; }/*
@@ -206,7 +211,7 @@ void __do_page_cache_readahead(struct address_space *mapping,* uptodate then the caller will launch readpage again, and * will then handle the error. */ -read_pages (mapping, filp, &page_pool, nr_pages, gfp_mask); +read_pages (&rac, &page_pool, gfp_mask); }/*
Signature · 1 line
2.25.0
Matthew Wilcox
maintainerPATCH v8 7/25 mm: Rename various 'offset' parameters to 'index'
In reply to Matthew WilcoxFrom: "Matthew Wilcox (Oracle)" <[email protected]>
The word 'offset' is used ambiguously to mean 'byte offset within a page', 'byte offset from the start of the file' and 'page offset from the start of the file'. Use 'index' to mean 'page offset from the start of the file' throughout the readahead code.
--- mm/readahead.c | 86 ++++++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 44 deletions(-)
mm/readahead.c +42 -44
@@ -156,7 +156,7 @@ static void read_pages(struct readahead_control *rac, struct list_head *pages,* We really don't want to intermingle reads and writes like that. */ void __do_page_cache_readahead (struct address_space *mapping, -struct file *filp,pgoff_t offset,unsigned long nr_to_read, +struct file *filp,pgoff_t index,unsigned long nr_to_read,unsigned long lookahead_size) {struct inode *inode = mapping->host;
@@ -180,7 +180,7 @@ void __do_page_cache_readahead(struct address_space *mapping,* Preallocate as many pages as we will need. */ for (page_idx =0 ; page_idx < nr_to_read; page_idx++) { -pgoff_t page_offset = offset + page_idx; +pgoff_t page_offset = index + page_idx;if (page_offset > end_index)break ;
@@ -219,7 +219,7 @@ void __do_page_cache_readahead(struct address_space *mapping,* memory at once. */ void force_page_cache_readahead (struct address_space *mapping, -struct file *filp,pgoff_t offset,unsigned long nr_to_read) +struct file *filp,pgoff_t index,unsigned long nr_to_read) {struct backing_dev_info *bdi =inode_to_bdi (mapping->host);struct file_ra_state *ra = &filp->f_ra;
@@ -239,9 +239,9 @@ void force_page_cache_readahead(struct address_space *mapping,if (this_chunk > nr_to_read) this_chunk = nr_to_read; -__do_page_cache_readahead (mapping, filp, offset, this_chunk,0 ); +__do_page_cache_readahead (mapping, filp, index, this_chunk,0 ); - offset += this_chunk; + index += this_chunk; nr_to_read -= this_chunk; } }
@@ -322,21 +322,21 @@ static unsigned long get_next_ra_size(struct file_ra_state *ra,*/ /* -* Count contiguously cached pages from @offset-1 to @offset- at max, +* Count contiguously cached pages from @index-1 to @index- at max, * this count is a conservative estimation of * - length of the sequential read sequence, or * - thrashing threshold in memory tight systems */ static pgoff_t count_history_pages (struct address_space *mapping, -pgoff_t offset,unsigned long max) +pgoff_t index,unsigned long max) {pgoff_t head;rcu_read_lock (); - head =page_cache_prev_miss (mapping, offset -1 , max); + head =page_cache_prev_miss (mapping, index -1 , max);rcu_read_unlock (); -return offset -1 - head; +return index -1 - head; }/*
@@ -344,13 +344,13 @@ static pgoff_t count_history_pages(struct address_space *mapping,*/ static int try_context_readahead (struct address_space *mapping,struct file_ra_state *ra, -pgoff_t offset, +pgoff_t index,unsigned long req_size,unsigned long max) {pgoff_t size; - size =count_history_pages (mapping, offset, max); + size =count_history_pages (mapping, index, max);/* * not enough history pages:
@@ -363,10 +363,10 @@ static int try_context_readahead(struct address_space *mapping,* starts from beginning of file: * it is a strong indication of long-run stream (or whole-file-read) */ -if (size >= offset) +if (size >= index) size *=2 ; - ra->start = offset; + ra->start = index; ra->size =min (size + req_size, max); ra->async_size =1 ;
@@ -378,13 +378,13 @@ static int try_context_readahead(struct address_space *mapping,*/ static void ondemand_readahead (struct address_space *mapping,struct file_ra_state *ra,struct file *filp, -bool hit_readahead_marker,pgoff_t offset, +bool hit_readahead_marker,pgoff_t index,unsigned long req_size) {struct backing_dev_info *bdi =inode_to_bdi (mapping->host);unsigned long max_pages = ra->ra_pages;unsigned long add_pages; -pgoff_t prev_offset; +pgoff_t prev_index;/* * If the request exceeds the readahead window, allow the read to
@@ -396,15 +396,15 @@ static void ondemand_readahead(struct address_space *mapping,/* * start of file */ -if (!offset) +if (!index) goto initial_readahead;/* -* It's the expected callback offset, assume sequential access. +* It's the expected callback index, assume sequential access. * Ramp up sizes, and push forward the readahead window. */ -if ((offset == (ra->start + ra->size - ra->async_size) || - offset == (ra->start + ra->size))) { +if ((index == (ra->start + ra->size - ra->async_size) || + index == (ra->start + ra->size))) { ra->start += ra->size; ra->size =get_next_ra_size (ra, max_pages); ra->async_size = ra->size;
@@ -421,14 +421,14 @@ static void ondemand_readahead(struct address_space *mapping,pgoff_t start;rcu_read_lock (); - start =page_cache_next_miss (mapping, offset +1 , max_pages); + start =page_cache_next_miss (mapping, index +1 , max_pages);rcu_read_unlock (); -if (!start || start - offset > max_pages) +if (!start || start - index > max_pages)return ; ra->start = start; - ra->size = start - offset;/* old async_size */ + ra->size = start - index;/* old async_size */ ra->size += req_size; ra->size =get_next_ra_size (ra, max_pages); ra->async_size = ra->size;
@@ -443,29 +443,29 @@ static void ondemand_readahead(struct address_space *mapping,/* * sequential cache miss -* trivial case: (offset - prev_offset) == 1 -* unaligned reads: (offset - prev_offset) == 0 +* trivial case: (index - prev_index) == 1 +* unaligned reads: (index - prev_index) == 0 */ - prev_offset = (unsigned long long )ra->prev_pos >>PAGE_SHIFT ; -if (offset - prev_offset <=1UL ) + prev_index = (unsigned long long )ra->prev_pos >>PAGE_SHIFT ; +if (index - prev_index <=1UL ) goto initial_readahead;/* * Query the page cache and look for the traces(cached history pages) * that a sequential stream would leave behind. */ -if (try_context_readahead (mapping, ra, offset, req_size, max_pages)) +if (try_context_readahead (mapping, ra, index, req_size, max_pages)) goto readit;/* * standalone, small random read * Read as is, and do not pollute the readahead state. */ -__do_page_cache_readahead (mapping, filp, offset, req_size,0 ); +__do_page_cache_readahead (mapping, filp, index, req_size,0 );return ; initial_readahead: - ra->start = offset; + ra->start = index; ra->size =get_init_ra_size (req_size, max_pages); ra->async_size = ra->size > req_size ? ra->size - req_size : ra->size;
@@ -476,7 +476,7 @@ static void ondemand_readahead(struct address_space *mapping,* the resulted next readahead window into the current one. * Take care of maximum IO pages as above. */ -if (offset == ra->start && ra->size == ra->async_size) { +if (index == ra->start && ra->size == ra->async_size) { add_pages =get_next_ra_size (ra, max_pages);if (ra->size + add_pages <= max_pages) { ra->async_size = add_pages;
@@ -495,9 +495,8 @@ static void ondemand_readahead(struct address_space *mapping,* @mapping: address_space which holds the pagecache and I/O vectors * @ra: file_ra_state which holds the readahead state * @filp: passed on to ->readpage() and ->readpages() -* @offset: start offset into @mapping, in pagecache page-sized units -* @req_size: hint: total size of the read which the caller is performing in -* pagecache pages +* @index: Index of first page to be read. +* @req_count: Total number of pages being read by the caller. * * page_cache_sync_readahead() should be called when a cache miss happened: * it will submit the read. The readahead logic may decide to piggyback more
@@ -506,7 +505,7 @@ static void ondemand_readahead(struct address_space *mapping,*/ void page_cache_sync_readahead (struct address_space *mapping,struct file_ra_state *ra,struct file *filp, -pgoff_t offset,unsigned long req_size) +pgoff_t index,unsigned long req_count) {/* no read-ahead */ if (!ra->ra_pages)
@@ -517,12 +516,12 @@ void page_cache_sync_readahead(struct address_space *mapping,/* be dumb */ if (filp && (filp->f_mode &FMODE_RANDOM )) { -force_page_cache_readahead (mapping, filp, offset, req_size); +force_page_cache_readahead (mapping, filp, index, req_count);return ; }/* do read-ahead */ -ondemand_readahead (mapping, ra, filp, false, offset, req_size); +ondemand_readahead (mapping, ra, filp, false, index, req_count); }EXPORT_SYMBOL_GPL (page_cache_sync_readahead);
@@ -531,21 +530,20 @@ EXPORT_SYMBOL_GPL(page_cache_sync_readahead);* @mapping: address_space which holds the pagecache and I/O vectors * @ra: file_ra_state which holds the readahead state * @filp: passed on to ->readpage() and ->readpages() -* @page: the page at @offset which has the PG_readahead flag set -* @offset: start offset into @mapping, in pagecache page-sized units -* @req_size: hint: total size of the read which the caller is performing in -* pagecache pages +* @page: The page at @index which triggered the readahead call. +* @index: Index of first page to be read. +* @req_count: Total number of pages being read by the caller. * * page_cache_async_readahead() should be called when a page is used which -* has the PG_readahead flag; this is a marker to suggest that the application +* is marked as PageReadahead; this is a marker to suggest that the application * has used up enough of the readahead window that we should start pulling in * more pages. */ void page_cache_async_readahead (struct address_space *mapping,struct file_ra_state *ra,struct file *filp, -struct page *page,pgoff_t offset, -unsigned long req_size) +struct page *page,pgoff_t index, +unsigned long req_count) {/* no read-ahead */ if (!ra->ra_pages)
@@ -569,7 +567,7 @@ page_cache_async_readahead(struct address_space *mapping,return ;/* do read-ahead */ -ondemand_readahead (mapping, ra, filp, true, offset, req_size); +ondemand_readahead (mapping, ra, filp, true, index, req_count); }EXPORT_SYMBOL_GPL (page_cache_async_readahead);
Signature · 1 line
2.25.0
Re: [PATCH v8 07/25] mm: Rename various 'offset' parameters to 'index'
Quoted 8 lines · Matthew Wilcox
From: "Matthew Wilcox (Oracle)" <[email protected]>
The word 'offset' is used ambiguously to mean 'byte offset within a page', 'byte offset from the start of the file' and 'page offset from the start of the file'. Use 'index' to mean 'page offset from the start of the file' throughout the readahead code.
Signed-off-by Matthew Wilcox (Oracle) <[email protected]>
Looks good to me.
?
Best Regards,
Yan Zi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 854 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/cluster-devel/attachments/20200226/83dc5127/attachment.sig>
Matthew Wilcox
maintainerPATCH v8 8/25 mm: rename readahead loop variable to 'i'
In reply to Matthew WilcoxFrom: "Matthew Wilcox (Oracle)" <[email protected]>
Change the type of page_idx to unsigned long, and rename it -- it's just a loop counter, not a page index.
--- mm/readahead.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
mm/readahead.c +4 -4
@@ -163,13 +163,13 @@ void __do_page_cache_readahead(struct address_space *mapping,struct page *page;unsigned long end_index;/* The last page we want to read */ LIST_HEAD (page_pool); -int page_idx;loff_t isize =i_size_read (inode);gfp_t gfp_mask =readahead_gfp_mask (mapping);struct readahead_control rac = { .mapping = mapping, .file = filp, }; +unsigned long i;if (isize ==0 )return ;
@@ -179,8 +179,8 @@ void __do_page_cache_readahead(struct address_space *mapping,/* * Preallocate as many pages as we will need. */ -for (page_idx =0 ; page_idx < nr_to_read; page_idx++) { -pgoff_t page_offset = index + page_idx; +for (i =0 ; i < nr_to_read; i++) { +pgoff_t page_offset = index + i;if (page_offset > end_index)break ;
@@ -201,7 +201,7 @@ void __do_page_cache_readahead(struct address_space *mapping,break ; page->index = page_offset;list_add (&page->lru, &page_pool); -if (page_idx == nr_to_read - lookahead_size) +if (i == nr_to_read - lookahead_size)SetPageReadahead (page); rac._nr_pages++; }
Signature · 1 line
2.25.0
Matthew Wilcox
maintainerPATCH v8 9/25 mm: Remove 'page_offset' from readahead loop
In reply to Matthew WilcoxFrom: "Matthew Wilcox (Oracle)" <[email protected]>
Replace the page_offset variable with 'index + i'.
--- mm/readahead.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
mm/readahead.c +3 -5
@@ -180,12 +180,10 @@ void __do_page_cache_readahead(struct address_space *mapping,* Preallocate as many pages as we will need. */ for (i =0 ; i < nr_to_read; i++) { -pgoff_t page_offset = index + i; - -if (page_offset > end_index) +if (index + i > end_index)break ; - page =xa_load (&mapping->i_pages, page_offset); + page =xa_load (&mapping->i_pages, index + i);if (page && !xa_is_value (page)) {/* * Page already present? Kick off the current batch of
@@ -199,7 +197,7 @@ void __do_page_cache_readahead(struct address_space *mapping, page =__page_cache_alloc (gfp_mask);if (!page)break ; - page->index = page_offset; + page->index = index + i;list_add (&page->lru, &page_pool);if (i == nr_to_read - lookahead_size)SetPageReadahead (page);
Signature · 1 line
2.25.0
Matthew Wilcox
maintainerPATCH v8 10/25 mm: Put readahead pages in cache earlier
In reply to Matthew WilcoxFrom: "Matthew Wilcox (Oracle)" <[email protected]>
When populating the page cache for readahead, mappings that use ->readpages must populate the page cache themselves as the pages are passed on a linked list which would normally be used for the page cache's LRU. For mappings that use ->readpage or the upcoming ->readahead method, we can put the pages into the page cache as soon as they're allocated, which solves a race between readahead and direct IO. It also lets us remove the gfp argument from read_pages().
Use the new readahead_page() API to implement the repeated calls to ->readpage(), just like most filesystems will.
--- mm/readahead.c | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-)
mm/readahead.c +28 -18
@@ -114,14 +114,14 @@ int read_cache_pages(struct address_space *mapping, struct list_head *pages,EXPORT_SYMBOL (read_cache_pages);static void read_pages (struct readahead_control *rac,struct list_head *pages, -gfp_t gfp) +bool skip_page) {const struct address_space_operations *aops = rac->mapping->a_ops; +struct page *page;struct blk_plug plug; -unsigned page_idx;if (!readahead_count (rac)) -return ; + goto out;blk_start_plug (&plug);
@@ -130,23 +130,23 @@ static void read_pages(struct readahead_control *rac, struct list_head *pages, readahead_count(rac));/* Clean up the remaining pages */ put_pages_list (pages); - goto out; - } - -for (page_idx =0 ; page_idx <readahead_count (rac); page_idx++) { -struct page *page =lru_to_page (pages); -list_del (&page->lru); -if (!add_to_page_cache_lru (page, rac->mapping, page->index, - gfp)) + rac->_index += rac->_nr_pages; + rac->_nr_pages =0 ; + }else { +while ((page =readahead_page (rac))) { aops->readpage (rac->file, page); -put_page (page); +put_page (page); + } } -out:blk_finish_plug (&plug);BUG_ON (!list_empty (pages)); - rac->_nr_pages =0 ; +BUG_ON (readahead_count (rac)); + +out: +if (skip_page) + rac->_index++; }/*
@@ -168,6 +168,7 @@ void __do_page_cache_readahead(struct address_space *mapping,struct readahead_control rac = { .mapping = mapping, .file = filp, + ._index = index, };unsigned long i;
@@ -183,6 +184,8 @@ void __do_page_cache_readahead(struct address_space *mapping,if (index + i > end_index)break ; +BUG_ON (index + i != rac._index + rac._nr_pages); + page =xa_load (&mapping->i_pages, index + i);if (page && !xa_is_value (page)) {/*
@@ -190,15 +193,22 @@ void __do_page_cache_readahead(struct address_space *mapping,* contiguous pages before continuing with the next * batch. */ -read_pages (&rac, &page_pool, gfp_mask); +read_pages (&rac, &page_pool, true);continue ; } page =__page_cache_alloc (gfp_mask);if (!page)break ; - page->index = index + i; -list_add (&page->lru, &page_pool); +if (mapping->a_ops->readpages) { + page->index = index + i; +list_add (&page->lru, &page_pool); + }else if (add_to_page_cache_lru (page, mapping, index + i, + gfp_mask) <0 ) { +put_page (page); +read_pages (&rac, &page_pool, true); +continue ; + }if (i == nr_to_read - lookahead_size)SetPageReadahead (page); rac._nr_pages++;
@@ -209,7 +219,7 @@ void __do_page_cache_readahead(struct address_space *mapping,* uptodate then the caller will launch readpage again, and * will then handle the error. */ -read_pages (&rac, &page_pool, gfp_mask); +read_pages (&rac, &page_pool, false); }/*
Signature · 1 line
2.25.0
Matthew Wilcox
maintainerPATCH v8 11/25 mm: Add readahead address space operation
In reply to Matthew WilcoxFrom: "Matthew Wilcox (Oracle)" <[email protected]>
This replaces ->readpages with a saner interface:
- Return void instead of an ignored error code.
- Page cache is already populated with locked pages when ->readahead is called.
- New arguments can be passed to the implementation without changing all the filesystems that use a common helper function like mpage_readahead().
--- Documentation/filesystems/locking.rst | 6 +++++- Documentation/filesystems/vfs.rst | 15 +++++++++++++++ include/linux/fs.h | 2 ++ mm/readahead.c | 12 ++++++++++-- 4 files changed, 32 insertions(+), 3 deletions(-)
Documentation/filesystems/locking.rst +5 -1
@@ -239,6 +239,7 @@ prototypes:: int (*readpage)(struct file *, struct page *); int (*writepages)(struct address_space *, struct writeback_control *); int (*set_page_dirty)(struct page *page); + void (*readahead)(struct readahead_control *); int (*readpages)(struct file *filp, struct address_space *mapping, struct list_head *pages, unsigned nr_pages); int (*write_begin)(struct file *, struct address_space *mapping,
@@ -271,7 +272,8 @@ writepage: yes, unlocks (see below) readpage: yes, unlocks writepages: set_page_dirty no -readpages: +readahead: yes, unlocks +readpages: no write_begin: locks the page exclusive write_end: yes, unlocks exclusive bmap:
@@ -295,6 +297,8 @@ the request handler (/dev/loop). ->readpage() unlocks the page, either synchronously or via I/O completion. +->readahead() unlocks the pages that I/O is attempted on like ->readpage(). + ->readpages() populates the pagecache with the passed pages and starts I/O against them. They come unlocked upon I/O completion.
Documentation/filesystems/vfs.rst +15 -0
@@ -706,6 +706,7 @@ cache in your filesystem. The following members are defined: int (*readpage)(struct file *, struct page *); int (*writepages)(struct address_space *, struct writeback_control *); int (*set_page_dirty)(struct page *page); + void (*readahead)(struct readahead_control *); int (*readpages)(struct file *filp, struct address_space *mapping, struct list_head *pages, unsigned nr_pages); int (*write_begin)(struct file *, struct address_space *mapping,
@@ -781,12 +782,26 @@ cache in your filesystem. The following members are defined: If defined, it should set the PageDirty flag, and the PAGECACHE_TAG_DIRTY tag in the radix tree. +``readahead`` + Called by the VM to read pages associated with the address_space + object. The pages are consecutive in the page cache and are + locked. The implementation should decrement the page refcount + after starting I/O on each page. Usually the page will be + unlocked by the I/O completion handler. If the filesystem decides + to stop attempting I/O before reaching the end of the readahead + window, it can simply return. The caller will decrement the page + refcount and unlock the remaining pages for you. Set PageUptodate + if the I/O completes successfully. Setting PageError on any page + will be ignored; simply unlock the page if an I/O error occurs. + ``readpages`` called by the VM to read pages associated with the address_space object. This is essentially just a vector version of readpage. Instead of just one page, several pages are requested. readpages is only used for read-ahead, so read errors are ignored. If anything goes wrong, feel free to give up. + This interface is deprecated and will be removed by the end of + 2020; implement readahead instead. ``write_begin`` Called by the generic buffered write code to ask the filesystem
include/linux/fs.h +2 -0
@@ -292,6 +292,7 @@ enum positive_aop_returns {struct page ;struct address_space ;struct writeback_control ; +struct readahead_control ;/* * Write life time hint values.
@@ -375,6 +376,7 @@ struct address_space_operations {*/ int (*readpages)(struct file *filp,struct address_space *mapping,struct list_head *pages,unsigned nr_pages); +void (*readahead)(struct readahead_control *); int (*write_begin)(struct file *, struct address_space *mapping, loff_t pos, unsigned len, unsigned flags,
mm/readahead.c +10 -2
@@ -125,7 +125,14 @@ static void read_pages(struct readahead_control *rac, struct list_head *pages,blk_start_plug (&plug); -if (aops->readpages) { +if (aops->readahead) { + aops->readahead (rac); +/* Clean up the remaining pages */ +while ((page =readahead_page (rac))) { +unlock_page (page); +put_page (page); + } + }else if (aops->readpages) { aops->readpages (rac->file, rac->mapping, pages,readahead_count (rac));/* Clean up the remaining pages */
@@ -233,7 +240,8 @@ void force_page_cache_readahead(struct address_space *mapping,struct file_ra_state *ra = &filp->f_ra;unsigned long max_pages; -if (unlikely (!mapping->a_ops->readpage && !mapping->a_ops->readpages)) +if (unlikely (!mapping->a_ops->readpage && !mapping->a_ops->readpages && + !mapping->a_ops->readahead))return ;/*
Signature · 1 line
2.25.0
Matthew Wilcox
maintainerPATCH v8 12/25 mm: Move end_index check out of readahead loop
In reply to Matthew WilcoxFrom: "Matthew Wilcox (Oracle)" <[email protected]>
By reducing nr_to_read, we can eliminate this check from inside the loop.
--- mm/readahead.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
mm/readahead.c +11 -6
@@ -167,8 +167,6 @@ void __do_page_cache_readahead(struct address_space *mapping, unsigned long lookahead_size) {struct inode *inode = mapping->host; -struct page *page; -unsigned long end_index;/* The last page we want to read */ LIST_HEAD (page_pool);loff_t isize =i_size_read (inode);gfp_t gfp_mask =readahead_gfp_mask (mapping);
@@ -178,22 +176,29 @@ void __do_page_cache_readahead(struct address_space *mapping, ._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 ); + end_index = (isize -1 ) >>PAGE_SHIFT ; +if (index > end_index) +return ; +/* Avoid wrapping to the beginning of the file */ +if (index + nr_to_read < index) + nr_to_read =ULONG_MAX - index +1 ; +/* Don't read past the page containing the last byte of the file */ +if (index + nr_to_read >= end_index) + nr_to_read = end_index - index +1 ;/* * Preallocate as many pages as we will need. */ for (i =0 ; i < nr_to_read; i++) { -if (index + i > end_index) -break ; +struct page *page =xa_load (&mapping->i_pages, index + i);BUG_ON (index + i != rac._index + rac._nr_pages); - page =xa_load (&mapping->i_pages, index + i);if (page && !xa_is_value (page)) {/* * Page already present? Kick off the current batch of
Signature · 1 line
2.25.0
Matthew Wilcox
maintainerPATCH v8 13/25 mm: Add page_cache_readahead_unbounded
In reply to Matthew WilcoxFrom: "Matthew Wilcox (Oracle)" <[email protected]>
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.
--- fs/ext4/verity.c | 35 ++----------------- fs/f2fs/data.c | 2 +- fs/f2fs/f2fs.h | 3 -- fs/f2fs/verity.c | 35 ++----------------- include/linux/pagemap.h | 3 ++ mm/readahead.c | 74 ++++++++++++++++++++++++++++------------- 6 files changed, 58 insertions(+), 94 deletions(-)
fs/ext4/verity.c +2 -33
@@ -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;
fs/f2fs/data.c +1 -1
@@ -2159,7 +2159,7 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret,* 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) {
fs/f2fs/f2fs.h +0 -3
@@ -3344,9 +3344,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);
fs/f2fs/verity.c +2 -33
@@ -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;
include/linux/pagemap.h +3 -0
@@ -621,6 +621,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:
mm/readahead.c +50 -24
96 lines not on this page · raw message
Signature · 1 line
2.25.0
Matthew Wilcox
maintainerPATCH v8 14/25 mm: Document why we don't set PageReadahead
In reply to Matthew WilcoxFrom: "Matthew Wilcox (Oracle)" <[email protected]>
If the page is already in cache, we don't set PageReadahead on it.
--- mm/readahead.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
mm/readahead.c +6 -3
@@ -195,9 +195,12 @@ void page_cache_readahead_unbounded(struct address_space *mapping,if (page && !xa_is_value (page)) {/* -* Page already present? Kick off the current batch of -* contiguous pages before continuing with the next -* batch. +* Page already present? Kick off the current batch +* of contiguous pages before continuing with the +* next batch. This page may be the one we would +* have intended to mark as Readahead, but we don't +* have a stable reference to this page, and it's +* not worth getting one just for that. */ read_pages (&rac, &page_pool, true);continue ;
Signature · 1 line
2.25.0
Re: [PATCH v8 14/25] mm: Document why we don't set PageReadahead
Quoted 5 lines · Matthew Wilcox
From: "Matthew Wilcox (Oracle)" <[email protected]>
If the page is already in cache, we don't set PageReadahead on it.
Signed-off-by Matthew Wilcox (Oracle) <[email protected]>
Looks good,
Matthew Wilcox
maintainerPATCH v8 15/25 mm: Use memalloc_nofs_save in readahead path
In reply to Matthew WilcoxFrom: "Matthew Wilcox (Oracle)" <[email protected]>
Ensure that memory allocations in the readahead path do not attempt to reclaim file-backed pages, which could lead to a deadlock. It is possible, though unlikely this is the root cause of a problem observed by Cong Wang.
--- mm/readahead.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
mm/readahead.c +14 -0
@@ -22,6 +22,7 @@#include <linux/mm_inline.h> #include <linux/blk-cgroup.h> #include <linux/fadvise.h> +#include <linux/sched/mm.h> #include "internal.h"
@@ -185,6 +186,18 @@ void page_cache_readahead_unbounded(struct address_space *mapping, };unsigned long i; +/* +* Partway through the readahead operation, we will have added +* locked pages to the page cache, but will not yet have submitted +* them for I/O. Adding another page may need to allocate memory, +* which can trigger memory reclaim. Telling the VM we're in +* the middle of a filesystem operation will cause it to not +* touch file-backed pages, preventing a deadlock. Most (all?) +* filesystems already specify __GFP_NOFS in their mapping's +* gfp_mask, but let's be explicit here. +*/ +unsigned int nofs =memalloc_nofs_save (); +/* * Preallocate as many pages as we will need. */
@@ -229,6 +242,7 @@ void page_cache_readahead_unbounded(struct address_space *mapping,* will then handle the error. */ read_pages (&rac, &page_pool, false); +memalloc_nofs_restore (nofs); }EXPORT_SYMBOL_GPL (page_cache_readahead_unbounded);
Signature · 1 line
2.25.0
Matthew Wilcox
maintainerPATCH v8 16/25 fs: Convert mpage_readpages to mpage_readahead
In reply to Matthew WilcoxFrom: "Matthew Wilcox (Oracle)" <[email protected]>
Implement the new readahead aop and convert all callers (block_dev, exfat, ext2, fat, gfs2, hpfs, isofs, jfs, nilfs2, ocfs2, omfs, qnx6, reiserfs & udf). The callers are all trivial except for GFS2 & OCFS2.
--- drivers/staging/exfat/exfat_super.c | 7 +++--- fs/block_dev.c | 7 +++--- fs/ext2/inode.c | 10 +++----- fs/fat/inode.c | 7 +++--- fs/gfs2/aops.c | 23 ++++++----------- fs/hpfs/file.c | 7 +++--- fs/iomap/buffered-io.c | 2 +- fs/isofs/inode.c | 7 +++--- fs/jfs/inode.c | 7 +++--- fs/mpage.c | 38 +++++++++-------------------- fs/nilfs2/inode.c | 15 +++--------- fs/ocfs2/aops.c | 34 ++++++++++---------------- fs/omfs/file.c | 7 +++--- fs/qnx6/inode.c | 7 +++--- fs/reiserfs/inode.c | 8 +++--- fs/udf/inode.c | 7 +++--- include/linux/mpage.h | 4 +-- mm/migrate.c | 2 +- 18 files changed, 73 insertions(+), 126 deletions(-)
drivers/staging/exfat/exfat_super.c +3 -4
@@ -3002,10 +3002,9 @@ static int exfat_readpage(struct file *file, struct page *page)return mpage_readpage (page, exfat_get_block); } -static int exfat_readpages (struct file *file,struct address_space *mapping, -struct list_head *pages,unsigned int nr_pages) +static void exfat_readahead (struct readahead_control *rac) { -return mpage_readpages (mapping, pages, nr_pages, exfat_get_block); +mpage_readahead (rac, exfat_get_block); }static int exfat_writepage (struct page *page,struct writeback_control *wbc)
@@ -3104,7 +3103,7 @@ static sector_t _exfat_bmap(struct address_space *mapping, sector_t block)static const struct address_space_operations exfat_aops = { .readpage = exfat_readpage, - .readpages = exfat_readpages, + .readahead = exfat_readahead, .writepage = exfat_writepage, .writepages = exfat_writepages, .write_begin = exfat_write_begin,
fs/block_dev.c +3 -4
@@ -614,10 +614,9 @@ static int blkdev_readpage(struct file * file, struct page * page)return block_read_full_page (page, blkdev_get_block); } -static int blkdev_readpages (struct file *file,struct address_space *mapping, -struct list_head *pages,unsigned nr_pages) +static void blkdev_readahead (struct readahead_control *rac) { -return mpage_readpages (mapping, pages, nr_pages, blkdev_get_block); +mpage_readahead (rac, blkdev_get_block); } static int blkdev_write_begin(struct file *file, struct address_space *mapping,
@@ -2062,7 +2061,7 @@ static int blkdev_writepages(struct address_space *mapping,static const struct address_space_operations def_blk_aops = { .readpage = blkdev_readpage, - .readpages = blkdev_readpages, + .readahead = blkdev_readahead, .writepage = blkdev_writepage, .write_begin = blkdev_write_begin, .write_end = blkdev_write_end,
fs/ext2/inode.c +4 -6
@@ -877,11 +877,9 @@ static int ext2_readpage(struct file *file, struct page *page)return mpage_readpage (page, ext2_get_block); } -static int -ext2_readpages (struct file *file,struct address_space *mapping, -struct list_head *pages,unsigned nr_pages) +static void ext2_readahead (struct readahead_control *rac) { -return mpage_readpages (mapping, pages, nr_pages, ext2_get_block); +mpage_readahead (rac, ext2_get_block); } static int
@@ -967,7 +965,7 @@ ext2_dax_writepages(struct address_space *mapping, struct writeback_control *wbcconst struct address_space_operations ext2_aops = { .readpage = ext2_readpage, - .readpages = ext2_readpages, + .readahead = ext2_readahead, .writepage = ext2_writepage, .write_begin = ext2_write_begin, .write_end = ext2_write_end,
@@ -981,7 +979,7 @@ const struct address_space_operations ext2_aops = {const struct address_space_operations ext2_nobh_aops = { .readpage = ext2_readpage, - .readpages = ext2_readpages, + .readahead = ext2_readahead, .writepage = ext2_nobh_writepage, .write_begin = ext2_nobh_write_begin, .write_end = nobh_write_end,
fs/fat/inode.c +3 -4
@@ -210,10 +210,9 @@ static int fat_readpage(struct file *file, struct page *page)return mpage_readpage (page, fat_get_block); } -static int fat_readpages (struct file *file,struct address_space *mapping, -struct list_head *pages,unsigned nr_pages) +static void fat_readahead (struct readahead_control *rac) { -return mpage_readpages (mapping, pages, nr_pages, fat_get_block); +mpage_readahead (rac, fat_get_block); }static void fat_write_failed (struct address_space *mapping,loff_t to)
@@ -344,7 +343,7 @@ int fat_block_truncate_page(struct inode *inode, loff_t from)static const struct address_space_operations fat_aops = { .readpage = fat_readpage, - .readpages = fat_readpages, + .readahead = fat_readahead, .writepage = fat_writepage, .writepages = fat_writepages, .write_begin = fat_write_begin,
fs/gfs2/aops.c +8 -15
@@ -577,7 +577,7 @@ int gfs2_internal_read(struct gfs2_inode *ip, char *buf, loff_t *pos, }/** -* gfs2_readpages - Read a bunch of pages at once +* gfs2_readahead - Read a bunch of pages at once * @file: The file to read from * @mapping: Address space info * @pages: List of pages to read
@@ -590,31 +590,24 @@ int gfs2_internal_read(struct gfs2_inode *ip, char *buf, loff_t *pos,* obviously not something we'd want to do on too regular a basis. * Any I/O we ignore at this time will be done via readpage later. * 2. We don't handle stuffed files here we let readpage do the honours. -* 3. mpage_readpages() does most of the heavy lifting in the common case. +* 3. mpage_readahead() does most of the heavy lifting in the common case. * 4. gfs2_block_map() is relied upon to set BH_Boundary in the right places. */ -static int gfs2_readpages (struct file *file,struct address_space *mapping, -struct list_head *pages,unsigned nr_pages) +static void gfs2_readahead (struct readahead_control *rac) { -struct inode *inode = mapping->host; +struct inode *inode = rac->mapping->host;struct gfs2_inode *ip =GFS2_I (inode); -struct gfs2_sbd *sdp =GFS2_SB (inode);struct gfs2_holder gh; -int ret;gfs2_holder_init (ip->i_gl,LM_ST_SHARED ,0 , &gh); - ret =gfs2_glock_nq (&gh); -if (unlikely (ret)) +if (gfs2_glock_nq (&gh)) goto out_uninit;if (!gfs2_is_stuffed (ip)) - ret =mpage_readpages (mapping, pages, nr_pages, gfs2_block_map); +mpage_readahead (rac, gfs2_block_map);gfs2_glock_dq (&gh); out_uninit:gfs2_holder_uninit (&gh); -if (unlikely (gfs2_withdrawn (sdp))) - ret = -EIO ; -return ret; }/**
@@ -828,7 +821,7 @@ static const struct address_space_operations gfs2_aops = { .writepage = gfs2_writepage, .writepages = gfs2_writepages, .readpage = gfs2_readpage, - .readpages = gfs2_readpages, + .readahead = gfs2_readahead, .bmap = gfs2_bmap, .invalidatepage = gfs2_invalidatepage, .releasepage = gfs2_releasepage,
@@ -842,7 +835,7 @@ static const struct address_space_operations gfs2_jdata_aops = { .writepage = gfs2_jdata_writepage, .writepages = gfs2_jdata_writepages, .readpage = gfs2_readpage, - .readpages = gfs2_readpages, + .readahead = gfs2_readahead, .set_page_dirty = jdata_set_page_dirty, .bmap = gfs2_bmap, .invalidatepage = gfs2_invalidatepage,
fs/hpfs/file.c +3 -4
@@ -125,10 +125,9 @@ static int hpfs_writepage(struct page *page, struct writeback_control *wbc)return block_write_full_page (page, hpfs_get_block, wbc); } -static int hpfs_readpages (struct file *file,struct address_space *mapping, -struct list_head *pages,unsigned nr_pages) +static void hpfs_readahead (struct readahead_control *rac) { -return mpage_readpages (mapping, pages, nr_pages, hpfs_get_block); +mpage_readahead (rac, hpfs_get_block); } static int hpfs_writepages(struct address_space *mapping,
@@ -198,7 +197,7 @@ static int hpfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,const struct address_space_operations hpfs_aops = { .readpage = hpfs_readpage, .writepage = hpfs_writepage, - .readpages = hpfs_readpages, + .readahead = hpfs_readahead, .writepages = hpfs_writepages, .write_begin = hpfs_write_begin, .write_end = hpfs_write_end,
fs/iomap/buffered-io.c +1 -1
@@ -359,7 +359,7 @@ iomap_readpage(struct page *page, const struct iomap_ops *ops) }/* -* Just like mpage_readpages and block_read_full_page we always +* Just like mpage_readahead and block_read_full_page we always * return 0 and just mark the page as PageError on errors. This * should be cleaned up all through the stack eventually. */
fs/isofs/inode.c +3 -4
@@ -1185,10 +1185,9 @@ static int isofs_readpage(struct file *file, struct page *page)return mpage_readpage (page, isofs_get_block); } -static int isofs_readpages (struct file *file,struct address_space *mapping, -struct list_head *pages,unsigned nr_pages) +static void isofs_readahead (struct readahead_control *rac) { -return mpage_readpages (mapping, pages, nr_pages, isofs_get_block); +mpage_readahead (rac, isofs_get_block); }static sector_t _isofs_bmap (struct address_space *mapping,sector_t block)
@@ -1198,7 +1197,7 @@ static sector_t _isofs_bmap(struct address_space *mapping, sector_t block)static const struct address_space_operations isofs_aops = { .readpage = isofs_readpage, - .readpages = isofs_readpages, + .readahead = isofs_readahead, .bmap = _isofs_bmap };
fs/jfs/inode.c +3 -4
@@ -296,10 +296,9 @@ static int jfs_readpage(struct file *file, struct page *page)return mpage_readpage (page, jfs_get_block); } -static int jfs_readpages (struct file *file,struct address_space *mapping, -struct list_head *pages,unsigned nr_pages) +static void jfs_readahead (struct readahead_control *rac) { -return mpage_readpages (mapping, pages, nr_pages, jfs_get_block); +mpage_readahead (rac, jfs_get_block); }static void jfs_write_failed (struct address_space *mapping,loff_t to)
@@ -358,7 +357,7 @@ static ssize_t jfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)const struct address_space_operations jfs_aops = { .readpage = jfs_readpage, - .readpages = jfs_readpages, + .readahead = jfs_readahead, .writepage = jfs_writepage, .writepages = jfs_writepages, .write_begin = jfs_write_begin,
fs/mpage.c +11 -27
@@ -91,7 +91,7 @@ mpage_alloc(struct block_device *bdev, }/* -* support function for mpage_readpages. The fs supplied get_block might +* support function for mpage_readahead. The fs supplied get_block might * return an up to date buffer. This is used to map that buffer into * the page, which allows readpage to avoid triggering a duplicate call * to get_block.
@@ -338,13 +338,8 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args) }/** -* mpage_readpages - populate an address space with some pages & start reads against them -* @mapping: the address_space -* @pages: The address of a list_head which contains the target pages. These -* pages have their ->index populated and are otherwise uninitialised. -* The page at @pages->prev has the lowest file offset, and reads should be -* issued in @pages->prev to @pages->next order. -* @nr_pages: The number of pages at *@pages +* mpage_readahead - start reads against pages +* @rac: Describes which pages to read. * @get_block: The filesystem's block mapper function. * * This function walks the pages and the blocks within each page, building and
@@ -381,36 +376,25 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args)* * This all causes the disk requests to be issued in the correct order. */ -int -mpage_readpages (struct address_space *mapping,struct list_head *pages, -unsigned nr_pages,get_block_t get_block) +void mpage_readahead (struct readahead_control *rac,get_block_t get_block) { +struct page *page;struct mpage_readpage_args args = { .get_block = get_block, .is_readahead = true, }; -unsigned page_idx; - -for (page_idx =0 ; page_idx < nr_pages; page_idx++) { -struct page *page =lru_to_page (pages); +while ((page =readahead_page (rac))) {prefetchw (&page->flags); -list_del (&page->lru); -if (!add_to_page_cache_lru (page, mapping, - page->index, -readahead_gfp_mask (mapping))) { - args.page = page; - args.nr_pages = nr_pages - page_idx; - args.bio =do_mpage_readpage (&args); - } + args.page = page; + args.nr_pages =readahead_count (rac); + args.bio =do_mpage_readpage (&args);put_page (page); } -BUG_ON (!list_empty (pages));if (args.bio)mpage_bio_submit (REQ_OP_READ ,REQ_RAHEAD , args.bio); -return 0 ; } -EXPORT_SYMBOL (mpage_readpages); +EXPORT_SYMBOL (mpage_readahead);/* * This isn't called much at all
@@ -563,7 +547,7 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc,* Page has buffers, but they are all unmapped. The page was * created by pagein or read over a hole which was handled by * block_read_full_page(). If this address_space is also -* using mpage_readpages then this can rarely happen. +* using mpage_readahead then this can rarely happen. */ goto confused; }
fs/nilfs2/inode.c +3 -12
@@ -145,18 +145,9 @@ static int nilfs_readpage(struct file *file, struct page *page)return mpage_readpage (page, nilfs_get_block); } -/** -* nilfs_readpages() - implement readpages() method of nilfs_aops {} -* address_space_operations. -* @file - file struct of the file to be read -* @mapping - address_space struct used for reading multiple pages -* @pages - the pages to be read -* @nr_pages - number of pages to be read -*/ -static int nilfs_readpages (struct file *file,struct address_space *mapping, -struct list_head *pages,unsigned int nr_pages) +static void nilfs_readahead (struct readahead_control *rac) { -return mpage_readpages (mapping, pages, nr_pages, nilfs_get_block); +mpage_readahead (rac, nilfs_get_block); } static int nilfs_writepages(struct address_space *mapping,
@@ -308,7 +299,7 @@ const struct address_space_operations nilfs_aops = { .readpage = nilfs_readpage, .writepages = nilfs_writepages, .set_page_dirty = nilfs_set_page_dirty, - .readpages = nilfs_readpages, + .readahead = nilfs_readahead, .write_begin = nilfs_write_begin, .write_end = nilfs_write_end,/* .releasepage = nilfs_releasepage, */
fs/ocfs2/aops.c +13 -21
@@ -350,14 +350,11 @@ static int ocfs2_readpage(struct file *file, struct page *page)* grow out to a tree. If need be, detecting boundary extents could * trivially be added in a future version of ocfs2_get_block(). */ -static int ocfs2_readpages (struct file *filp,struct address_space *mapping, -struct list_head *pages,unsigned nr_pages) +static void ocfs2_readahead (struct readahead_control *rac) { -int ret, err = -EIO ; -struct inode *inode = mapping->host; +int ret; +struct inode *inode = rac->mapping->host;struct ocfs2_inode_info *oi =OCFS2_I (inode); -loff_t start; -struct page *last;/* * Use the nonblocking flag for the dlm code to avoid page
@@ -365,36 +362,31 @@ static int ocfs2_readpages(struct file *filp, struct address_space *mapping,*/ ret =ocfs2_inode_lock_full (inode,NULL ,0 ,OCFS2_LOCK_NONBLOCK );if (ret) -return err; +return ; -if (down_read_trylock (&oi->ip_alloc_sem) ==0 ) { -ocfs2_inode_unlock (inode,0 ); -return err; - } +if (down_read_trylock (&oi->ip_alloc_sem) ==0 ) + goto out_unlock;/* * Don't bother with inline-data. There isn't anything * to read-ahead in that case anyway... */ if (oi->ip_dyn_features &OCFS2_INLINE_DATA_FL ) - goto out_unlock; + goto out_up;/* * Check whether a remote node truncated this file - we just * drop out in that case as it's not worth handling here. */ - last =lru_to_page (pages); - start = (loff_t )last->index <<PAGE_SHIFT ; -if (start >=i_size_read (inode)) - goto out_unlock; +if (readahead_pos (rac) >=i_size_read (inode)) + goto out_up; - err =mpage_readpages (mapping, pages, nr_pages, ocfs2_get_block); +mpage_readahead (rac, ocfs2_get_block); -out_unlock: +out_up:up_read (&oi->ip_alloc_sem); +out_unlock:ocfs2_inode_unlock (inode,0 ); - -return err; }/* Note: Because we don't support holes, our allocation has
@@ -2474,7 +2466,7 @@ static ssize_t ocfs2_direct_IO(struct kiocb *iocb, struct iov_iter *iter)const struct address_space_operations ocfs2_aops = { .readpage = ocfs2_readpage, - .readpages = ocfs2_readpages, + .readahead = ocfs2_readahead, .writepage = ocfs2_writepage, .write_begin = ocfs2_write_begin, .write_end = ocfs2_write_end,
fs/omfs/file.c +3 -4
@@ -289,10 +289,9 @@ static int omfs_readpage(struct file *file, struct page *page)return block_read_full_page (page, omfs_get_block); } -static int omfs_readpages (struct file *file,struct address_space *mapping, -struct list_head *pages,unsigned nr_pages) +static void omfs_readahead (struct readahead_control *rac) { -return mpage_readpages (mapping, pages, nr_pages, omfs_get_block); +mpage_readahead (rac, omfs_get_block); }static int omfs_writepage (struct page *page,struct writeback_control *wbc)
@@ -373,7 +372,7 @@ const struct inode_operations omfs_file_inops = {const struct address_space_operations omfs_aops = { .readpage = omfs_readpage, - .readpages = omfs_readpages, + .readahead = omfs_readahead, .writepage = omfs_writepage, .writepages = omfs_writepages, .write_begin = omfs_write_begin,
fs/qnx6/inode.c +3 -4
@@ -99,10 +99,9 @@ static int qnx6_readpage(struct file *file, struct page *page)return mpage_readpage (page, qnx6_get_block); } -static int qnx6_readpages (struct file *file,struct address_space *mapping, -struct list_head *pages,unsigned nr_pages) +static void qnx6_readahead (struct readahead_control *rac) { -return mpage_readpages (mapping, pages, nr_pages, qnx6_get_block); +mpage_readahead (rac, qnx6_get_block); }/*
@@ -499,7 +498,7 @@ static sector_t qnx6_bmap(struct address_space *mapping, sector_t block) }static const struct address_space_operations qnx6_aops = { .readpage = qnx6_readpage, - .readpages = qnx6_readpages, + .readahead = qnx6_readahead, .bmap = qnx6_bmap };
fs/reiserfs/inode.c +3 -5
@@ -1160,11 +1160,9 @@ int reiserfs_get_block(struct inode *inode, sector_t block,return retval; } -static int -reiserfs_readpages (struct file *file,struct address_space *mapping, -struct list_head *pages,unsigned nr_pages) +static void reiserfs_readahead (struct readahead_control *rac) { -return mpage_readpages (mapping, pages, nr_pages, reiserfs_get_block); +mpage_readahead (rac, reiserfs_get_block); }/*
@@ -3434,7 +3432,7 @@ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr)const struct address_space_operations reiserfs_address_space_operations = { .writepage = reiserfs_writepage, .readpage = reiserfs_readpage, - .readpages = reiserfs_readpages, + .readahead = reiserfs_readahead, .releasepage = reiserfs_releasepage, .invalidatepage = reiserfs_invalidatepage, .write_begin = reiserfs_write_begin,
fs/udf/inode.c +3 -4
@@ -195,10 +195,9 @@ static int udf_readpage(struct file *file, struct page *page)return mpage_readpage (page, udf_get_block); } -static int udf_readpages (struct file *file,struct address_space *mapping, -struct list_head *pages,unsigned nr_pages) +static void udf_readahead (struct readahead_control *rac) { -return mpage_readpages (mapping, pages, nr_pages, udf_get_block); +mpage_readahead (rac, udf_get_block); } static int udf_write_begin(struct file *file, struct address_space *mapping,
@@ -234,7 +233,7 @@ static sector_t udf_bmap(struct address_space *mapping, sector_t block)const struct address_space_operations udf_aops = { .readpage = udf_readpage, - .readpages = udf_readpages, + .readahead = udf_readahead, .writepage = udf_writepage, .writepages = udf_writepages, .write_begin = udf_write_begin,
include/linux/mpage.h +2 -2
@@ -13,9 +13,9 @@#ifdef CONFIG_BLOCK struct writeback_control ; +struct readahead_control ; -int mpage_readpages (struct address_space *mapping,struct list_head *pages, -unsigned nr_pages,get_block_t get_block); +void mpage_readahead (struct readahead_control *,get_block_t get_block);int mpage_readpage (struct page *page,get_block_t get_block);int mpage_writepages (struct address_space *mapping,struct writeback_control *wbc,get_block_t get_block);
mm/migrate.c +1 -1
@@ -1020,7 +1020,7 @@ static int __unmap_and_move(struct page *page, struct page *newpage,* to the LRU. Later, when the IO completes the pages are * marked uptodate and unlocked. However, the queueing * could be merging multiple pages for one bio (e.g. -* mpage_readpages). If an allocation happens for the +* mpage_readahead). If an allocation happens for the * second or third page, the process can end up locking * the same page twice and deadlocking. Rather than * trying to be clever about what pages can be locked,
Signature · 1 line
2.25.0
Matthew Wilcox
maintainerPATCH v8 17/25 btrfs: Convert from readpages to readahead
In reply to Matthew WilcoxFrom: "Matthew Wilcox (Oracle)" <[email protected]>
Implement the new readahead method in btrfs. Add a readahead_page_batch() to optimise fetching a batch of pages at once.
--- fs/btrfs/extent_io.c | 46 ++++++++++++++------------------------------ fs/btrfs/extent_io.h | 3 +-- fs/btrfs/inode.c | 16 +++++++-------- 3 files changed, 22 insertions(+), 43 deletions(-)
fs/btrfs/extent_io.c +14 -32
@@ -4278,52 +4278,34 @@ int extent_writepages(struct address_space *mapping,return ret; } -int extent_readpages (struct address_space *mapping,struct list_head *pages, -unsigned nr_pages) +void extent_readahead (struct readahead_control *rac) {struct bio *bio =NULL ;unsigned long bio_flags =0 ;struct page *pagepool[16 ];struct extent_map *em_cached =NULL ; -struct extent_io_tree *tree = &BTRFS_I (mapping->host)->io_tree; -int nr =0 ; +struct extent_io_tree *tree = &BTRFS_I (rac->mapping->host)->io_tree;u64 prev_em_start = (u64)-1 ; +int nr; -while (!list_empty (pages)) { -u64 contig_end =0 ; - -for (nr =0 ; nr <ARRAY_SIZE (pagepool) && !list_empty (pages);) { -struct page *page =lru_to_page (pages); - -prefetchw (&page->flags); -list_del (&page->lru); -if (add_to_page_cache_lru (page, mapping, page->index, -readahead_gfp_mask (mapping))) { -put_page (page); -break ; - } - - pagepool[nr++] = page; - contig_end =page_offset (page) +PAGE_SIZE -1 ; - } +while ((nr =readahead_page_batch (rac, pagepool))) { +u64 contig_start =page_offset (pagepool[0 ]); +u64 contig_end =page_offset (pagepool[nr -1 ]) +PAGE_SIZE -1 ; -if (nr) { -u64 contig_start =page_offset (pagepool[0 ]); +ASSERT (contig_start + nr *PAGE_SIZE -1 == contig_end); -ASSERT (contig_start + nr *PAGE_SIZE -1 == contig_end); - -contiguous_readpages (tree, pagepool, nr, contig_start, - contig_end, &em_cached, &bio, &bio_flags, - &prev_em_start); - } +contiguous_readpages (tree, pagepool, nr, contig_start, + contig_end, &em_cached, &bio, &bio_flags, + &prev_em_start); }if (em_cached)free_extent_map (em_cached); -if (bio) -return submit_one_bio (bio,0 , bio_flags); -return 0 ; +if (bio) { +if (submit_one_bio (bio,0 , bio_flags)) +return ; + } }/*
fs/btrfs/extent_io.h +1 -2
@@ -198,8 +198,7 @@ int extent_writepages(struct address_space *mapping, struct writeback_control *wbc);int btree_write_cache_pages (struct address_space *mapping,struct writeback_control *wbc); -int extent_readpages (struct address_space *mapping,struct list_head *pages, -unsigned nr_pages); +void extent_readahead (struct readahead_control *rac);int extent_fiemap (struct inode *inode,struct fiemap_extent_info *fieinfo,__u64 start,__u64 len);void set_page_extent_mapped (struct page *page);
fs/btrfs/inode.c +7 -9
@@ -4802,8 +4802,8 @@ static void evict_inode_truncate_pages(struct inode *inode)/* * Keep looping until we have no more ranges in the io tree. -* We can have ongoing bios started by readpages (called from readahead) -* that have their endio callback (extent_io.c:end_bio_extent_readpage) +* We can have ongoing bios started by readahead that have +* their endio callback (extent_io.c:end_bio_extent_readpage) * still in progress (unlocked the pages in the bio but did not yet * unlocked the ranges in the io tree). Therefore this means some * ranges can still be locked and eviction started because before
@@ -7004,11 +7004,11 @@ static int lock_extent_direct(struct inode *inode, u64 lockstart, u64 lockend,* for it to complete) and then invalidate the pages for * this range (through invalidate_inode_pages2_range()), * but that can lead us to a deadlock with a concurrent -* call to readpages() (a buffered read or a defrag call +* call to readahead (a buffered read or a defrag call * triggered a readahead) on a page lock due to an * ordered dio extent we created before but did not have * yet a corresponding bio submitted (whence it can not -* complete), which makes readpages() wait for that +* complete), which makes readahead wait for that * ordered extent to complete while holding a lock on * that page. */
@@ -8247,11 +8247,9 @@ static int btrfs_writepages(struct address_space *mapping,return extent_writepages (mapping, wbc); } -static int -btrfs_readpages (struct file *file,struct address_space *mapping, -struct list_head *pages,unsigned nr_pages) +static void btrfs_readahead (struct readahead_control *rac) { -return extent_readpages (mapping, pages, nr_pages); +extent_readahead (rac); }static int __btrfs_releasepage (struct page *page,gfp_t gfp_flags)
@@ -10456,7 +10454,7 @@ static const struct address_space_operations btrfs_aops = { .readpage = btrfs_readpage, .writepage = btrfs_writepage, .writepages = btrfs_writepages, - .readpages = btrfs_readpages, + .readahead = btrfs_readahead, .direct_IO = btrfs_direct_IO, .invalidatepage = btrfs_invalidatepage, .releasepage = btrfs_releasepage,
Signature · 1 line
2.25.0
Re: [PATCH v8 17/25] btrfs: Convert from readpages to readahead
Quoted 4 lines · Matthew Wilcox
From: "Matthew Wilcox (Oracle)" <[email protected]>
Implement the new readahead method in btrfs. Add a
readahead_page_batch()to optimise fetching a batch of pages at once.
readahead_page_batch() isn't added in this patch anymore.
Otherwise this looks good to me, although I don't feel confident enough to give a Reviewed-by for btrfs code.
Re: [PATCH v8 17/25] btrfs: Convert from readpages to readahead
Quoted 10 lines · Christoph Hellwig
Quoted 4 lines · Matthew Wilcox
From: "Matthew Wilcox (Oracle)" <[email protected]>
Implement the new readahead method in btrfs. Add a
readahead_page_batch()to optimise fetching a batch of pages at once.
readahead_page_batch()isn't added in this patch anymore.Otherwise this looks good to me, although I don't feel confident enough to give a Reviewed-by for btrfs code.
Review is on my todo so the series is not blocked on that.
Matthew Wilcox
maintainerPATCH v8 18/25 erofs: Convert uncompressed files from readpages to readahead
In reply to Matthew WilcoxFrom: "Matthew Wilcox (Oracle)" <[email protected]>
Use the new readahead operation in erofs
--- fs/erofs/data.c | 39 +++++++++++++----------------------- fs/erofs/zdata.c | 2 +- include/trace/events/erofs.h | 6 +++--- 3 files changed, 18 insertions(+), 29 deletions(-)
fs/erofs/data.c +14 -25
@@ -280,47 +280,36 @@ static int erofs_raw_access_readpage(struct file *file, struct page *page)return 0 ; } -static int erofs_raw_access_readpages (struct file *filp, -struct address_space *mapping, -struct list_head *pages, -unsigned int nr_pages) +static void erofs_raw_access_readahead (struct readahead_control *rac) {erofs_off_t last_block;struct bio *bio =NULL ; -gfp_t gfp =readahead_gfp_mask (mapping); - struct page *page = list_last_entry(pages, struct page, lru); - -trace_erofs_readpages (mapping->host, page, nr_pages, true); +struct page *page; -for (; nr_pages; --nr_pages) { - page = list_entry(pages->prev, struct page, lru); +trace_erofs_readpages (rac->mapping->host,readahead_index (rac), +readahead_count (rac), true); +while ((page =readahead_page (rac))) {prefetchw (&page->flags); -list_del (&page->lru); -if (!add_to_page_cache_lru (page, mapping, page->index, gfp)) { - bio =erofs_read_raw_page (bio, mapping, page, - &last_block, nr_pages, true); + bio =erofs_read_raw_page (bio, rac->mapping, page, &last_block, +readahead_count (rac), true); -/* all the page errors are ignored when readahead */ -if (IS_ERR (bio)) { -pr_err ("%s, readahead error at page %lu of nid %llu\n" , - __func__, page->index, -EROFS_I (mapping->host)->nid); +/* all the page errors are ignored when readahead */ +if (IS_ERR (bio)) { +pr_err ("%s, readahead error at page %lu of nid %llu\n" , + __func__, page->index, +EROFS_I (rac->mapping->host)->nid); - bio =NULL ; - } + bio =NULL ; } -/* pages could still be locked */ put_page (page); } -DBG_BUGON (!list_empty (pages));/* the rare case (end in gaps) */ if (bio)submit_bio (bio); -return 0 ; } static int erofs_get_block(struct inode *inode, sector_t iblock,
@@ -358,7 +347,7 @@ static sector_t erofs_bmap(struct address_space *mapping, sector_t block)/* for uncompressed (aligned) files and raw access for other files */ const struct address_space_operations erofs_raw_access_aops = { .readpage = erofs_raw_access_readpage, - .readpages = erofs_raw_access_readpages, + .readahead = erofs_raw_access_readahead, .bmap = erofs_bmap, };
fs/erofs/zdata.c +1 -1
@@ -1315,7 +1315,7 @@ static int z_erofs_readpages(struct file *filp, struct address_space *mapping,struct page *head =NULL ;LIST_HEAD (pagepool); -trace_erofs_readpages (mapping->host,lru_to_page (pages), +trace_erofs_readpages (mapping->host,lru_to_page (pages)->index, nr_pages, false); f.headoffset = (erofs_off_t )lru_to_page (pages)->index <<PAGE_SHIFT ;
include/trace/events/erofs.h +3 -3
@@ -113,10 +113,10 @@ TRACE_EVENT(erofs_readpage, TRACE_EVENT(erofs_readpages, - TP_PROTO(struct inode *inode, struct page *page, unsigned int nrpage, + TP_PROTO(struct inode *inode, pgoff_t start, unsigned int nrpage, bool raw), - TP_ARGS(inode, page, nrpage, raw), + TP_ARGS(inode, start, nrpage, raw), TP_STRUCT__entry( __field(dev_t, dev )
@@ -129,7 +129,7 @@ TRACE_EVENT(erofs_readpages,TP_fast_assign ( __entry->dev = inode->i_sb->s_dev; __entry->nid =EROFS_I (inode)->nid; - __entry->start = page->index; + __entry->start = start; __entry->nrpage = nrpage; __entry->raw = raw; ),
Signature · 1 line
2.25.0
Matthew Wilcox
maintainerPATCH v8 19/25 erofs: Convert compressed files from readpages to readahead
In reply to Matthew WilcoxFrom: "Matthew Wilcox (Oracle)" <[email protected]>
Use the new readahead operation in erofs.
--- fs/erofs/zdata.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-)
fs/erofs/zdata.c +9 -20
@@ -1303,28 +1303,23 @@ static bool should_decompress_synchronously(struct erofs_sb_info *sbi,return nr <= sbi->max_sync_decompress_pages; } -static int z_erofs_readpages (struct file *filp,struct address_space *mapping, -struct list_head *pages,unsigned int nr_pages) +static void z_erofs_readahead (struct readahead_control *rac) { -struct inode *const inode = mapping->host; +struct inode *const inode = rac->mapping->host;struct erofs_sb_info *const sbi =EROFS_I_SB (inode); -bool sync =should_decompress_synchronously (sbi, nr_pages); +bool sync =should_decompress_synchronously (sbi,readahead_count (rac));struct z_erofs_decompress_frontend f =DECOMPRESS_FRONTEND_INIT (inode); -gfp_t gfp =mapping_gfp_constraint (mapping,GFP_KERNEL ); -struct page *head =NULL ; +struct page *page, *head =NULL ;LIST_HEAD (pagepool); -trace_erofs_readpages (mapping->host,lru_to_page (pages)->index, - nr_pages, false); +trace_erofs_readpages (inode,readahead_index (rac), +readahead_count (rac), false); - f.headoffset = (erofs_off_t )lru_to_page (pages)->index <<PAGE_SHIFT ; - -for (; nr_pages; --nr_pages) { -struct page *page =lru_to_page (pages); + f.headoffset =readahead_pos (rac); +while ((page =readahead_page (rac))) {prefetchw (&page->flags); -list_del (&page->lru);/* * A pure asynchronous readahead is indicated if
@@ -1333,11 +1328,6 @@ static int z_erofs_readpages(struct file *filp, struct address_space *mapping,*/ sync &= !(PageReadahead (page) && !head); -if (add_to_page_cache_lru (page, mapping, page->index, gfp)) { -list_add (&page->lru, &pagepool); -continue ; - } -set_page_private (page, (unsigned long )head); head = page; }
@@ -1366,11 +1356,10 @@ static int z_erofs_readpages(struct file *filp, struct address_space *mapping,/* clean up the remaining free pages */ put_pages_list (&pagepool); -return 0 ; }const struct address_space_operations z_erofs_aops = { .readpage = z_erofs_readpage, - .readpages = z_erofs_readpages, + .readahead = z_erofs_readahead, };
Signature · 1 line
2.25.0
Matthew Wilcox
maintainerPATCH v8 20/25 ext4: Convert from readpages to readahead
In reply to Matthew WilcoxFrom: "Matthew Wilcox (Oracle)" <[email protected]>
Use the new readahead operation in ext4
--- fs/ext4/ext4.h | 3 +-- fs/ext4/inode.c | 21 +++++++++------------ fs/ext4/readpage.c | 22 ++++++++-------------- 3 files changed, 18 insertions(+), 28 deletions(-)
fs/ext4/ext4.h +1 -2
@@ -3279,8 +3279,7 @@ static inline void ext4_set_de_type(struct super_block *sb,/* readpages.c */ extern int ext4_mpage_readpages (struct address_space *mapping, -struct list_head *pages,struct page *page, -unsigned nr_pages,bool is_readahead); +struct readahead_control *rac,struct page *page);extern int __init ext4_init_post_read_processing (void );extern void ext4_exit_post_read_processing (void );
fs/ext4/inode.c +9 -12
@@ -3226,23 +3226,20 @@ static int ext4_readpage(struct file *file, struct page *page) ret =ext4_readpage_inline (inode, page);if (ret == -EAGAIN ) -return ext4_mpage_readpages (page->mapping,NULL , page,1 , - false); +return ext4_mpage_readpages (page->mapping,NULL , page);return ret; } -static int -ext4_readpages (struct file *file,struct address_space *mapping, -struct list_head *pages,unsigned nr_pages) +static void ext4_readahead (struct readahead_control *rac) { -struct inode *inode = mapping->host; +struct inode *inode = rac->mapping->host; -/* If the file has inline data, no need to do readpages. */ +/* If the file has inline data, no need to do readahead. */ if (ext4_has_inline_data (inode)) -return 0 ; +return ; -return ext4_mpage_readpages (mapping, pages,NULL , nr_pages, true); +ext4_mpage_readpages (rac->mapping, rac,NULL ); } static void ext4_invalidatepage(struct page *page, unsigned int offset,
@@ -3587,7 +3584,7 @@ static int ext4_set_page_dirty(struct page *page)static const struct address_space_operations ext4_aops = { .readpage = ext4_readpage, - .readpages = ext4_readpages, + .readahead = ext4_readahead, .writepage = ext4_writepage, .writepages = ext4_writepages, .write_begin = ext4_write_begin,
@@ -3604,7 +3601,7 @@ static const struct address_space_operations ext4_aops = {static const struct address_space_operations ext4_journalled_aops = { .readpage = ext4_readpage, - .readpages = ext4_readpages, + .readahead = ext4_readahead, .writepage = ext4_writepage, .writepages = ext4_writepages, .write_begin = ext4_write_begin,
@@ -3620,7 +3617,7 @@ static const struct address_space_operations ext4_journalled_aops = {static const struct address_space_operations ext4_da_aops = { .readpage = ext4_readpage, - .readpages = ext4_readpages, + .readahead = ext4_readahead, .writepage = ext4_writepage, .writepages = ext4_writepages, .write_begin = ext4_da_write_begin,
fs/ext4/readpage.c +8 -14
@@ -7,8 +7,8 @@* * This was originally taken from fs/mpage.c * -* The intent is the ext4_mpage_readpages() function here is intended -* to replace mpage_readpages() in the general case, not just for +* The ext4_mpage_readpages() function here is intended to +* replace mpage_readahead() in the general case, not just for * encrypted files. It has some limitations (see below), where it * will fall back to read_block_full_page(), but these limitations * should only be hit when page_size != block_size.
@@ -222,8 +222,7 @@ static inline loff_t ext4_readpage_limit(struct inode *inode) }int ext4_mpage_readpages (struct address_space *mapping, -struct list_head *pages,struct page *page, -unsigned nr_pages,bool is_readahead) +struct readahead_control *rac,struct page *page) {struct bio *bio =NULL ;sector_t last_block_in_bio =0 ;
@@ -241,6 +240,7 @@ int ext4_mpage_readpages(struct address_space *mapping,int length;unsigned relative_block =0 ;struct ext4_map_blocks map; +unsigned int nr_pages = rac ?readahead_count (rac) :1 ; map.m_pblk =0 ; map.m_lblk =0 ;
@@ -251,14 +251,9 @@ int ext4_mpage_readpages(struct address_space *mapping,int fully_mapped =1 ;unsigned first_hole = blocks_per_page; -if (pages) { - page =lru_to_page (pages); - +if (rac) { + page =readahead_page (rac);prefetchw (&page->flags); -list_del (&page->lru); -if (add_to_page_cache_lru (page, mapping, page->index, -readahead_gfp_mask (mapping))) - goto next_page; }if (page_has_buffers (page))
@@ -381,7 +376,7 @@ int ext4_mpage_readpages(struct address_space *mapping, bio->bi_iter.bi_sector = blocks[0 ] << (blkbits -9 ); bio->bi_end_io = mpage_end_io;bio_set_op_attrs (bio,REQ_OP_READ , - is_readahead ?REQ_RAHEAD :0 ); + rac ?REQ_RAHEAD :0 ); } length = first_hole << blkbits;
@@ -406,10 +401,9 @@ int ext4_mpage_readpages(struct address_space *mapping,else unlock_page (page); next_page: -if (pages) +if (rac)put_page (page); } -BUG_ON (pages && !list_empty (pages));if (bio)submit_bio (bio);return 0 ;
Signature · 1 line
2.25.0
Matthew Wilcox
maintainerPATCH v8 21/25 ext4: Pass the inode to ext4_mpage_readpages
In reply to Matthew WilcoxFrom: "Matthew Wilcox (Oracle)" <[email protected]>
This function now only uses the mapping argument to look up the inode, and both callers already have the inode, so just pass the inode instead of the mapping.
--- fs/ext4/ext4.h | 2 +- fs/ext4/inode.c | 4 ++-- fs/ext4/readpage.c | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-)
fs/ext4/ext4.h +1 -1
@@ -3278,7 +3278,7 @@ static inline void ext4_set_de_type(struct super_block *sb, }/* readpages.c */ -extern int ext4_mpage_readpages (struct address_space *mapping, +extern int ext4_mpage_readpages (struct inode *inode,struct readahead_control *rac,struct page *page);extern int __init ext4_init_post_read_processing (void );extern void ext4_exit_post_read_processing (void );
fs/ext4/inode.c +2 -2
@@ -3226,7 +3226,7 @@ static int ext4_readpage(struct file *file, struct page *page) ret =ext4_readpage_inline (inode, page);if (ret == -EAGAIN ) -return ext4_mpage_readpages (page->mapping,NULL , page); +return ext4_mpage_readpages (inode,NULL , page);return ret; }
@@ -3239,7 +3239,7 @@ static void ext4_readahead(struct readahead_control *rac)if (ext4_has_inline_data (inode))return ; -ext4_mpage_readpages (rac->mapping, rac,NULL ); +ext4_mpage_readpages (inode, rac,NULL ); } static void ext4_invalidatepage(struct page *page, unsigned int offset,
fs/ext4/readpage.c +1 -2
@@ -221,13 +221,12 @@ static inline loff_t ext4_readpage_limit(struct inode *inode)return i_size_read (inode); } -int ext4_mpage_readpages (struct address_space *mapping, +int ext4_mpage_readpages (struct inode *inode,struct readahead_control *rac,struct page *page) {struct bio *bio =NULL ;sector_t last_block_in_bio =0 ; -struct inode *inode = mapping->host;const unsigned blkbits = inode->i_blkbits;const unsigned blocks_per_page =PAGE_SIZE >> blkbits;const unsigned blocksize =1 << blkbits;
Signature · 1 line
2.25.0
Matthew Wilcox
maintainerPATCH v8 22/25 f2fs: Convert from readpages to readahead
In reply to Matthew WilcoxFrom: "Matthew Wilcox (Oracle)" <[email protected]>
Use the new readahead operation in f2fs
--- fs/f2fs/data.c | 47 +++++++++++++++---------------------- include/trace/events/f2fs.h | 6 ++--- 2 files changed, 22 insertions(+), 31 deletions(-)
fs/f2fs/data.c +19 -28
@@ -2160,8 +2160,7 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret,* from read-ahead. */ static int f2fs_mpage_readpages (struct address_space *mapping, -struct list_head *pages,struct page *page, -unsigned nr_pages,bool is_readahead) +struct readahead_control *rac,struct page *page) {struct bio *bio =NULL ;sector_t last_block_in_bio =0 ;
@@ -2179,6 +2178,7 @@ static int f2fs_mpage_readpages(struct address_space *mapping, .nr_cpages = 0, };#endif +unsigned nr_pages = rac ?readahead_count (rac) :1 ;unsigned max_nr_pages = nr_pages;int ret =0 ;
@@ -2192,15 +2192,9 @@ static int f2fs_mpage_readpages(struct address_space *mapping, map.m_may_create = false;for (; nr_pages; nr_pages--) { -if (pages) { - page = list_last_entry(pages, struct page, lru); - +if (rac) { + page =readahead_page (rac);prefetchw (&page->flags); -list_del (&page->lru); -if (add_to_page_cache_lru (page, mapping, -page_index (page), -readahead_gfp_mask (mapping))) - goto next_page; }#ifdef CONFIG_F2FS_FS_COMPRESSION
@@ -2210,7 +2204,7 @@ static int f2fs_mpage_readpages(struct address_space *mapping, ret =f2fs_read_multi_pages (&cc, &bio, max_nr_pages, &last_block_in_bio, - is_readahead); + rac);f2fs_destroy_compress_ctx (&cc);if (ret) goto set_error_page;
@@ -2233,7 +2227,7 @@ static int f2fs_mpage_readpages(struct address_space *mapping,#endif ret =f2fs_read_single_page (inode, page, max_nr_pages, &map, - &bio, &last_block_in_bio, is_readahead); + &bio, &last_block_in_bio, rac);if (ret) {#ifdef CONFIG_F2FS_FS_COMPRESSION set_error_page:
@@ -2242,8 +2236,10 @@ static int f2fs_mpage_readpages(struct address_space *mapping,zero_user_segment (page,0 ,PAGE_SIZE );unlock_page (page); } +#ifdef CONFIG_F2FS_FS_COMPRESSION next_page: -if (pages) +#endif +if (rac)put_page (page);#ifdef CONFIG_F2FS_FS_COMPRESSION
@@ -2253,16 +2249,15 @@ static int f2fs_mpage_readpages(struct address_space *mapping, ret =f2fs_read_multi_pages (&cc, &bio, max_nr_pages, &last_block_in_bio, - is_readahead); + rac); f2fs_destroy_compress_ctx(&cc); } }#endif } -BUG_ON (pages && !list_empty (pages));if (bio)__submit_bio (F2FS_I_SB (inode), bio,DATA ); -return pages ?0 : ret; +return ret; }static int f2fs_read_data_page (struct file *file,struct page *page)
@@ -2281,28 +2276,24 @@ static int f2fs_read_data_page(struct file *file, struct page *page)if (f2fs_has_inline_data (inode)) ret =f2fs_read_inline_data (inode, page);if (ret == -EAGAIN ) - ret =f2fs_mpage_readpages (page_file_mapping (page), -NULL , page,1 , false); + ret =f2fs_mpage_readpages (page_file_mapping (page),NULL , page);return ret; } -static int f2fs_read_data_pages (struct file *file, -struct address_space *mapping, -struct list_head *pages,unsigned nr_pages) +static void f2fs_readahead (struct readahead_control *rac) { -struct inode *inode = mapping->host; - struct page *page = list_last_entry(pages, struct page, lru); +struct inode *inode = rac->mapping->host; -trace_f2fs_readpages (inode, page, nr_pages); +trace_f2fs_readpages (inode,readahead_index (rac),readahead_count (rac));if (!f2fs_is_compress_backend_ready (inode)) -return 0 ; +return ;/* If the file has inline data, skip readpages */ if (f2fs_has_inline_data (inode)) -return 0 ; +return ; -return f2fs_mpage_readpages (mapping, pages,NULL , nr_pages, true); +f2fs_mpage_readpages (rac->mapping, rac,NULL ); }int f2fs_encrypt_one_page (struct f2fs_io_info *fio)
@@ -3784,7 +3775,7 @@ static void f2fs_swap_deactivate(struct file *file)const struct address_space_operations f2fs_dblock_aops = { .readpage = f2fs_read_data_page, - .readpages = f2fs_read_data_pages, + .readahead = f2fs_readahead, .writepage = f2fs_write_data_page, .writepages = f2fs_write_data_pages, .write_begin = f2fs_write_begin,
include/trace/events/f2fs.h +3 -3
@@ -1375,9 +1375,9 @@ TRACE_EVENT(f2fs_writepages, TRACE_EVENT(f2fs_readpages, - TP_PROTO(struct inode *inode, struct page *page, unsigned int nrpage), + TP_PROTO(struct inode *inode, pgoff_t start, unsigned int nrpage), - TP_ARGS(inode, page, nrpage), + TP_ARGS(inode, start, nrpage), TP_STRUCT__entry( __field(dev_t, dev)
@@ -1389,7 +1389,7 @@ TRACE_EVENT(f2fs_readpages,TP_fast_assign ( __entry->dev = inode->i_sb->s_dev; __entry->ino = inode->i_ino; - __entry->start = page->index; + __entry->start = start; __entry->nrpage = nrpage; ),
Signature · 1 line
2.25.0
Matthew Wilcox
maintainerPATCH v8 23/25 f2fs: Pass the inode to f2fs_mpage_readpages
In reply to Matthew WilcoxFrom: "Matthew Wilcox (Oracle)" <[email protected]>
This function now only uses the mapping argument to look up the inode, and both callers already have the inode, so just pass the inode instead of the mapping.
--- fs/f2fs/data.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
fs/f2fs/data.c +3 -4
@@ -2159,12 +2159,11 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret,* use ->readpage() or do the necessary surgery to decouple ->readpages() * from read-ahead. */ -static int f2fs_mpage_readpages (struct address_space *mapping, +static int f2fs_mpage_readpages (struct inode *inode,struct readahead_control *rac,struct page *page) {struct bio *bio =NULL ;sector_t last_block_in_bio =0 ; -struct inode *inode = mapping->host;struct f2fs_map_blocks map;#ifdef CONFIG_F2FS_FS_COMPRESSION struct compress_ctx cc = {
@@ -2276,7 +2275,7 @@ static int f2fs_read_data_page(struct file *file, struct page *page)if (f2fs_has_inline_data (inode)) ret =f2fs_read_inline_data (inode, page);if (ret == -EAGAIN ) - ret =f2fs_mpage_readpages (page_file_mapping (page),NULL , page); + ret =f2fs_mpage_readpages (inode,NULL , page);return ret; }
@@ -2293,7 +2292,7 @@ static void f2fs_readahead(struct readahead_control *rac)if (f2fs_has_inline_data (inode))return ; -f2fs_mpage_readpages (rac->mapping, rac,NULL ); +f2fs_mpage_readpages (inode, rac,NULL ); }int f2fs_encrypt_one_page (struct f2fs_io_info *fio)
Signature · 1 line
2.25.0
Matthew Wilcox
maintainerPATCH v8 24/25 fuse: Convert from readpages to readahead
In reply to Matthew WilcoxFrom: "Matthew Wilcox (Oracle)" <[email protected]>
Use the new readahead operation in fuse. Switching away from the read_cache_pages() helper gets rid of an implicit call to put_page(), so we can get rid of the get_page() call in fuse_readpages_fill().
--- fs/fuse/file.c | 46 +++++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 27 deletions(-)
fs/fuse/file.c +19 -27
@@ -923,9 +923,8 @@ struct fuse_fill_data {unsigned int max_pages; }; -static int fuse_readpages_fill (void *_data,struct page *page) +static int fuse_readpages_fill (struct fuse_fill_data *data,struct page *page) { -struct fuse_fill_data *data = _data;struct fuse_io_args *ia = data->ia;struct fuse_args_pages *ap = &ia->ap;struct inode *inode = data->inode;
@@ -941,10 +940,8 @@ static int fuse_readpages_fill(void *_data, struct page *page) fc->max_pages);fuse_send_readpages (ia, data->file); data->ia = ia =fuse_io_alloc (NULL , data->max_pages); -if (!ia) { -unlock_page (page); +if (!ia)return -ENOMEM ; - } ap = &ia->ap; }
@@ -954,7 +951,6 @@ static int fuse_readpages_fill(void *_data, struct page *page)return -EIO ; } -get_page (page); ap->pages[ap->num_pages] = page; ap->descs[ap->num_pages].length =PAGE_SIZE ; ap->num_pages++;
@@ -962,37 +958,33 @@ static int fuse_readpages_fill(void *_data, struct page *page)return 0 ; } -static int fuse_readpages (struct file *file,struct address_space *mapping, -struct list_head *pages,unsigned nr_pages) +static void fuse_readahead (struct readahead_control *rac) { -struct inode *inode = mapping->host; +struct inode *inode = rac->mapping->host;struct fuse_conn *fc =get_fuse_conn (inode);struct fuse_fill_data data; -int err; +struct page *page; - err = -EIO ;if (is_bad_inode (inode)) - goto out; +return ; - data.file = file; + data.file = rac->file; data.inode = inode; - data.nr_pages = nr_pages; - data.max_pages = min_t(unsigned int, nr_pages, fc->max_pages); -; + data.nr_pages =readahead_count (rac); + data.max_pages = min_t(unsigned int, data.nr_pages, fc->max_pages); data.ia =fuse_io_alloc (NULL , data.max_pages); - err = -ENOMEM ;if (!data.ia) - goto out; +return ; - err =read_cache_pages (mapping, pages, fuse_readpages_fill, &data); -if (!err) { -if (data.ia->ap.num_pages) -fuse_send_readpages (data.ia, file); -else -fuse_io_free (data.ia); +while ((page =readahead_page (rac))) { +if (fuse_readpages_fill (&data, page) !=0 ) +return ; } -out: -return err; + +if (data.ia->ap.num_pages) +fuse_send_readpages (data.ia, rac->file); +else +fuse_io_free (data.ia); }static ssize_t fuse_cache_read_iter (struct kiocb *iocb,struct iov_iter *to)
@@ -3373,10 +3365,10 @@ static const struct file_operations fuse_file_operations = {static const struct address_space_operations fuse_file_aops = { .readpage = fuse_readpage, + .readahead = fuse_readahead, .writepage = fuse_writepage, .writepages = fuse_writepages, .launder_page = fuse_launder_page, - .readpages = fuse_readpages, .set_page_dirty = __set_page_dirty_nobuffers, .bmap = fuse_bmap, .direct_IO = fuse_direct_IO,
Signature · 1 line
2.25.0
Matthew Wilcox
maintainerPATCH v8 25/25 iomap: Convert from readpages to readahead
In reply to Matthew WilcoxFrom: "Matthew Wilcox (Oracle)" <[email protected]>
Use the new readahead operation in iomap. Convert XFS and ZoneFS to use it.
--- fs/iomap/buffered-io.c | 90 +++++++++++++++--------------------------- fs/iomap/trace.h | 2 +- fs/xfs/xfs_aops.c | 13 +++--- fs/zonefs/super.c | 7 ++-- include/linux/iomap.h | 3 +- 5 files changed, 41 insertions(+), 74 deletions(-)
fs/iomap/buffered-io.c +31 -59
@@ -214,9 +214,8 @@ iomap_read_end_io(struct bio *bio)struct iomap_readpage_ctx {struct page *cur_page;bool cur_page_in_bio; -bool is_readahead;struct bio *bio; -struct list_head *pages; +struct readahead_control *rac; }; static void
@@ -307,11 +306,11 @@ iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data,if (ctx->bio)submit_bio (ctx->bio); -if (ctx->is_readahead)/* same as readahead_gfp_mask */ +if (ctx->rac)/* same as readahead_gfp_mask */ gfp |= __GFP_NORETRY | __GFP_NOWARN; ctx->bio =bio_alloc (gfp,min (BIO_MAX_PAGES , nr_vecs)); ctx->bio->bi_opf =REQ_OP_READ ; -if (ctx->is_readahead) +if (ctx->rac) ctx->bio->bi_opf |=REQ_RAHEAD ; ctx->bio->bi_iter.bi_sector = sector;bio_set_dev (ctx->bio, iomap->bdev);
@@ -367,36 +366,8 @@ iomap_readpage(struct page *page, const struct iomap_ops *ops) }EXPORT_SYMBOL_GPL (iomap_readpage); -static struct page * -iomap_next_page (struct inode *inode,struct list_head *pages,loff_t pos, -loff_t length,loff_t *done) -{ -while (!list_empty (pages)) { -struct page *page =lru_to_page (pages); - -if (page_offset (page) >= (u64 )pos + length) -break ; - -list_del (&page->lru); -if (!add_to_page_cache_lru (page, inode->i_mapping, page->index, -GFP_NOFS )) -return page; - -/* -* If we already have a page in the page cache at index we are -* done. Upper layers don't care if it is uptodate after the -* readpages call itself as every page gets checked again once -* actually needed. -*/ - *done +=PAGE_SIZE ; -put_page (page); - } - -return NULL ; -} -static loff_t -iomap_readpages_actor (struct inode *inode,loff_t pos,loff_t length, +iomap_readahead_actor (struct inode *inode,loff_t pos,loff_t length,void *data,struct iomap *iomap,struct iomap *srcmap) {struct iomap_readpage_ctx *ctx = data;
@@ -410,10 +381,7 @@ iomap_readpages_actor(struct inode *inode, loff_t pos, loff_t length, ctx->cur_page =NULL ; }if (!ctx->cur_page) { - ctx->cur_page =iomap_next_page (inode, ctx->pages, - pos, length, &done); -if (!ctx->cur_page) -break ; + ctx->cur_page =readahead_page (ctx->rac); ctx->cur_page_in_bio = false; } ret = iomap_readpage_actor(inode, pos + done, length - done,
@@ -423,32 +391,43 @@ iomap_readpages_actor(struct inode *inode, loff_t pos, loff_t length,return done; } -int -iomap_readpages (struct address_space *mapping,struct list_head *pages, -unsigned nr_pages,const struct iomap_ops *ops) +/** +* iomap_readahead - Attempt to read pages from a file. +* @rac: Describes the pages to be read. +* @ops: The operations vector for the filesystem. +* +* This function is for filesystems to call to implement their readahead +* address_space operation. +* +* Context: The @ops callbacks may submit I/O (eg to read the addresses of +* blocks from disc), and may wait for it. The caller may be trying to +* access a different page, and so sleeping excessively should be avoided. +* It may allocate memory, but should avoid costly allocations. This +* function is called with memalloc_nofs set, so allocations will not cause +* the filesystem to be reentered. +*/ +void iomap_readahead (struct readahead_control *rac,const struct iomap_ops *ops) { +struct inode *inode = rac->mapping->host; +loff_t pos =readahead_pos (rac); +loff_t length =readahead_length (rac);struct iomap_readpage_ctx ctx = { - .pages = pages, - .is_readahead = true, + .rac = rac, }; - loff_t pos = page_offset(list_entry(pages->prev, struct page, lru)); - loff_t last = page_offset(list_entry(pages->next, struct page, lru)); -loff_t length = last - pos +PAGE_SIZE , ret =0 ; -trace_iomap_readpages (mapping->host, nr_pages); +trace_iomap_readahead (inode,readahead_count (rac));while (length >0 ) { - ret =iomap_apply (mapping->host, pos, length,0 , ops, - &ctx, iomap_readpages_actor); +loff_t ret =iomap_apply (inode, pos, length,0 , ops, + &ctx, iomap_readahead_actor);if (ret <=0 ) {WARN_ON_ONCE (ret ==0 ); - goto done; +break ; } pos += ret; length -= ret; } - ret =0 ; -done: +if (ctx.bio)submit_bio (ctx.bio);if (ctx.cur_page) {
@@ -456,15 +435,8 @@ iomap_readpages(struct address_space *mapping, struct list_head *pages,unlock_page (ctx.cur_page);put_page (ctx.cur_page); } - -/* -* Check that we didn't lose a page due to the arcance calling -* conventions.. -*/ -WARN_ON_ONCE (!ret && !list_empty (ctx.pages)); -return ret; } -EXPORT_SYMBOL_GPL (iomap_readpages); +EXPORT_SYMBOL_GPL (iomap_readahead);/* * iomap_is_partially_uptodate checks whether blocks within a page are
fs/iomap/trace.h +1 -1
@@ -39,7 +39,7 @@ DEFINE_EVENT(iomap_readpage_class, name, \ TP_PROTO(struct inode *inode, int nr_pages), \ TP_ARGS(inode, nr_pages)) DEFINE_READPAGE_EVENT(iomap_readpage); -DEFINE_READPAGE_EVENT (iomap_readpages); +DEFINE_READPAGE_EVENT (iomap_readahead); DECLARE_EVENT_CLASS(iomap_page_class, TP_PROTO(struct inode *inode, struct page *page, unsigned long off,
fs/xfs/xfs_aops.c +5 -8
@@ -621,14 +621,11 @@ xfs_vm_readpage(return iomap_readpage (page, &xfs_read_iomap_ops); } -STATIC int -xfs_vm_readpages ( -struct file *unused, -struct address_space *mapping, -struct list_head *pages, -unsigned nr_pages) +STATIC void +xfs_vm_readahead ( +struct readahead_control *rac) { -return iomap_readpages (mapping, pages, nr_pages, &xfs_read_iomap_ops); +iomap_readahead (rac, &xfs_read_iomap_ops); } static int
@@ -644,7 +641,7 @@ xfs_iomap_swapfile_activate(const struct address_space_operations xfs_address_space_operations = { .readpage = xfs_vm_readpage, - .readpages = xfs_vm_readpages, + .readahead = xfs_vm_readahead, .writepage = xfs_vm_writepage, .writepages = xfs_vm_writepages, .set_page_dirty = iomap_set_page_dirty,
fs/zonefs/super.c +3 -4
@@ -78,10 +78,9 @@ static int zonefs_readpage(struct file *unused, struct page *page)return iomap_readpage (page, &zonefs_iomap_ops); } -static int zonefs_readpages (struct file *unused,struct address_space *mapping, -struct list_head *pages,unsigned int nr_pages) +static void zonefs_readahead (struct readahead_control *rac) { -return iomap_readpages (mapping, pages, nr_pages, &zonefs_iomap_ops); +iomap_readahead (rac, &zonefs_iomap_ops); }/*
@@ -128,7 +127,7 @@ static int zonefs_writepages(struct address_space *mapping,static const struct address_space_operations zonefs_file_aops = { .readpage = zonefs_readpage, - .readpages = zonefs_readpages, + .readahead = zonefs_readahead, .writepage = zonefs_writepage, .writepages = zonefs_writepages, .set_page_dirty = iomap_set_page_dirty,
include/linux/iomap.h +1 -2
@@ -155,8 +155,7 @@ loff_t iomap_apply(struct inode *inode, loff_t pos, loff_t length,ssize_t iomap_file_buffered_write (struct kiocb *iocb,struct iov_iter *from,const struct iomap_ops *ops);int iomap_readpage (struct page *page,const struct iomap_ops *ops); -int iomap_readpages (struct address_space *mapping,struct list_head *pages, -unsigned nr_pages,const struct iomap_ops *ops); +void iomap_readahead (struct readahead_control *,const struct iomap_ops *ops);int iomap_set_page_dirty (struct page *page);int iomap_is_partially_uptodate (struct page *page,unsigned long from,unsigned long count);
Signature · 1 line
2.25.0
Re: [PATCH v8 25/25] iomap: Convert from readpages to readahead
Quoted 152 lines · Matthew Wilcox
From: "Matthew Wilcox (Oracle)" <[email protected]>
Use the new readahead operation in iomap. Convert XFS and ZoneFS to use it.
Signed-off-by Matthew Wilcox (Oracle) <[email protected]>--- fs/iomap/buffered-io.c | 90 +++++++++++++++--------------------------- fs/iomap/trace.h | 2 +- fs/xfs/xfs_aops.c | 13 +++--- fs/zonefs/super.c | 7 ++-- include/linux/iomap.h | 3 +- 5 files changed, 41 insertions(+), 74 deletions(-)fs/iomap/buffered-io.c +30
-51@@ -214,9 +214,8 @@ iomap_read_end_io(struct bio *bio)struct iomap_readpage_ctx {struct page *cur_page;bool cur_page_in_bio; -bool is_readahead;struct bio *bio; -struct list_head *pages; +struct readahead_control *rac; }; static void@@ -307,11 +306,11 @@ iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data,if (ctx->bio)submit_bio (ctx->bio); -if (ctx->is_readahead)/* same as readahead_gfp_mask */ +if (ctx->rac)/* same as readahead_gfp_mask */ gfp |= __GFP_NORETRY | __GFP_NOWARN; ctx->bio =bio_alloc (gfp,min (BIO_MAX_PAGES , nr_vecs)); ctx->bio->bi_opf =REQ_OP_READ ; -if (ctx->is_readahead) +if (ctx->rac) ctx->bio->bi_opf |=REQ_RAHEAD ; ctx->bio->bi_iter.bi_sector = sector;bio_set_dev (ctx->bio, iomap->bdev);@@ -367,36 +366,8 @@ iomap_readpage(struct page *page, const struct iomap_ops *ops) }EXPORT_SYMBOL_GPL (iomap_readpage); -static struct page * -iomap_next_page (struct inode *inode,struct list_head *pages,loff_t pos, -loff_t length,loff_t *done) -{ -while (!list_empty (pages)) { -struct page *page =lru_to_page (pages); - -if (page_offset (page) >= (u64 )pos + length) -break ; - -list_del (&page->lru); -if (!add_to_page_cache_lru (page, inode->i_mapping, page->index, -GFP_NOFS )) -return page; - -/* -* If we already have a page in the page cache at index we are -* done. Upper layers don't care if it is uptodate after the -* readpages call itself as every page gets checked again once -* actually needed. -*/ - *done +=PAGE_SIZE ; -put_page (page); - } - -return NULL ; -} -static loff_t -iomap_readpages_actor (struct inode *inode,loff_t pos,loff_t length, +iomap_readahead_actor (struct inode *inode,loff_t pos,loff_t length,void *data,struct iomap *iomap,struct iomap *srcmap) {struct iomap_readpage_ctx *ctx = data;@@ -410,10 +381,7 @@ iomap_readpages_actor(struct inode *inode, loff_t pos, loff_t length, ctx->cur_page =NULL ; }if (!ctx->cur_page) { - ctx->cur_page =iomap_next_page (inode, ctx->pages, - pos, length, &done); -if (!ctx->cur_page) -break ; + ctx->cur_page =readahead_page (ctx->rac); ctx->cur_page_in_bio = false; } ret = iomap_readpage_actor(inode, pos + done, length - done,@@ -423,32 +391,43 @@ iomap_readpages_actor(struct inode *inode, loff_t pos, loff_t length,return done; } -int -iomap_readpages (struct address_space *mapping,struct list_head *pages, -unsigned nr_pages,const struct iomap_ops *ops) +/** +* iomap_readahead - Attempt to read pages from a file. +* @rac: Describes the pages to be read. +* @ops: The operations vector for the filesystem. +* +* This function is for filesystems to call to implement their readahead +* address_space operation. +* +* Context: The @ops callbacks may submit I/O (eg to read the addresses of +* blocks from disc), and may wait for it. The caller may be trying to +* access a different page, and so sleeping excessively should be avoided. +* It may allocate memory, but should avoid costly allocations. This +* function is called with memalloc_nofs set, so allocations will not cause +* the filesystem to be reentered. +*/ +void iomap_readahead (struct readahead_control *rac,const struct iomap_ops *ops) { +struct inode *inode = rac->mapping->host; +loff_t pos =readahead_pos (rac); +loff_t length =readahead_length (rac);struct iomap_readpage_ctx ctx = { - .pages = pages, - .is_readahead = true, + .rac = rac, }; - loff_t pos = page_offset(list_entry(pages->prev, struct page, lru)); - loff_t last = page_offset(list_entry(pages->next, struct page, lru)); -loff_t length = last - pos +PAGE_SIZE , ret =0 ; -trace_iomap_readpages (mapping->host, nr_pages); +trace_iomap_readahead (inode,readahead_count (rac));while (length >0 ) { - ret =iomap_apply (mapping->host, pos, length,0 , ops, - &ctx, iomap_readpages_actor); +loff_t ret =iomap_apply (inode, pos, length,0 , ops, + &ctx, iomap_readahead_actor);if (ret <=0 ) {WARN_ON_ONCE (ret ==0 ); - goto done; +break ; } pos += ret; length -= ret; } - ret =0 ; -done: +if (ctx.bio)submit_bio (ctx.bio);if (ctx.cur_page) {
fs/iomap/buffered-io.c iomap_readpages(struct address_space *mapping, struct list_head *pages, · line 465
Quoted 10 lines
fs/iomap/buffered-io.c +0
-7@@ -456,15 +435,8 @@ iomap_readpages(struct address_space *mapping, struct list_head *pages,unlock_page (ctx.cur_page);put_page (ctx.cur_page); } - -/* -* Check that we didn't lose a page due to the arcance calling -* conventions.. -*/ -WARN_ON_ONCE (!ret && !list_empty (ctx.pages)); -return ret;
After all the discussion about "if we still have ctx.cur_page we should just stop" in v7, I'm surprised that this patch now doesn't say much of anything, not even a WARN_ON()?
Other than that, it looks fine.
--D
Quoted 94 lines
fs/iomap/buffered-io.c +1
-1} -EXPORT_SYMBOL_GPL (iomap_readpages); +EXPORT_SYMBOL_GPL (iomap_readahead);/* * iomap_is_partially_uptodate checks whether blocks within a page are fs/iomap/trace.h +1
-1@@ -39,7 +39,7 @@ DEFINE_EVENT(iomap_readpage_class, name, \ TP_PROTO(struct inode *inode, int nr_pages), \ TP_ARGS(inode, nr_pages)) DEFINE_READPAGE_EVENT(iomap_readpage); -DEFINE_READPAGE_EVENT (iomap_readpages); +DEFINE_READPAGE_EVENT (iomap_readahead); DECLARE_EVENT_CLASS(iomap_page_class, TP_PROTO(struct inode *inode, struct page *page, unsigned long off,fs/xfs/xfs_aops.c +5
-8@@ -621,14 +621,11 @@ xfs_vm_readpage(return iomap_readpage (page, &xfs_read_iomap_ops); } -STATIC int -xfs_vm_readpages ( -struct file *unused, -struct address_space *mapping, -struct list_head *pages, -unsigned nr_pages) +STATIC void +xfs_vm_readahead ( +struct readahead_control *rac) { -return iomap_readpages (mapping, pages, nr_pages, &xfs_read_iomap_ops); +iomap_readahead (rac, &xfs_read_iomap_ops); } static int@@ -644,7 +641,7 @@ xfs_iomap_swapfile_activate(const struct address_space_operations xfs_address_space_operations = { .readpage = xfs_vm_readpage, - .readpages = xfs_vm_readpages, + .readahead = xfs_vm_readahead, .writepage = xfs_vm_writepage, .writepages = xfs_vm_writepages, .set_page_dirty = iomap_set_page_dirty,fs/zonefs/super.c +3
-4@@ -78,10 +78,9 @@ static int zonefs_readpage(struct file *unused, struct page *page)return iomap_readpage (page, &zonefs_iomap_ops); } -static int zonefs_readpages (struct file *unused,struct address_space *mapping, -struct list_head *pages,unsigned int nr_pages) +static void zonefs_readahead (struct readahead_control *rac) { -return iomap_readpages (mapping, pages, nr_pages, &zonefs_iomap_ops); +iomap_readahead (rac, &zonefs_iomap_ops); }/* @@ -128,7 +127,7 @@ static int zonefs_writepages(struct address_space *mapping,static const struct address_space_operations zonefs_file_aops = { .readpage = zonefs_readpage, - .readpages = zonefs_readpages, + .readahead = zonefs_readahead, .writepage = zonefs_writepage, .writepages = zonefs_writepages, .set_page_dirty = iomap_set_page_dirty,include/linux/iomap.h +1
-2@@ -155,8 +155,7 @@ loff_t iomap_apply(struct inode *inode, loff_t pos, loff_t length,ssize_t iomap_file_buffered_write (struct kiocb *iocb,struct iov_iter *from,const struct iomap_ops *ops);int iomap_readpage (struct page *page,const struct iomap_ops *ops); -int iomap_readpages (struct address_space *mapping,struct list_head *pages, -unsigned nr_pages,const struct iomap_ops *ops); +void iomap_readahead (struct readahead_control *,const struct iomap_ops *ops);int iomap_set_page_dirty (struct page *page);int iomap_is_partially_uptodate (struct page *page,unsigned long from,unsigned long count);Signature · 1 line
2.25.0
Re: [PATCH v8 25/25] iomap: Convert from readpages to readahead
Quoted 7 lines · Darrick J. Wong
Quoted 7 lines
fs/iomap/buffered-io.c +0
-3@@ -456,15 +435,8 @@ iomap_readpages(struct address_space *mapping, struct list_head *pages,unlock_page (ctx.cur_page);put_page (ctx.cur_page); } - -/* -* Check that we didn't lose a page due to the arcance calling
Quoted 8 lines
fs/iomap/buffered-io.c iomap_readpages(struct address_space *mapping, struct list_head *pages, · line 465
Quoted 4 lines
fs/iomap/buffered-io.c +0
-4-* conventions.. -*/ -WARN_ON_ONCE (!ret && !list_empty (ctx.pages)); -return ret;After all the discussion about "if we still have ctx.cur_page we should just stop" in v7, I'm surprised that this patch now doesn't say much of anything, not even a
WARN_ON()?
The code quoted above puts the cur_page reference. By dropping the odd refactoring patch there is no need to check for cur_page being left as a special condition as that still is the normal loop exit state and properly handled, just as in the original iomap code.
Darrick J. Wong
Reviewed-byRe: [PATCH v8 25/25] iomap: Convert from readpages to readahead
Quoted 17 lines · Christoph Hellwig
Quoted 7 lines · Darrick J. Wong
Quoted 7 lines
fs/iomap/buffered-io.c +0
-3@@ -456,15 +435,8 @@ iomap_readpages(struct address_space *mapping, struct list_head *pages,unlock_page (ctx.cur_page);put_page (ctx.cur_page); } - -/* -* Check that we didn't lose a page due to the arcance calling Quoted 8 lines
fs/iomap/buffered-io.c iomap_readpages(struct address_space *mapping, struct list_head *pages, · line 465
Quoted 4 lines
fs/iomap/buffered-io.c +0
-4-* conventions.. -*/ -WARN_ON_ONCE (!ret && !list_empty (ctx.pages)); -return ret;After all the discussion about "if we still have ctx.cur_page we should just stop" in v7, I'm surprised that this patch now doesn't say much of anything, not even a
WARN_ON()?
Quoted 4 lines
The code quoted above puts the
cur_pagereference. By dropping the odd refactoring patch there is no need to check forcur_pagebeing left as a special condition as that still is the normal loop exit state and properly handled, just as in the original iomap code.
DOH. Yes, yes it does. Thanks for pointing that out. :)
/me hands himself another cup of coffee,
--D
Re: [PATCH v8 25/25] iomap: Convert from readpages to readahead
In reply to Matthew WilcoxQuoted 6 lines · Matthew Wilcox
From: "Matthew Wilcox (Oracle)" <[email protected]>
Use the new readahead operation in iomap. Convert XFS and ZoneFS to use it.
Signed-off-by Matthew Wilcox (Oracle) <[email protected]>
Looks good,
subvolume layout?
Hi,
I am doing backups using btrfs snapshots with this kind of (dir/subvol) layout.
backups(btrfs-root)
machine1 machine2
work(rw) day1(ro) day2(ro)... work(rw) day1(ro) day2(ro)...
There are tens on machines and hundreds of daily snapshots total and I can see slowness.
Now I am wondering which one is better. Should those machine level "directories" be directory or subvolume?
Signature · 1 line
Ari
Any plans to resend this with the little nitpicks fixed? I'd love to get this series into 5.7..
Matthew Wilcox
maintainerQuoted 2 lines · Christoph Hellwig
Any plans to resend this with the little nitpicks fixed? I'd love to get this series into 5.7..
The only nitpick I see left is the commit comment in the btrfs patch, and a note from Dave Sterba that he intends to review it. I can collect up the additional Reviewed-by tags and repost the series.
I'm assuming it'll go through Andrew's tree?
For the series: