* + mm-readahead-make-ondemand_readahead-take-a-readahead_control.patch added to -mm tree
@ 2020-09-03 19:24 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2020-09-03 19:24 UTC (permalink / raw)
To: mm-commits, willy, ebiggers, dhowells
The patch titled
Subject: mm/readahead: make ondemand_readahead take a readahead_control
has been added to the -mm tree. Its filename is
mm-readahead-make-ondemand_readahead-take-a-readahead_control.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/mm-readahead-make-ondemand_readahead-take-a-readahead_control.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/mm-readahead-make-ondemand_readahead-take-a-readahead_control.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@redhat.com>
Subject: mm/readahead: make ondemand_readahead take a readahead_control
Make ondemand_readahead() take a readahead_control struct in preparation
for making do_sync_mmap_readahead() pass down an RAC struct.
Link: https://lkml.kernel.org/r/20200903140844.14194-6-willy@infradead.org
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Eric Biggers <ebiggers@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/readahead.c | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
--- a/mm/readahead.c~mm-readahead-make-ondemand_readahead-take-a-readahead_control
+++ a/mm/readahead.c
@@ -431,15 +431,14 @@ static int try_context_readahead(struct
/*
* A minimal readahead algorithm for trivial sequential/random reads.
*/
-static void ondemand_readahead(struct address_space *mapping,
- struct file_ra_state *ra, struct file *file,
- bool hit_readahead_marker, pgoff_t index,
+static void ondemand_readahead(struct readahead_control *ractl,
+ struct file_ra_state *ra, bool hit_readahead_marker,
unsigned long req_size)
{
- DEFINE_READAHEAD(ractl, file, mapping, index);
- struct backing_dev_info *bdi = inode_to_bdi(mapping->host);
+ struct backing_dev_info *bdi = inode_to_bdi(ractl->mapping->host);
unsigned long max_pages = ra->ra_pages;
unsigned long add_pages;
+ unsigned long index = readahead_index(ractl);
pgoff_t prev_index;
/*
@@ -477,7 +476,8 @@ static void ondemand_readahead(struct ad
pgoff_t start;
rcu_read_lock();
- start = page_cache_next_miss(mapping, index + 1, max_pages);
+ start = page_cache_next_miss(ractl->mapping, index + 1,
+ max_pages);
rcu_read_unlock();
if (!start || start - index > max_pages)
@@ -510,14 +510,15 @@ static void ondemand_readahead(struct ad
* 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, index, req_size, max_pages))
+ if (try_context_readahead(ractl->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_ra(&ractl, req_size, 0);
+ do_page_cache_ra(ractl, req_size, 0);
return;
initial_readahead:
@@ -543,8 +544,8 @@ readit:
}
}
- ractl._index = ra->start;
- do_page_cache_ra(&ractl, ra->size, ra->async_size);
+ ractl->_index = ra->start;
+ do_page_cache_ra(ractl, ra->size, ra->async_size);
}
/**
@@ -564,6 +565,8 @@ void page_cache_sync_readahead(struct ad
struct file_ra_state *ra, struct file *filp,
pgoff_t index, unsigned long req_count)
{
+ DEFINE_READAHEAD(ractl, filp, mapping, index);
+
/* no read-ahead */
if (!ra->ra_pages)
return;
@@ -578,7 +581,7 @@ void page_cache_sync_readahead(struct ad
}
/* do read-ahead */
- ondemand_readahead(mapping, ra, filp, false, index, req_count);
+ ondemand_readahead(&ractl, ra, false, req_count);
}
EXPORT_SYMBOL_GPL(page_cache_sync_readahead);
@@ -602,6 +605,8 @@ page_cache_async_readahead(struct addres
struct page *page, pgoff_t index,
unsigned long req_count)
{
+ DEFINE_READAHEAD(ractl, filp, mapping, index);
+
/* no read-ahead */
if (!ra->ra_pages)
return;
@@ -624,7 +629,7 @@ page_cache_async_readahead(struct addres
return;
/* do read-ahead */
- ondemand_readahead(mapping, ra, filp, true, index, req_count);
+ ondemand_readahead(&ractl, ra, true, req_count);
}
EXPORT_SYMBOL_GPL(page_cache_async_readahead);
_
Patches currently in -mm which might be from dhowells@redhat.com 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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-09-03 19:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-03 19:24 + mm-readahead-make-ondemand_readahead-take-a-readahead_control.patch added to -mm tree akpm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).