From: Matthew Wilcox <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,
"Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>
Subject: [PATCH v2 21/25] mm: Add __page_cache_alloc_order
Date: Tue, 11 Feb 2020 20:18:41 -0800 [thread overview]
Message-ID: <20200212041845.25879-22-willy@infradead.org> (raw)
In-Reply-To: <20200212041845.25879-1-willy@infradead.org>
From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
This new function allows page cache pages to be allocated that are
larger than an order-0 page.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
---
include/linux/pagemap.h | 24 +++++++++++++++++++++---
mm/filemap.c | 12 ++++++++----
2 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 497197315b73..64a3cf79611f 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -207,15 +207,33 @@ static inline int page_cache_add_speculative(struct page *page, int count)
return __page_cache_add_speculative(page, count);
}
+static inline gfp_t thp_gfpmask(gfp_t gfp)
+{
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+ /* We'd rather allocate smaller pages than stall a page fault */
+ gfp |= GFP_TRANSHUGE_LIGHT;
+ gfp &= ~__GFP_DIRECT_RECLAIM;
+#endif
+ return gfp;
+}
+
#ifdef CONFIG_NUMA
-extern struct page *__page_cache_alloc(gfp_t gfp);
+extern struct page *__page_cache_alloc_order(gfp_t gfp, unsigned int order);
#else
-static inline struct page *__page_cache_alloc(gfp_t gfp)
+static inline
+struct page *__page_cache_alloc_order(gfp_t gfp, unsigned int order)
{
- return alloc_pages(gfp, 0);
+ if (order == 0)
+ return alloc_pages(gfp, 0);
+ return prep_transhuge_page(alloc_pages(thp_gfpmask(gfp), order));
}
#endif
+static inline struct page *__page_cache_alloc(gfp_t gfp)
+{
+ return __page_cache_alloc_order(gfp, 0);
+}
+
static inline struct page *page_cache_alloc(struct address_space *x)
{
return __page_cache_alloc(mapping_gfp_mask(x));
diff --git a/mm/filemap.c b/mm/filemap.c
index 3204293f9b58..1061463a169e 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -941,24 +941,28 @@ 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 page *__page_cache_alloc_order(gfp_t gfp, unsigned int order)
{
int n;
struct page *page;
+ if (order > 0)
+ gfp = thp_gfpmask(gfp);
+
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);
+ page = __alloc_pages_node(n, gfp, order);
+ prep_transhuge_page(page);
} while (!page && read_mems_allowed_retry(cpuset_mems_cookie));
return page;
}
- return alloc_pages(gfp, 0);
+ return prep_transhuge_page(alloc_pages(gfp, order));
}
-EXPORT_SYMBOL(__page_cache_alloc);
+EXPORT_SYMBOL(__page_cache_alloc_order);
#endif
/*
--
2.25.0
next prev parent reply other threads:[~2020-02-12 4:18 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-12 4:18 [PATCH v2 00/25] Large pages in the page cache Matthew Wilcox
2020-02-12 4:18 ` [PATCH v2 01/25] mm: Use vm_fault error code directly Matthew Wilcox
2020-02-12 7:34 ` Christoph Hellwig
2020-02-12 4:18 ` [PATCH v2 02/25] mm: Optimise find_subpage for !THP Matthew Wilcox
2020-02-12 7:41 ` Christoph Hellwig
2020-02-12 13:02 ` Matthew Wilcox
2020-02-12 17:52 ` Christoph Hellwig
2020-02-13 13:50 ` Kirill A. Shutemov
2020-02-12 4:18 ` [PATCH v2 03/25] mm: Use VM_BUG_ON_PAGE in clear_page_dirty_for_io Matthew Wilcox
2020-02-12 7:38 ` Christoph Hellwig
2020-02-13 13:50 ` Kirill A. Shutemov
2020-02-12 4:18 ` [PATCH v2 04/25] mm: Unexport find_get_entry Matthew Wilcox
2020-02-12 7:37 ` Christoph Hellwig
2020-02-13 13:51 ` Kirill A. Shutemov
2020-02-12 4:18 ` [PATCH v2 05/25] mm: Fix documentation of FGP flags Matthew Wilcox
2020-02-12 7:42 ` Christoph Hellwig
2020-02-12 19:11 ` Matthew Wilcox
2020-02-13 14:00 ` Kirill A. Shutemov
2020-02-13 13:59 ` Kirill A. Shutemov
2020-02-13 14:34 ` Matthew Wilcox
2020-02-12 4:18 ` [PATCH v2 06/25] mm: Allow hpages to be arbitrary order Matthew Wilcox
2020-02-13 14:11 ` Kirill A. Shutemov
2020-02-13 14:30 ` Matthew Wilcox
2020-02-12 4:18 ` [PATCH v2 07/25] mm: Introduce thp_size Matthew Wilcox
2020-02-13 14:19 ` Kirill A. Shutemov
2020-02-12 4:18 ` [PATCH v2 08/25] mm: Introduce thp_order Matthew Wilcox
2020-02-13 14:20 ` Kirill A. Shutemov
2020-02-12 4:18 ` [PATCH v2 09/25] fs: Add a filesystem flag for large pages Matthew Wilcox
2020-02-12 7:43 ` Christoph Hellwig
2020-02-12 14:59 ` Matthew Wilcox
2020-02-12 4:18 ` [PATCH v2 10/25] fs: Introduce i_blocks_per_page Matthew Wilcox
2020-02-12 7:44 ` Christoph Hellwig
2020-02-12 15:05 ` Matthew Wilcox
2020-02-12 17:54 ` Christoph Hellwig
2020-02-13 15:40 ` Kirill A. Shutemov
2020-02-13 16:07 ` Matthew Wilcox
2020-02-12 4:18 ` [PATCH v2 11/25] fs: Make page_mkwrite_check_truncate thp-aware Matthew Wilcox
2020-02-13 15:44 ` Kirill A. Shutemov
2020-02-13 16:26 ` Matthew Wilcox
2020-02-12 4:18 ` [PATCH v2 12/25] mm: Add file_offset_of_ helpers Matthew Wilcox
2020-02-12 7:46 ` Christoph Hellwig
2020-02-12 4:18 ` [PATCH v2 13/25] fs: Add zero_user_large Matthew Wilcox
2020-02-14 13:52 ` Kirill A. Shutemov
2020-02-14 16:03 ` Matthew Wilcox
2020-02-18 14:16 ` Kirill A. Shutemov
2020-02-18 16:13 ` Matthew Wilcox
2020-02-18 17:10 ` Kirill A. Shutemov
2020-02-18 18:07 ` Matthew Wilcox
2020-02-21 12:42 ` Kirill A. Shutemov
2020-02-12 4:18 ` [PATCH v2 14/25] iomap: Support arbitrarily many blocks per page Matthew Wilcox
2020-02-12 8:05 ` Christoph Hellwig
2020-02-12 4:18 ` [PATCH v2 15/25] iomap: Support large pages in iomap_adjust_read_range Matthew Wilcox
2020-02-12 8:11 ` Christoph Hellwig
2020-02-12 4:18 ` [PATCH v2 16/25] iomap: Support large pages in read paths Matthew Wilcox
2020-02-12 8:13 ` Christoph Hellwig
2020-02-12 17:45 ` Matthew Wilcox
2020-02-12 4:18 ` [PATCH v2 17/25] iomap: Support large pages in write paths Matthew Wilcox
2020-02-12 8:17 ` Christoph Hellwig
2020-02-12 4:18 ` [PATCH v2 18/25] iomap: Inline data shouldn't see large pages Matthew Wilcox
2020-02-12 8:05 ` Christoph Hellwig
2020-02-12 4:18 ` [PATCH v2 19/25] xfs: Support " Matthew Wilcox
2020-02-12 4:18 ` [PATCH v2 20/25] mm: Make prep_transhuge_page return its argument Matthew Wilcox
2020-02-12 4:18 ` Matthew Wilcox [this message]
2020-02-12 4:18 ` [PATCH v2 22/25] mm: Allow large pages to be added to the page cache Matthew Wilcox
2020-02-12 4:18 ` [PATCH v2 23/25] mm: Allow large pages to be removed from " Matthew Wilcox
2020-02-12 4:18 ` [PATCH v2 24/25] mm: Add large page readahead Matthew Wilcox
2020-02-12 4:18 ` [PATCH v2 25/25] mm: Align THP mappings for non-DAX Matthew Wilcox
2020-02-12 7:50 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200212041845.25879-22-willy@infradead.org \
--to=willy@infradead.org \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).