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 D34D7C61D90 for ; Tue, 21 Nov 2023 16:36:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 514F36B049A; Tue, 21 Nov 2023 11:36:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4C51F6B049E; Tue, 21 Nov 2023 11:36:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 38CA56B04AC; Tue, 21 Nov 2023 11:36:46 -0500 (EST) 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 25DEB6B049A for ; Tue, 21 Nov 2023 11:36:46 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 82518160A29 for ; Tue, 21 Nov 2023 16:36:45 +0000 (UTC) X-FDA: 81482515170.13.97C5972 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf09.hostedemail.com (Postfix) with ESMTP id 040DF140018 for ; Tue, 21 Nov 2023 16:36:41 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="rI/bsBvX"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf09.hostedemail.com: domain of chrisl@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=chrisl@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700584602; a=rsa-sha256; cv=none; b=Q1JL/USc/V1VBED/4LkwH9pxywavm9biQATCnsP8hfWNhEaK6jRVl3bwCKEIMuY7/tnkyc voFyo7FUKvQUPmBArYSOfDF/0VEOass5Ly80Vqhy+QokHZHUX624qvHYIBskwF67tUe0ch du0fTqIJnd/AFSamCwiLt6uEopW9f9I= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="rI/bsBvX"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf09.hostedemail.com: domain of chrisl@kernel.org designates 139.178.84.217 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=1700584602; 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=7h/vwD8dA52z/EdIu49Xlj27Q0AIS6LgIrDKn6iqxSw=; b=2q8j13LbuOKcXPL5L+uneBxFPHtkmvjfDukJzWRDif5638C0sEaCk1RbxcPVo9ILidAK59 31HHVZ5RaZh2wXzioQbiRl9ySfY5qiD/R4Rz9umnNxCPRjIS1t8MZyaR0SAyzsQROpeRBV HVuBsAjEFzrhzZWkXjyThapVwbkABEI= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id D1BA661A97 for ; Tue, 21 Nov 2023 16:36:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3938C433C9 for ; Tue, 21 Nov 2023 16:36:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700584600; bh=xTCdppnNrLRTcBODBfq5VC+EuncNcZtVGMcvlAsIibA=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=rI/bsBvX/Rf6K5Sr/6S+e34LoNpIA4KHCKU4l46I4pNBqQeqUB2UxCHIoIzoEu3ro PlJuE/mUB1NGiKQOgxqjxDWkCQShgeyC/3dG6s2ZF2m4nFWZSgHNoBCWRVU1G3p8lE iEs0Ks7gyIPReS17tfoqkBuaRTIwp1zsgSV8R2sg3K2HE4n4HZyu5+EreWWDCr5u0h 6rq7K+CbzGUgkeNaO+Gdr+Mf8/Zx5wCyGHuG3L+MurwGbuvQaRF1C76VVbdALILaSj NMQc1WWl8amI4rttl+c54EhsO2qY4GUA13k8OyYRXrwyYsdM/pzK9I4IZ35MFOlYUI cmeoJ7GF8IM8Q== Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-28098ebd5aeso4641874a91.0 for ; Tue, 21 Nov 2023 08:36:39 -0800 (PST) X-Gm-Message-State: AOJu0Yy4uJOt0xBRLztKHMZ8SXNKFkiG9Eg0lBiz+uMT4Rfzm0vjQPB0 l6UGv45mr8kPIB0ClbQSRYD35hZkRx2VB651S78ZGw== X-Google-Smtp-Source: AGHT+IH6IoyINXEZ0TIOrDraOuXN3B9BBXWyVXtW359TMm6L7e6eGHpW8VA1zNNeUHiMXVZPpT2An3TtuM5uCHNMgEk= X-Received: by 2002:a17:90a:ea88:b0:280:1dfc:1302 with SMTP id h8-20020a17090aea8800b002801dfc1302mr11830833pjz.17.1700584599143; Tue, 21 Nov 2023 08:36:39 -0800 (PST) MIME-Version: 1.0 References: <20231119194740.94101-1-ryncsn@gmail.com> <20231119194740.94101-13-ryncsn@gmail.com> In-Reply-To: <20231119194740.94101-13-ryncsn@gmail.com> From: Chris Li Date: Tue, 21 Nov 2023 08:36:27 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 12/24] mm/swap: simplify arguments for swap_cache_get_folio 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-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 040DF140018 X-Stat-Signature: fko7zcihiqozcob1frxdkotqrk4wuqt8 X-HE-Tag: 1700584601-28252 X-HE-Meta: U2FsdGVkX19OOYOJ46fAsxTu1UKlQMHmi158pfmXHywa2lnOvqWLaAlHbb/1kMYi1/n+cDyNmQ1jnxv0XR3EE04ENCDlxiXtKJo4MNiGhSUiHYOa+tyrPs4NKFD8Yu52NGnEmC96bN1N0BW/V3NUlv0PV5c63ZKWt3spEJzL+lHD42SLWnIDIPJweOxJ0FxZz/aEwntOH6IKd3e7pLMToq+Jhn4I2BtNWj9+dBCV8IUK4G0MEDOPfl9jFKN6RtoRtbcxwwqqj2pFglJFnq0Vn7t5qvUJ5aO6oe5aQCJDCmw6oOUOYBTyndhXnCFkJ84y0uGrQbECYCYd1dJdbx8n1Q57AALV0tT2nUXeLGhuZAMzTV70b138pebmSiQIiw4OdEam/CNJo3HOyHH/M4p/nKIfiNzmRVdY3/FWaIxxfO69qsIdw+4+ZDd//4gOluPWmV7OOTIrWY1A23ZapX4f0Vc+fhvBGCiRFDj/exbnxcZNsWyR4CHe+Fn6nM+p7BvWYGbg3vEmrKLfo2CnZ8k/u7OvuYReipwxHBP8hjvtiYhRl6LWeu6ghnDEldL4OO4dtL0TKwG5Gz9tLxgPtOxTkPjXGTMhVO74brMmcJOocYlhAXm+oKHytMmSkr58K8se7rmORivIw+O+GFDU70BCf+uicSnvvLRrMtcfCyxiORgFBJOWKXROytuC6x7j5J7gECqq7lO/49+wB/QduRw+yCyw0rlsEWe1+0oj72szGAJrDswZ9qe+u1wwbwjNMf0QB/I6QHrLujmNI7+Lgro2a5gYFsYTFNWENcOhzoCgo0lV23I4xMuQ44RA0C4eCsevkviGd/10zbKH5jII13JfmPjNOP2mFLe0kXKak/HI1nTYGZp33MI9sCGWjvhBQrrQNCjlucztI0Alhfm0TuADvdIi/oXV+SM7JPUWEdFuntB3sT9Vys3LLQx3rmXkEQQk1/dd+jWbfEWJKvCriAZ 2xcNzuqW F//P0zK6DAfuxfad0DkWL8ZkAvxy4ghwM8WnaCGp8HN2LKd3odMN8ToQRAWojDMm1eZdMmj3o+jmpktnZiBraHatH0BSZRl35lqRonVnYwlNBLJVqSzWswyRi13AHyajijpwfl5a7etUnb5ggwY65IjRdCf3dBUBteS90CeJPGDxqxJEGycfnL75lpUdfsS/6ti8rSzRg3qDwlX9+KuG/tAFVzcc39b2T6TWmQZykk77/7LKqsx7XEovR1wgkWTXoDAxkpxXscrpSD+Evq3dcMk8hcWtTb5nGUUrX0fGT+1axY9ln/MQyHk+jnlOI7TZPa1vuktSMdxqhTSF+kkKzp7Ux/A== 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: On Sun, Nov 19, 2023 at 11:48=E2=80=AFAM Kairui Song wro= te: > > From: Kairui Song > > There are only two caller now, simplify the arguments. I don't think this patch is needed. It will not have a real impact on the resulting kernel. > > Signed-off-by: Kairui Song > --- > mm/shmem.c | 2 +- > mm/swap.h | 2 +- > mm/swap_state.c | 15 +++++++-------- > 3 files changed, 9 insertions(+), 10 deletions(-) > > diff --git a/mm/shmem.c b/mm/shmem.c > index 0d1ce70bce38..72239061c655 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, 0); > + folio =3D swap_cache_get_folio(swap, 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 ac9136eee690..e43e965f123f 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_area_struct *vma, unsigned long addr); > + struct vm_fault *vmf); > 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 e96d63bf8a22..91461e26a8cc 100644 > --- a/mm/swap_state.c > +++ b/mm/swap_state.c > @@ -334,8 +334,7 @@ static inline bool swap_use_vma_readahead(struct swap= _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_area_struct *vma, unsigned long addr) > +struct folio *swap_cache_get_folio(swp_entry_t entry, struct vm_fault *v= mf) I actually prefer the original code. The vm_fault is a much heavier object. vma and address is really what this function needs minimally. I consider vma and address, even though two arguments are simpler than vm_fault struct. It is possible some other non fault patch wants to lookup the swap_cache, then construct a vmf just for the vma and address is kind of unnatural. Chris > { > struct folio *folio; > > @@ -352,22 +351,22 @@ struct folio *swap_cache_get_folio(swp_entry_t entr= y, > return folio; > > readahead =3D folio_test_clear_readahead(folio); > - if (vma && vma_ra) { > + if (vmf && vma_ra) { > unsigned long ra_val; > int win, hits; > > - ra_val =3D GET_SWAP_RA_VAL(vma); > + ra_val =3D GET_SWAP_RA_VAL(vmf->vma); > win =3D SWAP_RA_WIN(ra_val); > hits =3D SWAP_RA_HITS(ra_val); > if (readahead) > hits =3D min_t(int, hits + 1, SWAP_RA_HIT= S_MAX); > - atomic_long_set(&vma->swap_readahead_info, > - SWAP_RA_VAL(addr, win, hits)); > + atomic_long_set(&vmf->vma->swap_readahead_info, > + SWAP_RA_VAL(vmf->address, win, hi= ts)); > } > > if (readahead) { > count_vm_event(SWAP_RA_HIT); > - if (!vma || !vma_ra) > + if (!vmf || !vma_ra) > atomic_inc(&swapin_readahead_hits); > } > } else { > @@ -926,7 +925,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->vma, vmf->address); > + folio =3D swap_cache_get_folio(entry, vmf); > if (folio) { > page =3D folio_file_page(folio, swp_offset(entry)); > cache_result =3D SWAP_CACHE_HIT; > -- > 2.42.0 > >