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 ADE19C4361B for ; Wed, 16 Dec 2020 18:47:28 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2D4B2233F6 for ; Wed, 16 Dec 2020 18:47:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2D4B2233F6 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 92E428D0011; Wed, 16 Dec 2020 13:47:22 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 88D338D0002; Wed, 16 Dec 2020 13:47:22 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7805A8D0011; Wed, 16 Dec 2020 13:47:22 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0086.hostedemail.com [216.40.44.86]) by kanga.kvack.org (Postfix) with ESMTP id 627998D0002 for ; Wed, 16 Dec 2020 13:47:22 -0500 (EST) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 24297362E for ; Wed, 16 Dec 2020 18:47:22 +0000 (UTC) X-FDA: 77600028324.26.meal70_0a0de142742e Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin26.hostedemail.com (Postfix) with ESMTP id 024511804B671 for ; Wed, 16 Dec 2020 18:47:21 +0000 (UTC) X-HE-Tag: meal70_0a0de142742e X-Filterd-Recvd-Size: 8722 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf37.hostedemail.com (Postfix) with ESMTP for ; Wed, 16 Dec 2020 18:47:21 +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=4du5Oeqh0fJih2NkOHSHHEtwBUdIZMm5FiujrPFBc5I=; b=rY+Hl7FU8WKF68ujFVWm4Jq3mg ffd/ojErlQkU9eiFgQaxg6jB6FrQqxPJKDIl4CKxROIlRkG6UeyZJR38J9PIa6DC+wemreyBZcxor tsm0jwkxVbYaNIr9iBconRZsWbfGP2i88D/ClL0xaBxlA/oJQD4i+klefItPHd7V0kJDISVBFjNWS wW3kof1R50Uayg0SJ5EBm0Dk27UwrMijlCfvy9Vds8cZwzCIg78U224dLP/xtuLB6zWpVJMwte8LV DxbnPMVVH8W4a1E5h3fGtB2mV5mPJtEqljhMjTKOENJfEhZ751k+ofCduxvG7yB0bbWbsn8AHT8Be HdSYhkXw==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kpbSf-00077T-Ba; Wed, 16 Dec 2020 18:23:41 +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 14/25] mm/filemap: Add folio_add_to_page_cache Date: Wed, 16 Dec 2020 18:23:24 +0000 Message-Id: <20201216182335.27227-15-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: Pages being added to the page cache should already be folios, so turn add_to_page_cache_lru() into a wrapper. Saves hundreds of bytes of text. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/pagemap.h | 13 +++++++-- mm/filemap.c | 62 ++++++++++++++++++++--------------------- 2 files changed, 41 insertions(+), 34 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 2c2974970467..88a66b65d1ed 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -811,9 +811,9 @@ static inline int fault_in_pages_readable(const char = __user *uaddr, int size) } =20 int add_to_page_cache_locked(struct page *page, struct address_space *ma= pping, - pgoff_t index, gfp_t gfp_mask); -int add_to_page_cache_lru(struct page *page, struct address_space *mappi= ng, - pgoff_t index, gfp_t gfp_mask); + pgoff_t index, gfp_t gfp); +int folio_add_to_page_cache(struct folio *folio, struct address_space *m= apping, + pgoff_t index, gfp_t gfp); extern void delete_from_page_cache(struct page *page); extern void __delete_from_page_cache(struct page *page, void *shadow); int replace_page_cache_page(struct page *old, struct page *new, gfp_t gf= p_mask); @@ -838,6 +838,13 @@ static inline int add_to_page_cache(struct page *pag= e, return error; } =20 +static inline int add_to_page_cache_lru(struct page *page, + struct address_space *mapping, pgoff_t index, gfp_t gfp) +{ + return folio_add_to_page_cache((struct folio *)page, mapping, + index, gfp); +} + /** * struct readahead_control - Describes a readahead request. * diff --git a/mm/filemap.c b/mm/filemap.c index 7ed9e3dcefc8..6fc896a38ef7 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -828,25 +828,25 @@ int replace_page_cache_page(struct page *old, struc= t page *new, gfp_t gfp_mask) } EXPORT_SYMBOL_GPL(replace_page_cache_page); =20 -noinline int __add_to_page_cache_locked(struct page *page, +static noinline int __add_to_page_cache_locked(struct folio *folio, struct address_space *mapping, - pgoff_t offset, gfp_t gfp, + pgoff_t index, gfp_t gfp, void **shadowp) { - XA_STATE(xas, &mapping->i_pages, offset); - int huge =3D PageHuge(page); + XA_STATE(xas, &mapping->i_pages, index); + int huge =3D FolioHuge(folio); int error; =20 - VM_BUG_ON_PAGE(!PageLocked(page), page); - VM_BUG_ON_PAGE(PageSwapBacked(page), page); + VM_BUG_ON_PAGE(!FolioLocked(folio), &folio->page); + VM_BUG_ON_PAGE(FolioSwapBacked(folio), &folio->page); mapping_set_update(&xas, mapping); =20 - get_page(page); - page->mapping =3D mapping; - page->index =3D offset; + get_folio(folio); + folio->page.mapping =3D mapping; + folio->page.index =3D index; =20 - if (!huge && !page_is_secretmem(page)) { - error =3D mem_cgroup_charge(page, current->mm, gfp); + if (!huge && !page_is_secretmem(&folio->page)) { + error =3D mem_cgroup_charge(&folio->page, current->mm, gfp); if (error) goto error; } @@ -857,7 +857,7 @@ noinline int __add_to_page_cache_locked(struct page *= page, unsigned int order =3D xa_get_order(xas.xa, xas.xa_index); void *entry, *old =3D NULL; =20 - if (order > thp_order(page)) + if (order > folio_order(folio)) xas_split_alloc(&xas, xa_load(xas.xa, xas.xa_index), order, gfp); xas_lock_irq(&xas); @@ -874,13 +874,13 @@ noinline int __add_to_page_cache_locked(struct page= *page, *shadowp =3D old; /* entry may have been split before we acquired lock */ order =3D xa_get_order(xas.xa, xas.xa_index); - if (order > thp_order(page)) { + if (order > folio_order(folio)) { xas_split(&xas, old, order); xas_reset(&xas); } } =20 - xas_store(&xas, page); + xas_store(&xas, folio); if (xas_error(&xas)) goto unlock; =20 @@ -890,7 +890,7 @@ noinline int __add_to_page_cache_locked(struct page *= page, =20 /* hugetlb pages do not participate in page cache accounting */ if (!huge) - __inc_lruvec_page_state(page, NR_FILE_PAGES); + __inc_lruvec_page_state(&folio->page, NR_FILE_PAGES); unlock: xas_unlock_irq(&xas); } while (xas_nomem(&xas, gfp)); @@ -900,12 +900,12 @@ noinline int __add_to_page_cache_locked(struct page= *page, goto error; } =20 - trace_mm_filemap_add_to_page_cache(page); + trace_mm_filemap_add_to_page_cache(&folio->page); return 0; error: - page->mapping =3D NULL; + folio->page.mapping =3D NULL; /* Leave page->index set: truncation relies upon it */ - put_page(page); + put_folio(folio); return error; } ALLOW_ERROR_INJECTION(__add_to_page_cache_locked, ERRNO); @@ -925,22 +925,22 @@ ALLOW_ERROR_INJECTION(__add_to_page_cache_locked, E= RRNO); int add_to_page_cache_locked(struct page *page, struct address_space *ma= pping, pgoff_t offset, gfp_t gfp_mask) { - return __add_to_page_cache_locked(page, mapping, offset, + return __add_to_page_cache_locked(page_folio(page), mapping, offset, gfp_mask, NULL); } EXPORT_SYMBOL(add_to_page_cache_locked); =20 -int add_to_page_cache_lru(struct page *page, struct address_space *mappi= ng, - pgoff_t offset, gfp_t gfp_mask) +int folio_add_to_page_cache(struct folio *folio, struct address_space *m= apping, + pgoff_t index, gfp_t gfp_mask) { void *shadow =3D NULL; int ret; =20 - __SetPageLocked(page); - ret =3D __add_to_page_cache_locked(page, mapping, offset, + __SetFolioLocked(folio); + ret =3D __add_to_page_cache_locked(folio, mapping, index, gfp_mask, &shadow); if (unlikely(ret)) - __ClearPageLocked(page); + __ClearFolioLocked(folio); else { /* * The page might have been evicted from cache only @@ -950,14 +950,14 @@ int add_to_page_cache_lru(struct page *page, struct= address_space *mapping, * data from the working set, only to cache data that will * get overwritten with something else, is a waste of memory. */ - WARN_ON_ONCE(PageActive(page)); + WARN_ON_ONCE(FolioActive(folio)); if (!(gfp_mask & __GFP_WRITE) && shadow) - workingset_refault(page, shadow); - lru_cache_add(page); + workingset_refault(&folio->page, shadow); + lru_cache_add(&folio->page); } return ret; } -EXPORT_SYMBOL_GPL(add_to_page_cache_lru); +EXPORT_SYMBOL_GPL(folio_add_to_page_cache); =20 #ifdef CONFIG_NUMA struct folio *__page_cache_alloc(gfp_t gfp, unsigned int order) @@ -1778,7 +1778,7 @@ struct folio *filemap_get_folio(struct address_spac= e *mapping, pgoff_t index, if (fgp_flags & FGP_ACCESSED) __SetFolioReferenced(folio); =20 - err =3D add_to_page_cache_lru(&folio->page, mapping, index, gfp); + err =3D folio_add_to_page_cache(folio, mapping, index, gfp); if (unlikely(err)) { put_folio(folio); folio =3D NULL; @@ -1787,8 +1787,8 @@ struct folio *filemap_get_folio(struct address_spac= e *mapping, pgoff_t index, } =20 /* - * add_to_page_cache_lru locks the page, and for mmap we expect - * an unlocked page. + * folio_add_to_page_cache locks the page, and for mmap we + * expect an unlocked page. */ if (folio && (fgp_flags & FGP_FOR_MMAP)) unlock_folio(folio); --=20 2.29.2