On Mon, Feb 15, 2021 at 03:44:52PM +0000, David Howells wrote:
> +++ b/include/linux/pagemap.h
> @@ -761,6 +761,8 @@ extern void __delete_from_page_cache(struct page *page, void *shadow);
> 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);
> +void readahead_expand(struct readahead_control *ractl,
> + loff_t new_start, size_t new_len);
If we're revising this patchset, I'd rather this lived with the other
readahead declarations, ie after the definition of readahead_control.
> + /* Expand the trailing edge upwards */
> + while (ractl->_nr_pages < new_nr_pages) {
> + unsigned long index = ractl->_index + ractl->_nr_pages;
> + struct page *page = xa_load(&mapping->i_pages, index);
> +
> + if (page && !xa_is_value(page))
> + return; /* Page apparently present */
> +
> + page = __page_cache_alloc(gfp_mask);
> + if (!page)
> + return;
> + if (add_to_page_cache_lru(page, mapping, index, gfp_mask) < 0) {
> + put_page(page);
> + return;
> + }
> + ractl->_nr_pages++;
> + }
We're defeating the ondemand_readahead() algorithm here. Let's suppose
userspace is doing 64kB reads, the filesystem is OrangeFS which only
wants to do 4MB reads, the page cache is initially empty and there's
only one thread doing a sequential read. ondemand_readahead() calls
get_init_ra_size() which tells it to allocate 128kB and set the async
marker at 64kB. Then orangefs calls readahead_expand() to allocate the
remainder of the 4MB. After the app has read the first 64kB, it comes
back to read the next 64kB, sees the readahead marker and tries to trigger
the next batch of readahead, but it's already present, so it does nothing
(see page_cache_ra_unbounded() for what happens with pages present).
Then it keeps going through the 4MB that's been read, not seeing any more
readahead markers, gets to 4MB and asks for ... 256kB? Not quite sure.
Anyway, it then has to wait for the next 4MB because the readahead didn't
overlap with the application processing.
So readahead_expand() needs to adjust the file's f_ra so that when the
application gets to 64kB, it kicks off the readahead of 4MB-8MB chunk (and
then when we get to 4MB+256kB, it kicks off the readahead of 8MB-12MB,
and so on).
Unless someone sees a better way to do this? I don't
want to inadvertently break POSIX_FADV_WILLNEED which calls
force_page_cache_readahead() and should not perturb the kernel's
ondemand algorithm. Perhaps we need to add an 'ra' pointer to the
ractl to indicate whether the file_ra_state should be updated by
readahead_expand()?
