The patch titled
Subject: mm/readahead: pass a file_ra_state into force_page_cache_ra
has been added to the -mm tree. Its filename is
mm-readahead-pass-a-file_ra_state-into-force_page_cache_ra.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/mm-readahead-pass-a-file_ra_state-into-force_page_cache_ra.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/mm-readahead-pass-a-file_ra_state-into-force_page_cache_ra.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: David Howells <dhowells@xxxxxxxxxx>
Subject: mm/readahead: pass a file_ra_state into force_page_cache_ra
The file_ra_state being passed into page_cache_sync_readahead() was being
ignored in favour of using the one embedded in the struct file. The only
caller for which this makes a difference is the fsverity code if the file
has been marked as POSIX_FADV_RANDOM, but it's confusing and worth fixing.
Link: https://lkml.kernel.org/r/20200903140844.14194-10-willy@xxxxxxxxxxxxx
Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
Cc: Eric Biggers <ebiggers@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/internal.h | 5 +++--
mm/readahead.c | 5 ++---
2 files changed, 5 insertions(+), 5 deletions(-)
--- a/mm/internal.h~mm-readahead-pass-a-file_ra_state-into-force_page_cache_ra
+++ a/mm/internal.h
@@ -51,12 +51,13 @@ void unmap_page_range(struct mmu_gather
void do_page_cache_ra(struct readahead_control *, unsigned long nr_to_read,
unsigned long lookahead_size);
-void force_page_cache_ra(struct readahead_control *, unsigned long nr);
+void force_page_cache_ra(struct readahead_control *, struct file_ra_state *,
+ unsigned long nr);
static inline void force_page_cache_readahead(struct address_space *mapping,
struct file *file, pgoff_t index, unsigned long nr_to_read)
{
DEFINE_READAHEAD(ractl, file, mapping, index);
- force_page_cache_ra(&ractl, nr_to_read);
+ force_page_cache_ra(&ractl, &file->f_ra, nr_to_read);
}
/**
--- a/mm/readahead.c~mm-readahead-pass-a-file_ra_state-into-force_page_cache_ra
+++ a/mm/readahead.c
@@ -272,11 +272,10 @@ void do_page_cache_ra(struct readahead_c
* memory at once.
*/
void force_page_cache_ra(struct readahead_control *ractl,
- unsigned long nr_to_read)
+ struct file_ra_state *ra, unsigned long nr_to_read)
{
struct address_space *mapping = ractl->mapping;
struct backing_dev_info *bdi = inode_to_bdi(mapping->host);
- struct file_ra_state *ra = &ractl->file->f_ra;
unsigned long max_pages, index;
if (unlikely(!mapping->a_ops->readpage && !mapping->a_ops->readpages &&
@@ -562,7 +561,7 @@ void page_cache_sync_ra(struct readahead
/* be dumb */
if (ractl->file && (ractl->file->f_mode & FMODE_RANDOM)) {
- force_page_cache_ra(ractl, req_count);
+ force_page_cache_ra(ractl, ra, req_count);
return;
}
_
Patches currently in -mm which might be from dhowells@xxxxxxxxxx are
fix-khugepageds-request-size-in-collapse_file.patch
mm-readahead-make-ondemand_readahead-take-a-readahead_control.patch
mm-readahead-pass-readahead_control-to-force_page_cache_ra.patch
mm-filemap-fold-ra_submit-into-do_sync_mmap_readahead.patch
mm-readahead-pass-a-file_ra_state-into-force_page_cache_ra.patch
mutex-subsystem-synchro-test-module.patch
