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 BA54CC072A2 for ; Wed, 22 Nov 2023 05:01:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0662B6B0554; Wed, 22 Nov 2023 00:01:20 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F313D6B0555; Wed, 22 Nov 2023 00:01:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DD27D6B0556; Wed, 22 Nov 2023 00:01:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id CF1286B0554 for ; Wed, 22 Nov 2023 00:01:19 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A47BD1604C7 for ; Wed, 22 Nov 2023 05:01:19 +0000 (UTC) X-FDA: 81484391478.03.BD6EEBC Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf13.hostedemail.com (Postfix) with ESMTP id 186DA20025 for ; Wed, 22 Nov 2023 05:01:16 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=P3LeUUEU; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf13.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=1700629277; 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=J535/WlMO7BeONpMdstmdQQ81BBPx1uC58ui/w2oQYc=; b=rp6pvwqFrEG5J6ey6u+e/7HnjQmPkxEX0DUUMuRFWb7t+G03fGVWXkns2nLg50XoWcenwd 8g4Pw5NHR5IhVNDkVpqPsCMJav4TO8Smrh9GWGbw92MjfuTawqNODOKGuHiNDl1UMsbfLD gybiSGe0YfnHUN0xjTw3DMHjBv+RJWY= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=P3LeUUEU; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf13.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=1700629277; a=rsa-sha256; cv=none; b=qvPpEu9BPYmic9HwLaQQJp6vbVnhq1EnExzd8Psh7mWKy1ZnAoooEp3QMYdkmDlbNA6Mss QUiH7g5xIGuhswxjGmsz5kvtNaKKL5Cm7HOP/rZ0/Zw5+GL7pvRdZPgDqUCNWyrhOSV794 rmUN0W2vGugJY+Q6X4WQZLywxZ/HXXc= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 756E9CE1DA1 for ; Wed, 22 Nov 2023 05:01:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DEEF3C433CC for ; Wed, 22 Nov 2023 05:01:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700629271; bh=u7DV6cTNrN7b/2qEFKGmtHVpBCHzyuXO2gggNSplrUQ=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=P3LeUUEURVKVPcocEtP9rEEA/q617+UUBnYn8zL/9Vt8sw1n/IK66lHz9AaciWFSP vnKiNjN7/0SELW23vW1Hc3CyMwdlc+neE8wh6Nb48Man9MxIOcGp7Adf19IejodtYB Mx7s31hsifxr8V+58FnVLfWHvQLltaiMC42JQ7+JQpOL9XTOQjC6S9OLkXXqIceCtQ WRPXSaL0jv3QOhkft+MseeHRoFE+gnRiQjZ6U1VLXdEI8sXcYbpPOU5n58u0weHbH6 i4U84FNVJIi/HV9jCGoKLGJeFfcQgQ1NbjfAb/e5s+AgvlTkPEd1oEZmeFdrEzWG68 khxaC+yJhrYaA== Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-6cbbfdf72ecso1252044b3a.2 for ; Tue, 21 Nov 2023 21:01:11 -0800 (PST) X-Gm-Message-State: AOJu0YwGXbZV0buqsmc4k7ecTYCbubyr0yLvMOjXXBew22/u+NOw9iqP +/aEOPzuXS8r65ZBPDetBhw3cpIrOVuzPDDtSs6IlA== X-Google-Smtp-Source: AGHT+IGoRK+sboEREpkiBypgMYjiELBK54an0rQxLOfAqvAoQMfcTAdIFcAsYrHHd8GU3ztDP3IXsQyG8s4djLcZCVw= X-Received: by 2002:a05:6a20:918f:b0:184:3233:679c with SMTP id v15-20020a056a20918f00b001843233679cmr1356784pzd.12.1700629271360; Tue, 21 Nov 2023 21:01:11 -0800 (PST) MIME-Version: 1.0 References: <20231119194740.94101-1-ryncsn@gmail.com> <20231119194740.94101-21-ryncsn@gmail.com> In-Reply-To: <20231119194740.94101-21-ryncsn@gmail.com> From: Chris Li Date: Tue, 21 Nov 2023 21:01:00 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 20/24] swap: simplify and make swap_find_cache static 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: 186DA20025 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: oszpwjxbdzxhh931s4qjwutirsiex8dh X-HE-Tag: 1700629276-458573 X-HE-Meta: U2FsdGVkX1/IBNchpmWV+OoFUpFvwXNQyJKbG+xxnEa4DRqXQsKLRcxmw1DgVifqTdKjQlLX4N3x9+8tT6FecNXb55UvLWP7DGyLZAtLDDrD6HArTnF3yHDdoPO1M/i8t9NSHZoNak3JVWjDungpbc9J/1HEod97xzAJFKRLQmVGlGfxUF7bU14c5XUYJV7dpvxp9rx7hwYF33UUB5Vnjepa3SzhugIuNxMDTW6tpM1ufRuN/CStkXWObnUDMttCvyDeF0zHvqSn3Me+7NJGpQnYmmiTsqjGIEQqqmk0n9eqXyM9qa3dsiSqNd0jf7ssr56e/9Tank1jUh20Zd0BmUX6kEkaRzhfCOV2Xrm2a0P1/3SHc8E3X3zA6x2rUsDFibGhJTAZPDfWQT55NuhSdFEf6bIVVnjJAbS/4FjM57AxP4Hez1xuDkLYbkQhG4bLZWy0APa0E9jxL/h6n83w7ZSK4aU7m8cDDxVRMOMQOYhJLgZ509K5lx8Mbd4ZbNM8wJEIF0kwTGF6274O77NaBCNsSvm8j7HGy71FV3AUnziMtW7nz44wTf0KdBrdEy90P2bN4GGDXMfeQKCCnaKBv3uKT90tz/A634MwIYzU+fWfkoJRyOoyECJkGv0BXtEyo1rlPnL097FpbsWfjG5R+/engpjC/NWzms9uk1678wG6n+2Ylim0dE+X5LJFlmItJDCNl2t4lsT3jv6FlWfG5Zg+7x97TdwTlFPy+uk16eiGsNl1Jbv3mHgZ3CGjg/Zw1bWOrAzcH/4+PYdKBcIYS9yxmNwZuwk/T/WUx1/VKqYVvQ9jQAGOPp+CnZdO7xfAp0lDU/fuxbOze6ejfTApzTmL9+POIQoKlTRAcOOt2oHAa0MhdL5LF5gAumVIU7SXNjbIAKGDQ5nxM6yaPhx8XPsXVXaf3sDMguJX4MmD9ylr085lW+0fthuI/0PLWmimPIfS1eMnR54P2tqAyOK 46ks1glg 1yNsxzQ53dYmOIU0dq1/Ql5cJzTXCqVLHXaqI7AHMoD6VBLckGK6hDuShcguO5ZWZ7hQNrI/OHz01vOysK7hPKfYhUH3T5VelmFXqLD+3MsjXtdruuloeDdSogD/ZXn15I5i6QwtWkVNSmpOA29fC2IKryWJm0WZ+ilC/+hJth9An9YM+jykHp8iwuHdLzRw3hpzI3+9ZxfFjdrxNAHF9JVt95l6b9kCEUQzpWwJR0fd7+CXCRkeJCOgqF4alTDNadr7GpPMnaKdi/Wm9JJjtvnROrknfw1QAz9lj3YpoC7WnbkQomUc9yTzlhAKQx2igreWWOa6MJm/pIqZ0btHdAae5dg== 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:49=E2=80=AFAM Kairui Song wro= te: > > From: Kairui Song > > There are only two callers within the same file now, make it static and > drop the redundant if check on the shadow variable. > > Signed-off-by: Kairui Song > --- > mm/swap.h | 2 -- > mm/swap_state.c | 5 ++--- > 2 files changed, 2 insertions(+), 5 deletions(-) > > diff --git a/mm/swap.h b/mm/swap.h > index b073c29c9790..4402970547e7 100644 > --- a/mm/swap.h > +++ b/mm/swap.h > @@ -46,8 +46,6 @@ void __delete_from_swap_cache(struct folio *folio, > 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, 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 eef66757c615..6f39aa8394f1 100644 > --- a/mm/swap_state.c > +++ b/mm/swap_state.c > @@ -334,15 +334,14 @@ 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, void **shadowp) > +static struct folio *swap_cache_get_folio(swp_entry_t entry, struct vm_f= ault *vmf, void **shadowp) > { > bool vma_ra, readahead; > struct folio *folio; > > folio =3D filemap_get_entry(swap_address_space(entry), swp_offset= (entry)); > if (xa_is_value(folio)) { > - if (shadowp) > - *shadowp =3D folio; > + *shadowp =3D folio; I prefer to keep the original code to perform the check before assigning it. The caller usage situation might change. It is more defensive. Does not seem to justify it as a standalone patch. Chris