From: Matthew Wilcox <willy@infradead.org>
To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Subject: [PATCH 07/15] mm: Make prep_transhuge_page tail-callable
Date: Tue, 24 Sep 2019 17:52:06 -0700 [thread overview]
Message-ID: <20190925005214.27240-8-willy@infradead.org> (raw)
In-Reply-To: <20190925005214.27240-1-willy@infradead.org>
From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
By permitting NULL or order-0 pages as an argument, and returning the
argument, callers can write:
return prep_transhuge_page(alloc_pages(...));
instead of assigning the result to a temporary variable and conditionally
passing that to prep_transhuge_page().
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
include/linux/huge_mm.h | 7 +++++--
mm/huge_memory.c | 9 +++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h
index 61c9ffd89b05..779e83800a77 100644
--- a/include/linux/huge_mm.h
+++ b/include/linux/huge_mm.h
@@ -153,7 +153,7 @@ extern unsigned long thp_get_unmapped_area(struct file *filp,
unsigned long addr, unsigned long len, unsigned long pgoff,
unsigned long flags);
-extern void prep_transhuge_page(struct page *page);
+extern struct page *prep_transhuge_page(struct page *page);
extern void free_transhuge_page(struct page *page);
bool can_split_huge_page(struct page *page, int *pextra_pins);
@@ -303,7 +303,10 @@ static inline bool transhuge_vma_suitable(struct vm_area_struct *vma,
return false;
}
-static inline void prep_transhuge_page(struct page *page) {}
+static inline struct page *prep_transhuge_page(struct page *page)
+{
+ return page;
+}
#define transparent_hugepage_flags 0UL
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 73fc517c08d2..cbe7d0619439 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -516,15 +516,20 @@ static inline struct deferred_split *get_deferred_split_queue(struct page *page)
}
#endif
-void prep_transhuge_page(struct page *page)
+struct page *prep_transhuge_page(struct page *page)
{
+ if (!page || compound_order(page) == 0)
+ return page;
/*
- * we use page->mapping and page->indexlru in second tail page
+ * we use page->mapping and page->index in second tail page
* as list_head: assuming THP order >= 2
*/
+ BUG_ON(compound_order(page) == 1);
INIT_LIST_HEAD(page_deferred_list(page));
set_compound_page_dtor(page, TRANSHUGE_PAGE_DTOR);
+
+ return page;
}
static unsigned long __thp_get_unmapped_area(struct file *filp, unsigned long len,
--
2.23.0
next prev parent reply other threads:[~2019-09-25 0:53 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-25 0:51 [RFC 00/15] Large pages in the page-cache Matthew Wilcox
2019-09-25 0:52 ` [PATCH 01/15] mm: Use vm_fault error code directly Matthew Wilcox
2019-09-26 13:55 ` Kirill A. Shutemov
2019-09-25 0:52 ` [PATCH 02/15] fs: Introduce i_blocks_per_page Matthew Wilcox
2019-09-25 8:36 ` Dave Chinner
2019-10-04 19:28 ` Matthew Wilcox
2019-10-08 3:53 ` Dave Chinner
2019-09-25 0:52 ` [PATCH 03/15] mm: Add file_offset_of_ helpers Matthew Wilcox
2019-09-26 14:02 ` Kirill A. Shutemov
2019-10-04 19:39 ` Matthew Wilcox
2019-09-25 0:52 ` [PATCH 04/15] iomap: Support large pages Matthew Wilcox
2019-09-25 0:52 ` [PATCH 05/15] xfs: " Matthew Wilcox
2019-09-25 0:52 ` [PATCH 06/15] xfs: Pass a page to xfs_finish_page_writeback Matthew Wilcox
2019-09-25 0:52 ` Matthew Wilcox [this message]
2019-09-26 14:13 ` [PATCH 07/15] mm: Make prep_transhuge_page tail-callable Kirill A. Shutemov
2019-09-25 0:52 ` [PATCH 08/15] mm: Add __page_cache_alloc_order Matthew Wilcox
2019-09-26 14:15 ` Kirill A. Shutemov
2019-09-25 0:52 ` [PATCH 09/15] mm: Allow large pages to be added to the page cache Matthew Wilcox
2019-09-26 14:22 ` Kirill A. Shutemov
2019-09-25 0:52 ` [PATCH 10/15] mm: Allow find_get_page to be used for large pages Matthew Wilcox
2019-10-01 10:32 ` Kirill A. Shutemov
2019-09-25 0:52 ` [PATCH 11/15] mm: Remove hpage_nr_pages Matthew Wilcox
2019-10-01 10:35 ` Kirill A. Shutemov
2019-09-25 0:52 ` [PATCH 12/15] mm: Support removing arbitrary sized pages from mapping Matthew Wilcox
2019-10-01 10:39 ` Kirill A. Shutemov
2019-09-25 0:52 ` [PATCH 13/15] mm: Add a huge page fault handler for files Matthew Wilcox
2019-10-01 10:42 ` Kirill A. Shutemov
2019-09-25 0:52 ` [PATCH 14/15] mm: Align THP mappings for non-DAX Matthew Wilcox
2019-10-01 10:45 ` Kirill A. Shutemov
2019-10-01 11:21 ` William Kucharski
2019-10-01 11:32 ` Kirill A. Shutemov
2019-10-01 12:18 ` William Kucharski
2019-10-01 14:20 ` Kirill A. Shutemov
2019-10-01 16:08 ` William Kucharski
2019-10-02 0:15 ` Kirill A. Shutemov
2019-09-25 0:52 ` [PATCH 15/15] xfs: Use filemap_huge_fault Matthew Wilcox
[not found] ` <20191002130753.7680-1-hdanton@sina.com>
2019-10-04 19:33 ` [PATCH 03/15] mm: Add file_offset_of_ helpers Matthew Wilcox
[not found] ` <20191002133211.15696-1-hdanton@sina.com>
2019-10-04 19:34 ` [PATCH 04/15] iomap: Support large pages Matthew Wilcox
[not found] ` <20191003040846.17604-1-hdanton@sina.com>
2019-10-04 19:35 ` [PATCH 06/15] xfs: Pass a page to xfs_finish_page_writeback Matthew Wilcox
[not found] ` <20191003050859.18140-1-hdanton@sina.com>
2019-10-04 19:36 ` [PATCH 11/15] mm: Remove hpage_nr_pages Matthew Wilcox
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=20190925005214.27240-8-willy@infradead.org \
--to=willy@infradead.org \
--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).