[14/25] mm/filemap: Add folio_add_to_page_cache

Message ID	20201216182335.27227-15-willy@infradead.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-fsdevel-owner@kernel.org> From: "Matthew Wilcox (Oracle)" <willy@infradead.org> To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, 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> In-Reply-To: <20201216182335.27227-1-willy@infradead.org> References: <20201216182335.27227-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Page folios \| expand [00/25] Page folios [01/25] mm: Introduce struct folio [02/25] mm: Add put_folio [03/25] mm: Add get_folio [04/25] mm: Create FolioFlags [05/25] mm: Add unlock_folio [06/25] mm: Add lock_folio [07/25] mm: Add lock_folio_killable [08/25] mm: Add __alloc_folio_node and alloc_folio [09/25] mm: Convert __page_cache_alloc to return a folio [10/25] mm/filemap: Convert end_page_writeback to use a folio [11/25] mm: Convert mapping_get_entry to return a folio [12/25] mm: Add mark_folio_accessed [13/25] mm: Add filemap_get_folio and find_get_folio [14/25] mm/filemap: Add folio_add_to_page_cache [15/25] mm/swap: Convert rotate_reclaimable_page to folio [16/25] mm: Add folio_mapping [17/25] mm: Rename THP_SUPPORT to MULTI_PAGE_FOLIOS [18/25] btrfs: Use readahead_batch_length [19/25] fs: Change page refcount rules for readahead [20/25] fs: Change readpage to take a folio [21/25] mm: Convert wait_on_page_bit to wait_on_folio_bit [22/25] mm: Add wait_on_folio_locked & wait_on_folio_locked_killable [23/25] mm: Add flush_dcache_folio [24/25] mm: Add read_cache_folio and read_mapping_folio [25/25] fs: Convert vfs_dedupe_file_range_compare to folios

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) } int add_to_page_cache_locked(struct page *page, struct address_space *mapping, - pgoff_t index, gfp_t gfp_mask); -int add_to_page_cache_lru(struct page *page, struct address_space *mapping, - 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 *mapping, + 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 gfp_mask); @@ -838,6 +838,13 @@ static inline int add_to_page_cache(struct page *page, return error; } +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, struct page *new, gfp_t gfp_mask) } EXPORT_SYMBOL_GPL(replace_page_cache_page); -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 = PageHuge(page); + XA_STATE(xas, &mapping->i_pages, index); + int huge = FolioHuge(folio); int error; - 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); - get_page(page); - page->mapping = mapping; - page->index = offset; + get_folio(folio); + folio->page.mapping = mapping; + folio->page.index = index; - if (!huge && !page_is_secretmem(page)) { - error = mem_cgroup_charge(page, current->mm, gfp); + if (!huge && !page_is_secretmem(&folio->page)) { + error = 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 = xa_get_order(xas.xa, xas.xa_index); void *entry, *old = NULL; - 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 = old; /* entry may have been split before we acquired lock */ order = 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); } } - xas_store(&xas, page); + xas_store(&xas, folio); if (xas_error(&xas)) goto unlock; @@ -890,7 +890,7 @@ noinline int __add_to_page_cache_locked(struct page *page, /* 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; } - trace_mm_filemap_add_to_page_cache(page); + trace_mm_filemap_add_to_page_cache(&folio->page); return 0; error: - page->mapping = NULL; + folio->page.mapping = 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, ERRNO); int add_to_page_cache_locked(struct page *page, struct address_space *mapping, 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); -int add_to_page_cache_lru(struct page *page, struct address_space *mapping, - pgoff_t offset, gfp_t gfp_mask) +int folio_add_to_page_cache(struct folio *folio, struct address_space *mapping, + pgoff_t index, gfp_t gfp_mask) { void *shadow = NULL; int ret; - __SetPageLocked(page); - ret = __add_to_page_cache_locked(page, mapping, offset, + __SetFolioLocked(folio); + ret = __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); #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_space *mapping, pgoff_t index, if (fgp_flags & FGP_ACCESSED) __SetFolioReferenced(folio); - err = add_to_page_cache_lru(&folio->page, mapping, index, gfp); + err = folio_add_to_page_cache(folio, mapping, index, gfp); if (unlikely(err)) { put_folio(folio); folio = NULL; @@ -1787,8 +1787,8 @@ struct folio *filemap_get_folio(struct address_space *mapping, pgoff_t index, } /* - * 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);

[14/25] mm/filemap: Add folio_add_to_page_cache

Commit Message

Patch