Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: p98+ZZ6QYuqxpLTalD8H3Sd3s5rg1eqNDc6Jwm5Ls09fONbKbejrc9DVcrizFSt/RF6XksEwim
 RhRT5QIvqy9Q==
IronPort-SDR: kOzw4nBLI2e7kjIdZeS0pezxBLzcZ/XvN8vKLi1t0VHDBzG0XjIK7125/jN/gUjRz6L0zxodKh
 TcJmLRoO8icA==
From:   "Huang\, Ying" <ying.huang@intel.com>
To:     Andrea Righi <andrea.righi@canonical.com>
Cc:     Andrew Morton <akpm@linux-foundation.org>,
        Minchan Kim <minchan@kernel.org>,
        Anchal Agarwal <anchalag@amazon.com>, <linux-mm@kvack.org>,
        <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2] mm: swap: use fixed-size readahead during swapoff
References: <20200413111810.GA801367@xps-13>
        <87a73f7d71.fsf@yhuang-dev.intel.com> <20200413133150.GA810380@xps-13>
Date:   Tue, 14 Apr 2020 09:31:24 +0800
In-Reply-To: <20200413133150.GA810380@xps-13> (Andrea Righi's message of "Mon,
        13 Apr 2020 15:31:50 +0200")
Message-ID: <87wo6i6efn.fsf@yhuang-dev.intel.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=ascii
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Andrea Righi <andrea.righi@canonical.com> writes:

> On Mon, Apr 13, 2020 at 09:00:34PM +0800, Huang, Ying wrote:
>> Andrea Righi <andrea.righi@canonical.com> writes:
>> 
>> [snip]
>> 
>> > diff --git a/mm/swap_state.c b/mm/swap_state.c
>> > index ebed37bbf7a3..c71abc8df304 100644
>> > --- a/mm/swap_state.c
>> > +++ b/mm/swap_state.c
>> > @@ -20,6 +20,7 @@
>> >  #include <linux/migrate.h>
>> >  #include <linux/vmalloc.h>
>> >  #include <linux/swap_slots.h>
>> > +#include <linux/oom.h>
>> >  #include <linux/huge_mm.h>
>> >  
>> >  #include <asm/pgtable.h>
>> > @@ -507,6 +508,14 @@ static unsigned long swapin_nr_pages(unsigned long offset)
>> >  	max_pages = 1 << READ_ONCE(page_cluster);
>> >  	if (max_pages <= 1)
>> >  		return 1;
>> > +	/*
>> > +	 * If current task is using too much memory or swapoff is running
>> > +	 * simply use the max readahead size. Since we likely want to load a
>> > +	 * lot of pages back into memory, using a fixed-size max readhaead can
>> > +	 * give better performance in this case.
>> > +	 */
>> > +	if (oom_task_origin(current))
>> > +		return max_pages;
>> >  
>> >  	hits = atomic_xchg(&swapin_readahead_hits, 0);
>> >  	pages = __swapin_nr_pages(prev_offset, offset, hits, max_pages,
>> 
>> Thinks this again.  If my understanding were correct, the accessing
>> pattern during swapoff is sequential, why swap readahead doesn't work?
>> If so, can you root cause that firstly?
>
> Theoretically if the pattern is sequential the current heuristic should
> already select a big readahead size, but apparently it's not doing that.
>
> I'll repeat my tests tracing the readahead size during swapoff to see
> exactly what's going on here.

I haven't verify it.  It may be helpful to call lookup_swap_cache()
before swapin_readahead() in unuse_pte_range().  The theory behind it is
to update the swap readahead statistics via lookup_swap_cache().

Best Regards,
Huang, Ying