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 BEA42EE49B0 for ; Wed, 23 Aug 2023 13:16:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 33DF190002C; Wed, 23 Aug 2023 09:16:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2E0D928003D; Wed, 23 Aug 2023 09:16:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F106728003C; Wed, 23 Aug 2023 09:16:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id D9424900035 for ; Wed, 23 Aug 2023 09:16:05 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id AD3D7C0121 for ; Wed, 23 Aug 2023 13:16:05 +0000 (UTC) X-FDA: 81155417490.23.310CFC6 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf04.hostedemail.com (Postfix) with ESMTP id 9622240006 for ; Wed, 23 Aug 2023 13:16:03 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="uxcVM/Ue"; spf=pass (imf04.hostedemail.com: domain of chrisl@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=chrisl@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692796563; a=rsa-sha256; cv=none; b=XhtUvB56BcU4sbFA4w+hZ5B4eS62yEn+v0e6wXwntqUQsY+ewMuVsnFuJ3nsHOoTC0at70 VlOse5Apvq1Qy2z/C8gi9evUfanR2RcovZheHmHIOqn/VtcLTNkbHpzZRhJoIdDLHt1C7i aaWtHWSCK7QNfExlV5NbSyPg+mn31x4= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="uxcVM/Ue"; spf=pass (imf04.hostedemail.com: domain of chrisl@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=chrisl@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692796563; 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=tbDma/CiunNbIJ/ZsHhsae3L1p/r4MIy/vp4PoplqCM=; b=LjV7uqMeiCbaV0WpwX+yk7jchvYsdsR6RrozT8pqZsajIgeValmI9uxsjhKE97k+VOIcA5 3Mji7VQcfOHAC6EDg6/Onu0WhJryLXhUUBivz+D7Mda0nGvmaJu5WX5brxf5fXI++5Y5zF ocWrg0eECXPEZpZXlRvY71C76wRbDHk= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B08E766163 for ; Wed, 23 Aug 2023 13:16:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 729E7C433C8 for ; Wed, 23 Aug 2023 13:16:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692796562; bh=QKJJjn83ob/5yAvKizopvqVOkgvZuyTTOxo11SmLPkk=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=uxcVM/Uew7ziubZulJw+nXt08z8kJg6XEQIU1UXhLnmPsTrUk68Udqy0xtW0rEPk2 1qiYxJiszz19EOtKo5hHObRclvfYbvnDmgnb8sM7GrqP7jJMEFtaJBO7xqjC0Oa+nO DxiWBzITW/5jlJZFItzgnf7R+t62EnNAjUvUQFbpEuA45+K7X8L+W5iPJgCxYPSTxE ND5JmV3dqAF0T1pTc5H2njgVbPJgIku7s8bIsqGBQb36G+Rq6CdR53+zaxfBL3i8vi 0by3PTZLVswDx7l+Uo/MzC9no+JuccBm7dbXqM0S7SryoFZ++NMOdnNRHrcp9HwofP XYiFOwD3hK3+Q== Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2680eee423aso3137722a91.2 for ; Wed, 23 Aug 2023 06:16:02 -0700 (PDT) X-Gm-Message-State: AOJu0YwdjpZwyHmhD1NgYQQqiY9+aOYsTA1Qg0nuU1WsIYZ8WE9q1j+P vqFTClZB6OM7ToHn/puIbkePxrITzwyyoaj6TO48xg== X-Google-Smtp-Source: AGHT+IH+O0B1KAVPtpf0VVTwHJlGhbqctSJ12fUVZjMaR0qnmyfct1bdMkpPCvkqlXhi+UC9QT/4rJVi4Kt5r8+lyVY= X-Received: by 2002:a17:90b:2251:b0:26f:a180:8675 with SMTP id hk17-20020a17090b225100b0026fa1808675mr3483905pjb.19.1692796561809; Wed, 23 Aug 2023 06:16:01 -0700 (PDT) MIME-Version: 1.0 References: <20230821160849.531668-1-david@redhat.com> <20230821160849.531668-4-david@redhat.com> In-Reply-To: <20230821160849.531668-4-david@redhat.com> From: Chris Li Date: Wed, 23 Aug 2023 06:15:49 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH mm-unstable v1 3/4] mm/swap: inline folio_set_swap_entry() and folio_swap_entry() To: David Hildenbrand Cc: LKML , linux-mm , linux-arm-kernel@lists.infradead.org, Andrew Morton , Matthew Wilcox , Peter Xu , Catalin Marinas , Will Deacon , Hugh Dickins , Seth Jennings , Dan Streetman , Vitaly Wool Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 9622240006 X-Stat-Signature: b19g5pqbzrw7qxjdqyak9dtffaud6aw3 X-Rspam-User: X-HE-Tag: 1692796563-111773 X-HE-Meta: U2FsdGVkX18lkR09X0XsEg6fGhJt4kjTquT9TqmMcuyMeFEHIzqiuYNi39U1vAjLU/DT3TsmqO0jnQB3R1+askh8T9JAIB5f7p1NEEmsRWlNy6m4A54tUxDa13Deat29GCruECo7peYP0eMWjfHmGDgqHbEQj3I91c8o3f5DEoXKtgHTl3CCJN0N2UkTVmf5f7FzJ1l6iejO9HiUxtkd60Ylf52mf3HfXrRAS2qCGhCREXG8m90o7ntFw4g9//UscnqlAo1Vh1huI3BjAhF0h+j/mMP72tJIHt3eFZfc2+0d8SSFsa16TBgwRdb8qgdR+MkIL6hG83EFxMpBz7rVJsV6HcZvZ11D5MvN28qlfkutOPIGjM9CEZ2oY/pf5tH8F38d45flZ35zy1rX0Ue940y3F+97b7RhOaZ8LEU0wct00Wjrlu18iiYYLl7GQHDHZ7q5/nnEwk0wSPHfL+pXLLgXa5Z9SKNUmFteNREJWDawiOp+0fkHlq8gO3p3gtTZXVKIUYUo7Xmpfs+rgTuXjsDWWUJJDIqwVc1lTYxlWOJ4+KKfUJoPztpMFLqEnPASpY96nUF6W/1GlppxAizaxPgnfY4hAEex7otuKFz5FJqEVAVzux1vOiu4rmsRur7OMSTF4NC+ZXyje8XU3cIULrYdb82xWwu/pz0u4WA1/ErpNUJh6mfh8BWeRKJHgXECst/ciHwGpHImYjEcTRMq6cVTcB8OgAF/RHLAt/ftx444eaAFCRKr6ESdp3VPft3ksdcHCy4ROd0To/z/sDfKd9BaR4qCsAivCuLgYRG/K5HA8Gldbl3OI8pMmHbs1vPUSbwUNqGb5+7EQFpI8r4n70ItYcZRNyYu+Mgyu/+nVzEE382hi2hatU9MG2/YfA9xQcW7lSUL3zu9X03lGmVh0+Yb4ye/lyRiiuhn7fVD0cxy888Kx0+Q8wJGVrgd/UT9SH4WF6OBSn3jJHw0PMa jZe/v86g D3cTxhEYi+9l0pJ+kRJUZgm0IWqjpa9LcBvuvi6I7rDVGpU3IPXiDoqbzvJ94goH/OFdCaGDY5dHnholoWBrcf6gG0zNdGF5LBzguQdsEZazunuCl6rEKt+RKwlTUSlvn79zQTWL04HGxDhs+lj8UHRVY5FOq7MOaGgAbD5voxGN4/PIGBBDUz6KDuPr+Q8wja/SHWniKgEk3Q/caJ1IA1f992Iz8lHW57oMYvcv+kATJuCPOMsG4WDEIkx+C+L64aIVbrX+diiOZc9To1ezqsmHwJekVDFShecKvxGYRJg7WOKnfjg1eyTHAlzEwQp9IeHEeOs8lvj22lK1I9ErbUU2Gl22oQIZDCod1Lc1d5Bw5FnXVCADlcoD0qayJhtXzUkyE3rwgtDL+C+uAxUwweStj/Y/R8ON6448Zx/NouduVQNpQl+XePTqDHUa5IxVQYgkVFXy7ieRuUrY/IyUtFf4LLCE+uQ8LZupNaeopWVPSmpljiHrQtVqo3hopwzgirTBy 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: Reviewed-by: Chris Li Chris On Mon, Aug 21, 2023 at 9:09=E2=80=AFAM David Hildenbrand wrote: > > Let's simply work on the folio directly and remove the helpers. > > Suggested-by: Matthew Wilcox > Signed-off-by: David Hildenbrand > --- > include/linux/swap.h | 12 +----------- > mm/memory.c | 2 +- > mm/shmem.c | 6 +++--- > mm/swap_state.c | 7 +++---- > mm/swapfile.c | 2 +- > mm/util.c | 2 +- > mm/vmscan.c | 2 +- > mm/zswap.c | 4 ++-- > 8 files changed, 13 insertions(+), 24 deletions(-) > > diff --git a/include/linux/swap.h b/include/linux/swap.h > index 82859a1944f5..603acf813873 100644 > --- a/include/linux/swap.h > +++ b/include/linux/swap.h > @@ -333,25 +333,15 @@ struct swap_info_struct { > */ > }; > > -static inline swp_entry_t folio_swap_entry(struct folio *folio) > -{ > - return folio->swap; > -} > - > static inline swp_entry_t page_swap_entry(struct page *page) > { > struct folio *folio =3D page_folio(page); > - swp_entry_t entry =3D folio_swap_entry(folio); > + swp_entry_t entry =3D folio->swap; > > entry.val +=3D page - &folio->page; > return entry; > } > > -static inline void folio_set_swap_entry(struct folio *folio, swp_entry_t= entry) > -{ > - folio->swap =3D entry; > -} > - > /* linux/mm/workingset.c */ > bool workingset_test_recent(void *shadow, bool file, bool *workingset); > void workingset_age_nonresident(struct lruvec *lruvec, unsigned long nr_= pages); > diff --git a/mm/memory.c b/mm/memory.c > index ff13242c1589..c51800dbfa9b 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -3831,7 +3831,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) > folio_add_lru(folio); > > /* To provide entry to swap_readpage() */ > - folio_set_swap_entry(folio, entry); > + folio->swap =3D entry; > swap_readpage(page, true, NULL); > folio->private =3D NULL; > } > diff --git a/mm/shmem.c b/mm/shmem.c > index 7a0c1e19d9f8..fc1afe9dfcfe 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -1657,7 +1657,7 @@ static int shmem_replace_folio(struct folio **folio= p, gfp_t gfp, > int error; > > old =3D *foliop; > - entry =3D folio_swap_entry(old); > + entry =3D old->swap; > swap_index =3D swp_offset(entry); > swap_mapping =3D swap_address_space(entry); > > @@ -1678,7 +1678,7 @@ static int shmem_replace_folio(struct folio **folio= p, gfp_t gfp, > __folio_set_locked(new); > __folio_set_swapbacked(new); > folio_mark_uptodate(new); > - folio_set_swap_entry(new, entry); > + new->swap =3D entry; > folio_set_swapcache(new); > > /* > @@ -1800,7 +1800,7 @@ static int shmem_swapin_folio(struct inode *inode, = pgoff_t index, > /* We have to do this with folio locked to prevent races */ > folio_lock(folio); > if (!folio_test_swapcache(folio) || > - folio_swap_entry(folio).val !=3D swap.val || > + folio->swap.val !=3D swap.val || > !shmem_confirm_swap(mapping, index, swap)) { > error =3D -EEXIST; > goto unlock; > diff --git a/mm/swap_state.c b/mm/swap_state.c > index 2f2417810052..b3b14bd0dd64 100644 > --- a/mm/swap_state.c > +++ b/mm/swap_state.c > @@ -100,7 +100,7 @@ int add_to_swap_cache(struct folio *folio, swp_entry_= t entry, > > folio_ref_add(folio, nr); > folio_set_swapcache(folio); > - folio_set_swap_entry(folio, entry); > + folio->swap =3D entry; > > do { > xas_lock_irq(&xas); > @@ -156,8 +156,7 @@ void __delete_from_swap_cache(struct folio *folio, > VM_BUG_ON_PAGE(entry !=3D folio, entry); > xas_next(&xas); > } > - entry.val =3D 0; > - folio_set_swap_entry(folio, entry); > + folio->swap.val =3D 0; > folio_clear_swapcache(folio); > address_space->nrpages -=3D nr; > __node_stat_mod_folio(folio, NR_FILE_PAGES, -nr); > @@ -233,7 +232,7 @@ bool add_to_swap(struct folio *folio) > */ > void delete_from_swap_cache(struct folio *folio) > { > - swp_entry_t entry =3D folio_swap_entry(folio); > + swp_entry_t entry =3D folio->swap; > struct address_space *address_space =3D swap_address_space(entry)= ; > > xa_lock_irq(&address_space->i_pages); > diff --git a/mm/swapfile.c b/mm/swapfile.c > index bd9d904671b9..e52f486834eb 100644 > --- a/mm/swapfile.c > +++ b/mm/swapfile.c > @@ -1536,7 +1536,7 @@ static bool swap_page_trans_huge_swapped(struct swa= p_info_struct *si, > > static bool folio_swapped(struct folio *folio) > { > - swp_entry_t entry =3D folio_swap_entry(folio); > + swp_entry_t entry =3D folio->swap; > struct swap_info_struct *si =3D _swap_info_get(entry); > > if (!si) > diff --git a/mm/util.c b/mm/util.c > index cde229b05eb3..f31e2ca62cfa 100644 > --- a/mm/util.c > +++ b/mm/util.c > @@ -764,7 +764,7 @@ struct address_space *folio_mapping(struct folio *fol= io) > return NULL; > > if (unlikely(folio_test_swapcache(folio))) > - return swap_address_space(folio_swap_entry(folio)); > + return swap_address_space(folio->swap); > > mapping =3D folio->mapping; > if ((unsigned long)mapping & PAGE_MAPPING_FLAGS) > diff --git a/mm/vmscan.c b/mm/vmscan.c > index c7c149cb8d66..6f13394b112e 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -1423,7 +1423,7 @@ static int __remove_mapping(struct address_space *m= apping, struct folio *folio, > } > > if (folio_test_swapcache(folio)) { > - swp_entry_t swap =3D folio_swap_entry(folio); > + swp_entry_t swap =3D folio->swap; > > if (reclaimed && !mapping_exiting(mapping)) > shadow =3D workingset_eviction(folio, target_memc= g); > diff --git a/mm/zswap.c b/mm/zswap.c > index 7300b98d4a03..412b1409a0d7 100644 > --- a/mm/zswap.c > +++ b/mm/zswap.c > @@ -1190,7 +1190,7 @@ static void zswap_fill_page(void *ptr, unsigned lon= g value) > > bool zswap_store(struct folio *folio) > { > - swp_entry_t swp =3D folio_swap_entry(folio); > + swp_entry_t swp =3D folio->swap; > int type =3D swp_type(swp); > pgoff_t offset =3D swp_offset(swp); > struct page *page =3D &folio->page; > @@ -1370,7 +1370,7 @@ bool zswap_store(struct folio *folio) > > bool zswap_load(struct folio *folio) > { > - swp_entry_t swp =3D folio_swap_entry(folio); > + swp_entry_t swp =3D folio->swap; > int type =3D swp_type(swp); > pgoff_t offset =3D swp_offset(swp); > struct page *page =3D &folio->page; > -- > 2.41.0 > >