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 X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63E9DC4361B for ; Wed, 16 Dec 2020 18:46:54 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E5832233F6 for ; Wed, 16 Dec 2020 18:46:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E5832233F6 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 730198D0001; Wed, 16 Dec 2020 13:46:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6BACC6B0073; Wed, 16 Dec 2020 13:46:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5AA458D0001; Wed, 16 Dec 2020 13:46:53 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0097.hostedemail.com [216.40.44.97]) by kanga.kvack.org (Postfix) with ESMTP id 446806B0072 for ; Wed, 16 Dec 2020 13:46:53 -0500 (EST) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 0E02C180AD817 for ; Wed, 16 Dec 2020 18:46:53 +0000 (UTC) X-FDA: 77600027106.16.pull59_0005dc92742e Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin16.hostedemail.com (Postfix) with ESMTP id EA65D100E690C for ; Wed, 16 Dec 2020 18:46:52 +0000 (UTC) X-HE-Tag: pull59_0005dc92742e X-Filterd-Recvd-Size: 4911 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf16.hostedemail.com (Postfix) with ESMTP for ; Wed, 16 Dec 2020 18:46:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=Spon3JEb1D1RuzZnZpxTX7O/sZzaMaaaECrdSMcxU9w=; b=necVxVlwE3qTytbC6OaXkkAA+H qGHvt80/900xFDhvsz9PEPHSi97BiHGUyVKZCghbNt9RQBZMokv7KlJ+X0lkRXokLcuhSZxgHVeqa H9C44yCTzG7Xc3jpfD5CL3thPr675NRJZgH4fe0qr1bDxGEbKKzereH64a2d5it6tC4ToVk3XYWXj FTEofSFaVscj0Iv1dEYi+pzLx6H8Ha2NDtMXyZgBqriXPW0iFpSoDsM/R/OAzi/OEuKzUHTv1PZyL xcyv3nzGK+7XT2i0an914uB77obz+BjSfcb1S9kxnJHufGX83qBtC5QNhLt7YrVw2olJru32iITLi g8tXnt6w==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kpbSe-00077A-L4; Wed, 16 Dec 2020 18:23:40 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org Subject: [PATCH 12/25] mm: Add mark_folio_accessed Date: Wed, 16 Dec 2020 18:23:22 +0000 Message-Id: <20201216182335.27227-13-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201216182335.27227-1-willy@infradead.org> References: <20201216182335.27227-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: This already operated on the entire compound page, but now we can avoid calling compound_head quite so many times. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/swap.h | 8 ++++++-- mm/swap.c | 28 +++++++++++++--------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 5bba15ac5a2e..c097bc9cedd9 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -338,7 +338,7 @@ extern void lru_note_cost(struct lruvec *lruvec, bool= file, unsigned int nr_pages); extern void lru_note_cost_page(struct page *); extern void lru_cache_add(struct page *); -extern void mark_page_accessed(struct page *); +void mark_folio_accessed(struct folio *); extern void lru_add_drain(void); extern void lru_add_drain_cpu(int cpu); extern void lru_add_drain_cpu_zone(struct zone *zone); @@ -348,10 +348,14 @@ extern void deactivate_file_page(struct page *page)= ; extern void deactivate_page(struct page *page); extern void mark_page_lazyfree(struct page *page); extern void swap_setup(void); - extern void lru_cache_add_inactive_or_unevictable(struct page *page, struct vm_area_struct *vma); =20 +static inline void mark_page_accessed(struct page *page) +{ + mark_folio_accessed(page_folio(page)); +} + /* linux/mm/vmscan.c */ extern unsigned long zone_reclaimable_pages(struct zone *zone); extern unsigned long try_to_free_pages(struct zonelist *zonelist, int or= der, diff --git a/mm/swap.c b/mm/swap.c index 490553f3f9ef..c3638a13987f 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -411,36 +411,34 @@ static void __lru_cache_activate_page(struct page *= page) * When a newly allocated page is not yet visible, so safe for non-atomi= c ops, * __SetPageReferenced(page) may be substituted for mark_page_accessed(p= age). */ -void mark_page_accessed(struct page *page) +void mark_folio_accessed(struct folio *folio) { - page =3D compound_head(page); - - if (!PageReferenced(page)) { - SetPageReferenced(page); - } else if (PageUnevictable(page)) { + if (!FolioReferenced(folio)) { + SetFolioReferenced(folio); + } else if (FolioUnevictable(folio)) { /* * Unevictable pages are on the "LRU_UNEVICTABLE" list. But, * this list is never rotated or maintained, so marking an * evictable page accessed has no effect. */ - } else if (!PageActive(page)) { + } else if (!FolioActive(folio)) { /* * If the page is on the LRU, queue it for activation via * lru_pvecs.activate_page. Otherwise, assume the page is on a * pagevec, mark it active and it'll be moved to the active * LRU on the next drain. */ - if (PageLRU(page)) - activate_page(page); + if (FolioLRU(folio)) + activate_page(&folio->page); else - __lru_cache_activate_page(page); - ClearPageReferenced(page); - workingset_activation(page); + __lru_cache_activate_page(&folio->page); + ClearFolioReferenced(folio); + workingset_activation(&folio->page); } - if (page_is_idle(page)) - clear_page_idle(page); + if (page_is_idle(&folio->page)) + clear_page_idle(&folio->page); } -EXPORT_SYMBOL(mark_page_accessed); +EXPORT_SYMBOL(mark_folio_accessed); =20 /** * lru_cache_add - add a page to a page list --=20 2.29.2