Received-SPF: pass (google.com: domain of linux-kernel+bounces-54202-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: SeongJae Park <sj@kernel.org>
To: Kairui Song <ryncsn@gmail.com>
Cc: linux-mm@kvack.org,
	Andrew Morton <akpm@linux-foundation.org>,
	"Huang, Ying" <ying.huang@intel.com>,
	Chris Li <chrisl@kernel.org>,
	Minchan Kim <minchan@kernel.org>,
	Hugh Dickins <hughd@google.com>,
	Johannes Weiner <hannes@cmpxchg.org>,
	Matthew Wilcox <willy@infradead.org>,
	Michal Hocko <mhocko@suse.com>,
	Yosry Ahmed <yosryahmed@google.com>,
	David Hildenbrand <david@redhat.com>,
	Yu Zhao <yuzhao@google.com>,
	linux-kernel@vger.kernel.org,
	Kairui Song <kasong@tencent.com>
Subject: Re: [PATCH] mm/swap: fix race condition in direct swapin path
Date: Mon,  5 Feb 2024 18:24:09 -0800
Message-Id: <20240206022409.202536-1-sj@kernel.org>
In-Reply-To: <20240205110959.4021-1-ryncsn@gmail.com>
References: 
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Hi Kairui,

On Mon,  5 Feb 2024 19:09:59 +0800 Kairui Song <ryncsn@gmail.com> wrote:

[...]
>  mm/memory.c   | 19 +++++++++++++++++++
>  mm/swap.h     |  5 +++++
>  mm/swapfile.c | 16 ++++++++++++++++
>  3 files changed, 40 insertions(+)
> 
> diff --git a/mm/memory.c b/mm/memory.c
> index 7e1f4849463a..fd7c55a292f1 100644
> --- a/mm/memory.c
> +++ b/mm/memory.c
> @@ -3867,6 +3867,20 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)
>  	if (!folio) {
>  		if (data_race(si->flags & SWP_SYNCHRONOUS_IO) &&
>  		    __swap_count(entry) == 1) {
> +			/*
> +			 * With swap count == 1, after we read the entry,
> +			 * other threads could finish swapin first, free
> +			 * the entry, then swapout the modified page using
> +			 * the same entry. Now the content we just read is
> +			 * stalled, and it's undetectable as pte_same()
> +			 * returns true due to entry reuse.
> +			 *
> +			 * So pin the swap entry using the cache flag even
> +			 * cache is not used.
> +			 */
> +			if (swapcache_prepare(entry))
> +				goto out;
> +

I'm getting below build error after this patch.  I guess maybe the code need to
take care of CONFIG_SWAP unset case?

    .../mm/memory.c: In function 'do_swap_page':
    .../mm/memory.c:4004:8: error: implicit declaration of function 'swapcache_prepare'; did you mean 'swapcache_clear'? [-Werror=implicit-function-declaration]
     4004 |    if (swapcache_prepare(entry))
          |        ^~~~~~~~~~~~~~~~~
          |        swapcache_clear


Thanks,
SJ

[...]