From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5EE84C61D90 for ; Tue, 21 Nov 2023 16:55:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DB78F6B0468; Tue, 21 Nov 2023 11:55:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D40766B0495; Tue, 21 Nov 2023 11:55:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C092E6B047D; Tue, 21 Nov 2023 11:55:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id AD6B86B0464 for ; Tue, 21 Nov 2023 11:55:31 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 72B261203AA for ; Tue, 21 Nov 2023 16:55:31 +0000 (UTC) X-FDA: 81482562462.29.3218881 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf26.hostedemail.com (Postfix) with ESMTP id BFB2D140005 for ; Tue, 21 Nov 2023 16:55:28 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="AyIB+p/u"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf26.hostedemail.com: domain of chrisl@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=chrisl@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1700585729; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=xkLXESXtz0cmF+y0n7uMcAEZCLa+yA7d++M9gAKtI3A=; b=pQO7JUnz6Xv8XBYlg6Scw7+0z4VcEJx9WI/cH5d5HrKnsv7upU6ZM7NfZnWUUlG3bPsz2x 6KEChjZYmWS9eDBMfMnN1ePwuJS7usaQI5AqAtJ5YHKA3cXCg1hwOp/DEZDyVadf54ZA76 LMUVkdoTFbCsgHoMpErStPbs5qR0SfY= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="AyIB+p/u"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf26.hostedemail.com: domain of chrisl@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=chrisl@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700585729; a=rsa-sha256; cv=none; b=hpt2OfYUls9oAvldJZYcu8nA0qeRiWwpDI80Kdw2ifiDtloBe60pcE18uNX+W/kKssCOrh eePhmqq5ZQqwJ17Te/mRrZB+N+XDbad6Xi2Mvwt375X6BMZvx0QivZ8fAaMMAXJBJgs0A6 hj0Io4WMH4EMVbtJQAROuDqe8vEffG0= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id EEEAFCE1C42 for ; Tue, 21 Nov 2023 16:55:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3A7CEC433C8 for ; Tue, 21 Nov 2023 16:55:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700585725; bh=BPPgPgKcY3SOUFT/m046HQ005it97DrTli/SOEvkQKo=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=AyIB+p/uoUU3ZISYJX0QPlyP5YrCnqpIB2Ni+TmVHiJnNMoFecb8fEDnx00wDxxcs gH4aZ5fPsL0dNwBA7KWvXA1YCJ2CmvqOrdt54SAoQionaPJtk3z3U86dWmI4Paxr5u wLJrYqkxSqxp9lOJWQMr3FD5opwDt9KxzCYzrMZaWQqZhBRasOyaU8KgwHxGlKve4P BgIv9FsvqVF142cEVZfsx9hjbVo+4pBX7Wn88C2+/4QCmb7Enk8jex7twibpzRo3wZ cWq4TcSutJz51JXnHsE8joAeGIjWyD7hkDbE8JSZjTwIDv3mR2gdso2//0onCGdxyx I8keks/lHrRuw== Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-5be30d543c4so3871457a12.2 for ; Tue, 21 Nov 2023 08:55:25 -0800 (PST) X-Gm-Message-State: AOJu0YwXvJgDhBm0KaluVIhKlOU7dHG4kYQJJnC5XD+wRX3gTjOCH6yI +CtXmqGrFBPqM5WU+E6L45WidRcKsolNFgq+8Y6LXg== X-Google-Smtp-Source: AGHT+IGoSNcrUquRFAr5cOwbm7HO1VPZS01Auc5YCOQnAEpE2mJ8dQoJTyd0GmXa0yLkD6c93EChhkWvJTyOvG2JclI= X-Received: by 2002:a17:90b:4aca:b0:27d:b9d:bd6f with SMTP id mh10-20020a17090b4aca00b0027d0b9dbd6fmr10142174pjb.45.1700585724698; Tue, 21 Nov 2023 08:55:24 -0800 (PST) MIME-Version: 1.0 References: <20231119194740.94101-1-ryncsn@gmail.com> <20231119194740.94101-15-ryncsn@gmail.com> In-Reply-To: <20231119194740.94101-15-ryncsn@gmail.com> From: Chris Li Date: Tue, 21 Nov 2023 08:55:13 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 14/24] mm/swap: do shadow lookup as well when doing swap cache lookup To: Kairui Song Cc: linux-mm@kvack.org, Andrew Morton , "Huang, Ying" , David Hildenbrand , Hugh Dickins , Johannes Weiner , Matthew Wilcox , Michal Hocko , linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: BFB2D140005 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: b665mehc8og9u8zmtx1i1taukyw81kyk X-HE-Tag: 1700585728-214816 X-HE-Meta: U2FsdGVkX1+WOXDoP2qSwce0ARCa0peKpbSYaGYOgyU7DsLQa60wyWbEZVRNHAMHuQMGMhHCBic6aeIVS1UuuYM6NzA0qPBJcoloHBb7zNZEzGW4qX934Hjft17k5W9UaGJYJf7bYlK6Mf3h1j3UslQpEyRpyxVahpLH1tEFUDCAJVeSEs6Nl39An/CGoB8NHCh4WifexF8Dx5LaDUVCLiCNjp848EMjB6D//kGXSou0GDUMn22fQQi6dfHZ3R6gLoOco6zSVTEXynfPreGqWmC6dKGO6ufuKw2Vu+Icifpx9aNFSiNyuc0yaIekrKijyP7Ss8P34UbnHL7GOxmzq4Y/3sSeszIu4fXmTJUPFDpRFAhFtBu0rEkXI0PKDuqjIWcfp8/rECoYRhtvDx4JxkVYFTvVwHeE7BFe+o9V1YaS4ruFmzQdqoBQGXH1xrkMiCFHaBIiGVlYe9EJUdDqzhSweUOgc57pNpuFZQrCvGQjyTDZpKR+JtTpCdhRtE+UtgsUJBQl/7lJzxxPMXhlCU2eXnni/QJ/g8/VqiUYnAn6oVPAFHaI3/dzuCbkkZDugx//LtuW7aZOdPWRG1oYFMzFfXSSO+LFDsRyGsp+q5GVTyzNO/tnvx3+wgZqTF4c0vkBbCJxpqEnVqD/7jHOGyLLd60BS3qP+Rx5jQxIeAsdgqzlCP/x8WFQ+clzGGXiK5XZwKxpFdO2FdImSNzGcb/nNiC9DmBeNwq9GcFi1Lvx9kr+17GMuCsjknnIF0KpXJOVAHrnCcL17N7sv8OD1jm/hXj+dNtjA+6u4nlpI2sM7aucY/Lev1UKbPbbSFYwyIEZ1zVpBq8p04wkCI9lyEZku8zGhSPu4AfxOkxM4d/DP6ZltBpg7lJwkuLMt6B4wUHxJTxp9+QqPU2VZ5ecenROYUA6viSELBdw3qumYBpoZ3NJAWfdf93yOV2Wn5d0JBQPXWN0ZC/v3jkWcLM UxNvfQij rEtuyR9sofVa6T+VcRvfvAxWQ1DAzhfp+HAvNMPnay7u4cP1vIb/Gw8X+3wrplERhke2vcQOjiEA8P+NgDV7zS/4NOF4vZtFRolec5eQEC3qC4SFIPnDSUb+cfhdkZnW5PvdYD6bNOyiIhfmq543CDt006bwlJL6kGZPXPpewEOcfxl3pLH5oXVZxllgyyYP1hxHZkqML6Bk6ZaLr9p4ty7xAwZLYlEAIFUviAFi/hrLBDUtNt145JeUY/ACL/7avfA3cDoLc6gMgY/G/3Y6417AqPidZ8GJeLSHCQPJacMCq9r4= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Hi Kairui, Too trivial to stand alone as a patch. Merge it with the patch needed to use that "*shadow". Chris On Sun, Nov 19, 2023 at 11:48=E2=80=AFAM Kairui Song wro= te: > > From: Kairui Song > > Make swap_cache_get_folio capable of returning the shadow value when the > xarray contains a shadow instead of a valid folio. Just extend the > arguments to be used later. > > Signed-off-by: Kairui Song > --- > mm/shmem.c | 2 +- > mm/swap.h | 2 +- > mm/swap_state.c | 11 +++++++---- > 3 files changed, 9 insertions(+), 6 deletions(-) > > diff --git a/mm/shmem.c b/mm/shmem.c > index 72239061c655..f9ce4067c742 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -1875,7 +1875,7 @@ static int shmem_swapin_folio(struct inode *inode, = pgoff_t index, > } > > /* Look it up and read it in.. */ > - folio =3D swap_cache_get_folio(swap, NULL); > + folio =3D swap_cache_get_folio(swap, NULL, NULL); > if (!folio) { > /* Or update major stats only when swapin succeeds?? */ > if (fault_type) { > diff --git a/mm/swap.h b/mm/swap.h > index e43e965f123f..da9deb5ba37d 100644 > --- a/mm/swap.h > +++ b/mm/swap.h > @@ -47,7 +47,7 @@ void delete_from_swap_cache(struct folio *folio); > void clear_shadow_from_swap_cache(int type, unsigned long begin, > unsigned long end); > struct folio *swap_cache_get_folio(swp_entry_t entry, > - struct vm_fault *vmf); > + struct vm_fault *vmf, void **shadowp); > struct folio *filemap_get_incore_folio(struct address_space *mapping, > pgoff_t index); > > diff --git a/mm/swap_state.c b/mm/swap_state.c > index 3b5a34f47192..e057c79fb06f 100644 > --- a/mm/swap_state.c > +++ b/mm/swap_state.c > @@ -334,14 +334,17 @@ static inline bool swap_use_vma_readahead(struct sw= ap_info_struct *si) > * > * Caller must lock the swap device or hold a reference to keep it valid= . > */ > -struct folio *swap_cache_get_folio(swp_entry_t entry, struct vm_fault *v= mf) > +struct folio *swap_cache_get_folio(swp_entry_t entry, struct vm_fault *v= mf, void **shadowp) > { > bool vma_ra, readahead; > struct folio *folio; > > - folio =3D filemap_get_folio(swap_address_space(entry), swp_offset= (entry)); > - if (IS_ERR(folio)) > + folio =3D filemap_get_entry(swap_address_space(entry), swp_offset= (entry)); > + if (xa_is_value(folio)) { > + if (shadowp) > + *shadowp =3D folio; > return NULL; > + } > > /* > * At the moment, we don't support PG_readahead for anon THP > @@ -923,7 +926,7 @@ struct page *swapin_readahead(swp_entry_t entry, gfp_= t gfp_mask, > struct page *page; > pgoff_t ilx; > > - folio =3D swap_cache_get_folio(entry, vmf); > + folio =3D swap_cache_get_folio(entry, vmf, NULL); > if (folio) { > page =3D folio_file_page(folio, swp_offset(entry)); > cache_result =3D SWAP_CACHE_HIT; > -- > 2.42.0 > >