Commit bb3c579e authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle)
Browse files

mm/filemap: Add filemap_alloc_folio 



Reimplement __page_cache_alloc as a wrapper around filemap_alloc_folio
to allow filesystems to be converted at our leisure.  Increases
kernel text size by 133 bytes, mostly in cachefiles_read_backing_file().
pagecache_get_page() shrinks by 32 bytes, though.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
parent cc09cb13

include/linux/pagemap.h

+8 −3
Original line number Diff line number Diff line
@@ -262,14 +262,19 @@ static inline void *detach_page_private(struct page *page) 
}



#ifdef CONFIG_NUMA

extern struct page *__page_cache_alloc(gfp_t gfp);

struct folio *filemap_alloc_folio(gfp_t gfp, unsigned int order);

#else

static inline struct page *__page_cache_alloc(gfp_t gfp)

static inline struct folio *filemap_alloc_folio(gfp_t gfp, unsigned int order)

{

	return alloc_pages(gfp, 0);

	return folio_alloc(gfp, order);

}

#endif



static inline struct page *__page_cache_alloc(gfp_t gfp)

{

	return &filemap_alloc_folio(gfp, 0)->page;

}



static inline struct page *page_cache_alloc(struct address_space *x)

{

	return __page_cache_alloc(mapping_gfp_mask(x));

mm/filemap.c

+7 −7
Original line number Diff line number Diff line
@@ -1006,24 +1006,24 @@ int add_to_page_cache_lru(struct page *page, struct address_space *mapping, 
EXPORT_SYMBOL_GPL(add_to_page_cache_lru);



#ifdef CONFIG_NUMA

struct page *__page_cache_alloc(gfp_t gfp)

struct folio *filemap_alloc_folio(gfp_t gfp, unsigned int order)

{

	int n;

	struct page *page;

	struct folio *folio;



	if (cpuset_do_page_mem_spread()) {

		unsigned int cpuset_mems_cookie;

		do {

			cpuset_mems_cookie = read_mems_allowed_begin();

			n = cpuset_mem_spread_node();

			page = __alloc_pages_node(n, gfp, 0);

		} while (!page && read_mems_allowed_retry(cpuset_mems_cookie));

			folio = __folio_alloc_node(gfp, order, n);

		} while (!folio && read_mems_allowed_retry(cpuset_mems_cookie));



		return page;

		return folio;

	}

	return alloc_pages(gfp, 0);

	return folio_alloc(gfp, order);

}

EXPORT_SYMBOL(__page_cache_alloc);

EXPORT_SYMBOL(filemap_alloc_folio);

#endif



/*