On Mon, 15 Apr 2013 12:01:16 +0800 Shaohua Li <shli@xxxxxxxxxx> wrote:
> This is a patch to improve swap readahead algorithm. It's from Hugh and I
> slightly changed it.
>
> ...
>
I find the new code a bit harder to follow that it needs to be.
> --- linux.orig/include/linux/page-flags.h 2013-04-12 15:07:05.011112763 +0800
> +++ linux/include/linux/page-flags.h 2013-04-15 11:48:12.161080804 +0800
> @@ -228,9 +228,9 @@ PAGEFLAG(OwnerPriv1, owner_priv_1) TESTC
> TESTPAGEFLAG(Writeback, writeback) TESTSCFLAG(Writeback, writeback)
> PAGEFLAG(MappedToDisk, mappedtodisk)
>
> -/* PG_readahead is only used for file reads; PG_reclaim is only for writes */
> +/* PG_readahead is only used for reads; PG_reclaim is only for writes */
> PAGEFLAG(Reclaim, reclaim) TESTCLEARFLAG(Reclaim, reclaim)
> -PAGEFLAG(Readahead, reclaim) /* Reminder to do async read-ahead */
> +PAGEFLAG(Readahead, reclaim) TESTCLEARFLAG(Readahead, reclaim)
>
> #ifdef CONFIG_HIGHMEM
> /*
> Index: linux/mm/swap_state.c
> ===================================================================
> --- linux.orig/mm/swap_state.c 2013-04-12 15:07:05.003112912 +0800
> +++ linux/mm/swap_state.c 2013-04-15 11:48:12.165078764 +0800
> @@ -63,6 +63,8 @@ unsigned long total_swapcache_pages(void
> return ret;
> }
>
> +static atomic_t swapin_readahead_hits = ATOMIC_INIT(4);
Some documentation is needed here explaining this variable's role. If
that is understood then perhaps the reader will be able to work out why
it was initialised to "4". Or perhaps not.
> void show_swap_cache_info(void)
> {
> printk("%lu pages in swap cache\n", total_swapcache_pages());
> @@ -286,8 +288,11 @@ struct page * lookup_swap_cache(swp_entr
>
> page = find_get_page(swap_address_space(entry), entry.val);
>
> - if (page)
> + if (page) {
> INC_CACHE_INFO(find_success);
> + if (TestClearPageReadahead(page))
> + atomic_inc(&swapin_readahead_hits);
> + }
>
> INC_CACHE_INFO(find_total);
> return page;
> @@ -373,6 +378,50 @@ struct page *read_swap_cache_async(swp_e
> return found_page;
> }
>
> +unsigned long swapin_nr_pages(unsigned long offset)
Should be static.
Needs documentation explaining what it does and why.
It would probably be clearer to make `offset' have type pgoff_t.
What's what swp_offset() returned. Ditto `entry_offset' in
swapin_readahead(). It's not *really* a pgoff_t, but that's what we
have and it's more informative than a bare ulong.
The documentation should describe the meaning of this function's return
value.
> +{
> + static unsigned long prev_offset;
> + unsigned int pages, max_pages, last_ra;
> + static atomic_t last_readahead_pages;
> +
> + max_pages = 1 << ACCESS_ONCE(page_cluster);
> + if (max_pages <= 1)
> + return 1;
> +
> + /*
> + * This heuristic has been found to work well on both sequential and
> + * random loads, swapping to hard disk or to SSD: please don't ask
> + * what the "+ 2" means, it just happens to work well, that's all.
OK, I won't.
> + */
> + pages = atomic_xchg(&swapin_readahead_hits, 0) + 2;
> + if (pages == 2) {
> + /*
> + * We can have no readahead hits to judge by: but must not get
> + * stuck here forever, so check for an adjacent offset instead
> + * (and don't even bother to check whether swap type is same).
> + */
> + if (offset != prev_offset + 1 && offset != prev_offset - 1)
> + pages = 1;
> + prev_offset = offset;
> + } else {
> + unsigned int roundup = 4;
What does the "4" mean?
> + while (roundup < pages)
> + roundup <<= 1;
Can use something like
roundup = ilog2(pages) + 2;
And what does the "2" mean?
> + pages = roundup;
> + }
> +
> + if (pages > max_pages)
> + pages = max_pages;
min()
> + /* Don't shrink readahead too fast */
> + last_ra = atomic_read(&last_readahead_pages) / 2;
Why not "3"?
> + if (pages < last_ra)
> + pages = last_ra;
> + atomic_set(&last_readahead_pages, pages);
> +
> + return pages;
> +}
> +
> /**
> * swapin_readahead - swap in pages in hope we need them soon
> * @entry: swap entry of this memory
> @@ -396,11 +445,16 @@ struct page *swapin_readahead(swp_entry_
> struct vm_area_struct *vma, unsigned long addr)
> {
> struct page *page;
> - unsigned long offset = swp_offset(entry);
> + unsigned long entry_offset = swp_offset(entry);
> + unsigned long offset = entry_offset;
> unsigned long start_offset, end_offset;
> - unsigned long mask = (1UL << page_cluster) - 1;
> + unsigned long mask;
> struct blk_plug plug;
>
> + mask = swapin_nr_pages(offset) - 1;
This I in fact found to be the most obscure part of the patch.
swapin_nr_pages() returns a count, but here we're copying it into a
variable which appears to hold a bitmask. That's a weird thing to do
and only makes sense if it is assured (and designed) that
swapin_nr_pages() returns a power of 2.
Wanna see if we can clear all these things up please?
> + if (!mask)
> + goto skip;
> +
> /* Read a page_cluster sized and aligned cluster around offset. */
> start_offset = offset & ~mask;
> end_offset = offset | mask;
> ...
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>