On Wed 30-11-11 09:06:04, Wu Fengguang wrote:
> > Hmm, wouldn't it be cleaner to do this already in ondemand_readahead()?
> > All other updates of readahead window seem to be there.
>
> Yeah it's not that clean, however the intention is to cover the other
> call site -- mmap read-around, too.
Ah, OK.
> > Also shouldn't we
> > take maximum readahead size into account? Reading 3/2 of max readahead
> > window seems like a relatively big deal for large files...
>
> Good point, the max readahead size is actually a must, in order to
> prevent it expanding the readahead size for ever in the backwards
> reading case.
>
> This limits the size expansion to 1/4 max readahead. That means, if
> the next expected readahead size will be less than 1/4 max size, it
> will be merged into the current readahead window to avoid one small IO.
>
> The backwards reading is not special cased here because it's not
> frequent anyway.
>
> unsigned long ra_submit(struct file_ra_state *ra,
> struct address_space *mapping, struct file *filp)
> {
> + pgoff_t eof = ((i_size_read(mapping->host)-1) >> PAGE_CACHE_SHIFT) + 1;
> + pgoff_t start = ra->start;
> + unsigned long size = ra->size;
> int actual;
>
> + /* snap to EOF */
> + size += min(size, ra->ra_pages / 4);
I'd probably choose:
size += min(size / 2, ra->ra_pages / 4);
to increase current window only to 3/2 and not twice but I don't have a
strong opinion. Otherwise I think the code is fine now so you can add:
Acked-by: Jan Kara <jack@xxxxxxx>
> + if (start + size > eof) {
> + ra->size = eof - start;
> + ra->async_size = 0;
> + }
> +
> actual = __do_page_cache_readahead(mapping, filp,
> ra->start, ra->size, ra->async_size);
Honza
Jan Kara <jack@xxxxxxx>
SUSE Labs, CR
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
