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 E2BCCC5ACB3 for ; Tue, 21 Nov 2023 08:02:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 602C46B03EB; Tue, 21 Nov 2023 03:02:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 58C8A6B041D; Tue, 21 Nov 2023 03:02:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 42DB16B0467; Tue, 21 Nov 2023 03:02:33 -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 2FFBC6B03EB for ; Tue, 21 Nov 2023 03:02:33 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 075071A09DD for ; Tue, 21 Nov 2023 08:02:33 +0000 (UTC) X-FDA: 81481219386.02.18C603B Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf04.hostedemail.com (Postfix) with ESMTP id 860574001A for ; Tue, 21 Nov 2023 08:02:30 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Fmz3BH2D; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf04.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=1700553751; 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=aHlq8hFLmBpOeWxAjz6JS64z0pnefFf79DdLRXkS8eo=; b=QD31g5Zoq1fTBTSmrbLQvf72CraTq34dvw8wfl+lPgMFSw9GKY2jwtMzalz6Ay/bcI8eTz igGRGQ1DFA7ZvUQfzS21fBMJb1xhuLKK7epCNz1tw9Dgo209w+b6oEoKXNx8lYAaAlWEFN vu4go4G0sYP3NvmC7tqOJHf8RT+zEvI= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Fmz3BH2D; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf04.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=1700553751; a=rsa-sha256; cv=none; b=6bTlTYx9pNH84GhjzU9/2+4bYFM6GRAbWvkYMaJAS0NIDcNK7D9e3sKSIhNysZkqXMhBUm pAyX/v/L7ziWg1+VsAuKB0iLtBMju8o5PJJ5OXjX00bDhccWHhg26/j7rs5Zv3AX6azr1m +DWSsSthLEIwNzNDkfvcRY86xYunB8E= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 2661CCE17FD for ; Tue, 21 Nov 2023 08:02:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 667BBC433C7 for ; Tue, 21 Nov 2023 08:02:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700553746; bh=Aphf+mDirAunLvOeekhNKcmKUP/49vVxIizS90M1uzs=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=Fmz3BH2Dx2URmDTm44twbm+qhDWnu1JktNcKnTMAQxSO0BRNXJgKQPoq+4JHFROTA o+UiMWZKIyNapr8WpIR2GttO9r2JrPqBhV52DuKIufi44ktpW14DlxoesUtOp/u5F9 kxUtAcfsvqGLNZp8+NSECKiWFsdeRZRYEUoYh8xS4J6Vy2SMD6PSFzZGjxa+tN3olD 7JDj/OtM1lWLvZnT4Utd1o7L0/y9UkyKPygCju4Bgsivbrc5BOW9xySy9+XfzHmVWZ RRgfB/j0L7IKp0tQnJimDltsUTycJ3/9bBtELZHIZm16rafZLbJkPWYsiTqICHMKED jfLOvWkPraBTQ== Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-5c1acc1fa98so4644591a12.0 for ; Tue, 21 Nov 2023 00:02:26 -0800 (PST) X-Gm-Message-State: AOJu0YxfARnEF9rToT27j3/c1+MyGcvvfmLvPo9iobHxQyxUMEBqelDz +gczkc3Y0ymfSKnl+SdXCsssPCch6g9LuhEPFzBScg== X-Google-Smtp-Source: AGHT+IE6S7yndqjFyS51Kwja50fGAsdQyD8/0l6/IDiUeB8LhOjnae6kUqLxTWCK+Ur9OQkGskCEayDL/drdzaEi3QU= X-Received: by 2002:a17:90b:783:b0:280:29df:747e with SMTP id l3-20020a17090b078300b0028029df747emr2785910pjz.1.1700553745798; Tue, 21 Nov 2023 00:02:25 -0800 (PST) MIME-Version: 1.0 References: <20231119194740.94101-1-ryncsn@gmail.com> <20231119194740.94101-10-ryncsn@gmail.com> <87il5wc1nr.fsf@yhuang6-desk2.ccr.corp.intel.com> In-Reply-To: <87il5wc1nr.fsf@yhuang6-desk2.ccr.corp.intel.com> From: Chris Li Date: Tue, 21 Nov 2023 00:02:14 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 09/24] mm/swap: inline __swap_count To: "Huang, Ying" Cc: Kairui Song , linux-mm@kvack.org, Kairui Song , Andrew Morton , 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-Server: rspam09 X-Rspamd-Queue-Id: 860574001A X-Stat-Signature: m55yxd5z4aaxhpef9f8f5sm76f9uqhhn X-Rspam-User: X-HE-Tag: 1700553750-186732 X-HE-Meta: U2FsdGVkX19VkT9vTrBbu+XSQ0SfR60uIxxVcfdl7kQDesRhvxB1YTlktGtmlfHDkEHaUwxlPUYcI6ZGn4ScanDVw3Zq4UTH8DVbxSBejo2LoUWF5qULU0SdXl7JjRzgFW7dysP0m9jnK4uNds5Dp7xVCg5pItXJFiPvP3r0W0B3ClxMyhxYv0zFEDd8EPQd+n+HhwbxWN2wEPDDA16VT3jBnQG70WozhSSXViMzanaU52v+Arb+rQQ8xheUzfthoqSKTcTb+zmneO8lKfOslmW7NcWdlCk//VfYfQS54XLKVwYVFwvcreSpqxUsuMGlZFODvsnGkpf3YV9xgbkS4Hz/QmPd6zJY7SZlWTj7z+AQ3VPUaouRBlt4M2Qb0PIDncA2Cy5Dph3qRGqCf1TX0rnZyhvvC9mh2LKhE884+vOTg3x+x2L7UV2F/EEouZq7C54IIM0nIPrCa9ffGV+hdw1L6OHXhd9HvnDqwHqPE3poWH881vsmCbUUQQExq96w/giVbiD/KO7Icsu7yuD2hxMHGkrfIHMSAY5R+SLyrie7/LjYSIy4LikNvU7UvtJWE9IwHXc6gBjS/903PvC64daMb4EX76spl3ZWTupBlu1tvMYQ89cANe3t/Qbkj/hf7pOJImqw9Wjd0zO3gckX4McShoZUMaMz8OQ0BJhyaQo/lz0EZfsqr2BCWXGUafdtieYCX1gDSqMtvToVxXg7PCVRcCeIzBx+cPZzp6JVaFA22B0n5vWTAZZI5zTJoS4SCMIaIHlL6BNnz3Pqc63q2CfZNaocQk2swfHDdi0WIqjTkEgvyuRK7oXD4PxtfaOgDkzLcO7ZS67W0ic2XyaqpjdGVQ2z0kicJkUhMktXOWU9xeDa+2INmfcxoMfo1H8kgQgvepS1iYglHtTRDmQoXESmYLv9OFZ48ZQTXdiFrY2UY5lhQYrX8f9XCBWSh2Az58SLn0DlfC+FDMr/wYj +t0sqs0p Hjjxkud7DtVIr7vHXMZPGZFLZrJMulOr9XoIcvxmpqlWKHGDFo75NFWyvaOm9Vu3GUbX7dHqA/bz29F/hMdI7NFY4x3T6GQ0YIYJEMwF/Q8H89ptyXzBx5uUutk/q3L4O6PFHPZaRee1d5K8AlfbQIs+URBNecNWVanse5EkmfIq7A/4STQmzfnfXn0GSsjlBXTxQ4gDWEgt2xR3IxSL7TETVtBWajVc8tEovM3jEeA5CZ5yDc788ouqXzdX/dnH0rGoaSFC32GyLRTMzbPFJfM7qLV7QftJAQc0DDyn+mQFg4PhEwg4Nxqpi4UtyVbVgSvK/ijFNuKjjj587gIOa6FrMIrVhvEjvH8Al+3fho43BRzXYlr8WOLRecWCKKPyyy++UadNmHXE4wNw= 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:43=E2=80=AFPM Huang, Ying = wrote: > > Kairui Song writes: > > > From: Kairui Song > > > > There is only one caller in swap subsystem now, where it can be inline > > smoothly, avoid the memory access and function call overheads. > > > > Signed-off-by: Kairui Song > > --- > > include/linux/swap.h | 6 ------ > > mm/swap_state.c | 6 +++--- > > mm/swapfile.c | 8 -------- > > 3 files changed, 3 insertions(+), 17 deletions(-) > > > > diff --git a/include/linux/swap.h b/include/linux/swap.h > > index 2401990d954d..64a37819a9b3 100644 > > --- a/include/linux/swap.h > > +++ b/include/linux/swap.h > > @@ -485,7 +485,6 @@ int swap_type_of(dev_t device, sector_t offset); > > int find_first_swap(dev_t *device); > > extern unsigned int count_swap_pages(int, int); > > extern sector_t swapdev_block(int, pgoff_t); > > -extern int __swap_count(swp_entry_t entry); > > extern int swap_swapcount(struct swap_info_struct *si, swp_entry_t ent= ry); > > extern int swp_swapcount(swp_entry_t entry); > > extern struct swap_info_struct *page_swap_info(struct page *); > > @@ -559,11 +558,6 @@ static inline void put_swap_folio(struct folio *fo= lio, swp_entry_t swp) > > { > > } > > > > -static inline int __swap_count(swp_entry_t entry) > > -{ > > - return 0; > > -} > > - > > static inline int swap_swapcount(struct swap_info_struct *si, swp_entr= y_t entry) > > { > > return 0; > > diff --git a/mm/swap_state.c b/mm/swap_state.c > > index fb78f7f18ed7..d87c20f9f7ec 100644 > > --- a/mm/swap_state.c > > +++ b/mm/swap_state.c > > @@ -316,9 +316,9 @@ void free_pages_and_swap_cache(struct encoded_page = **pages, int nr) > > release_pages(pages, nr); > > } > > > > -static inline bool swap_use_no_readahead(struct swap_info_struct *si, = swp_entry_t entry) > > +static inline bool swap_use_no_readahead(struct swap_info_struct *si, = pgoff_t offset) > > { > > - return data_race(si->flags & SWP_SYNCHRONOUS_IO) && __swap_count(= entry) =3D=3D 1; > > + return data_race(si->flags & SWP_SYNCHRONOUS_IO) && swap_count(si= ->swap_map[offset]) =3D=3D 1; > > } > > > > static inline bool swap_use_vma_readahead(struct swap_info_struct *si) > > @@ -928,7 +928,7 @@ struct page *swapin_readahead(swp_entry_t entry, gf= p_t gfp_mask, > > > > si =3D swp_swap_info(entry); > > mpol =3D get_vma_policy(vmf->vma, vmf->address, 0, &ilx); > > - if (swap_use_no_readahead(si, entry)) { > > + if (swap_use_no_readahead(si, swp_offset(entry))) { > > page =3D swapin_no_readahead(entry, gfp_mask, mpol, ilx, = vmf->vma->vm_mm); > > cached =3D false; > > } else if (swap_use_vma_readahead(si)) { > > diff --git a/mm/swapfile.c b/mm/swapfile.c > > index a8ae472ed2b6..e15a6c464a38 100644 > > --- a/mm/swapfile.c > > +++ b/mm/swapfile.c > > @@ -1431,14 +1431,6 @@ void swapcache_free_entries(swp_entry_t *entries= , int n) > > spin_unlock(&p->lock); > > } > > > > -int __swap_count(swp_entry_t entry) > > -{ > > - struct swap_info_struct *si =3D swp_swap_info(entry); > > - pgoff_t offset =3D swp_offset(entry); > > - > > - return swap_count(si->swap_map[offset]); > > -} > > - > > I'd rather keep __swap_count() in the original place together with other > swap count related functions. And si->swap_map[] was hided in > swapfile.c before. I don't think the change will have any real > performance improvement. I agree with Ying here. Does not seem to have value high enough to justify a patch by itself. Chris