From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
linux-mm@kvack.org, Hugh Dickins <hughd@google.com>
Subject: [PATCH 27/28] mm: Convert deferred_split_huge_page() to deferred_split_folio()
Date: Wed, 11 Jan 2023 14:29:13 +0000 [thread overview]
Message-ID: <20230111142915.1001531-28-willy@infradead.org> (raw)
In-Reply-To: <20230111142915.1001531-1-willy@infradead.org>
Now that both callers use a folio, pass the folio in and save a
call to compound_head().
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
Documentation/mm/transhuge.rst | 6 +++---
include/linux/huge_mm.h | 4 ++--
mm/huge_memory.c | 3 +--
mm/rmap.c | 2 +-
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/Documentation/mm/transhuge.rst b/Documentation/mm/transhuge.rst
index 03bbd0a19041..a9608fe51649 100644
--- a/Documentation/mm/transhuge.rst
+++ b/Documentation/mm/transhuge.rst
@@ -153,8 +153,8 @@ clear where references should go after split: it will stay on the head page.
Note that split_huge_pmd() doesn't have any limitations on refcounting:
pmd can be split at any point and never fails.
-Partial unmap and deferred_split_huge_page()
-============================================
+Partial unmap and deferred_split_folio()
+========================================
Unmapping part of THP (with munmap() or other way) is not going to free
memory immediately. Instead, we detect that a subpage of THP is not in use
@@ -166,6 +166,6 @@ the place where we can detect partial unmap. It also might be
counterproductive since in many cases partial unmap happens during exit(2) if
a THP crosses a VMA boundary.
-The function deferred_split_huge_page() is used to queue a page for splitting.
+The function deferred_split_folio() is used to queue a folio for splitting.
The splitting itself will happen when we get memory pressure via shrinker
interface.
diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h
index b9978978a160..70bd867eba94 100644
--- a/include/linux/huge_mm.h
+++ b/include/linux/huge_mm.h
@@ -187,7 +187,7 @@ static inline int split_huge_page(struct page *page)
{
return split_huge_page_to_list(page, NULL);
}
-void deferred_split_huge_page(struct page *page);
+void deferred_split_folio(struct folio *folio);
void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,
unsigned long address, bool freeze, struct folio *folio);
@@ -340,7 +340,7 @@ static inline int split_huge_page(struct page *page)
{
return 0;
}
-static inline void deferred_split_huge_page(struct page *page) {}
+static inline void deferred_split_folio(struct folio *folio) {}
#define split_huge_pmd(__vma, __pmd, __address) \
do { } while (0)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index c23b0e01734b..868fcccdff72 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2815,9 +2815,8 @@ void free_transhuge_page(struct page *page)
free_compound_page(page);
}
-void deferred_split_huge_page(struct page *page)
+void deferred_split_folio(struct folio *folio)
{
- struct folio *folio = page_folio(page);
struct deferred_split *ds_queue = get_deferred_split_queue(folio);
#ifdef CONFIG_MEMCG
struct mem_cgroup *memcg = folio_memcg(folio);
diff --git a/mm/rmap.c b/mm/rmap.c
index 462b334d6842..7f76fc40af9a 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1427,7 +1427,7 @@ void page_remove_rmap(struct page *page, struct vm_area_struct *vma,
*/
if (folio_test_pmd_mappable(folio) && folio_test_anon(folio))
if (!compound || nr < nr_pmdmapped)
- deferred_split_huge_page(&folio->page);
+ deferred_split_folio(folio);
}
/*
--
2.35.1
next prev parent reply other threads:[~2023-01-11 14:29 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-11 14:28 [PATCH 00/28] Get rid of tail page fields Matthew Wilcox (Oracle)
2023-01-11 14:28 ` [PATCH 01/28] mm: Remove folio_pincount_ptr() and head_compound_pincount() Matthew Wilcox (Oracle)
2023-01-12 3:05 ` John Hubbard
2023-01-12 12:40 ` Matthew Wilcox
2023-01-11 14:28 ` [PATCH 02/28] mm: Convert head_subpages_mapcount() into folio_nr_pages_mapped() Matthew Wilcox (Oracle)
2023-01-11 14:28 ` [PATCH 03/28] doc: Clarify refcount section by referring to folios & pages Matthew Wilcox (Oracle)
2023-01-11 14:28 ` [PATCH 04/28] mm: Convert total_compound_mapcount() to folio_total_mapcount() Matthew Wilcox (Oracle)
2023-01-11 14:28 ` [PATCH 05/28] mm: Convert page_remove_rmap() to use a folio internally Matthew Wilcox (Oracle)
2023-01-11 14:28 ` [PATCH 06/28] mm: Convert page_add_anon_rmap() " Matthew Wilcox (Oracle)
2023-01-11 14:28 ` [PATCH 07/28] mm: Convert page_add_file_rmap() " Matthew Wilcox (Oracle)
2023-01-11 14:28 ` [PATCH 08/28] mm: Add folio_add_new_anon_rmap() Matthew Wilcox (Oracle)
2023-01-11 14:28 ` [PATCH 09/28] page_alloc: Use folio fields directly Matthew Wilcox (Oracle)
2023-01-11 14:28 ` [PATCH 10/28] mm: Use a folio in hugepage_add_anon_rmap() and hugepage_add_new_anon_rmap() Matthew Wilcox (Oracle)
2023-01-11 14:28 ` [PATCH 11/28] mm: Use entire_mapcount in __page_dup_rmap() Matthew Wilcox (Oracle)
2023-01-11 14:28 ` [PATCH 12/28] mm/debug: Remove call to head_compound_mapcount() Matthew Wilcox (Oracle)
2023-01-11 14:28 ` [PATCH 13/28] hugetlb: Remove uses of folio_mapcount_ptr Matthew Wilcox (Oracle)
2023-01-11 14:29 ` [PATCH 14/28] mm: Convert page_mapcount() to use folio_entire_mapcount() Matthew Wilcox (Oracle)
2023-01-11 14:29 ` [PATCH 15/28] mm: Remove head_compound_mapcount() and _ptr functions Matthew Wilcox (Oracle)
2023-01-11 14:29 ` [PATCH 16/28] mm: Reimplement compound_order() Matthew Wilcox (Oracle)
2023-01-11 14:29 ` [PATCH 17/28] mm: Reimplement compound_nr() Matthew Wilcox (Oracle)
2023-01-11 14:29 ` [PATCH 18/28] mm: Convert set_compound_page_dtor() and set_compound_order() to folios Matthew Wilcox (Oracle)
2023-01-11 14:29 ` [PATCH 19/28] mm: Convert is_transparent_hugepage() to use a folio Matthew Wilcox (Oracle)
2023-01-11 14:29 ` [PATCH 20/28] mm: Convert destroy_large_folio() to use folio_dtor Matthew Wilcox (Oracle)
2023-01-11 14:29 ` [PATCH 21/28] hugetlb: Remove uses of compound_dtor and compound_nr Matthew Wilcox (Oracle)
2023-01-11 14:29 ` [PATCH 22/28] mm: Remove 'First tail page' members from struct page Matthew Wilcox (Oracle)
2023-01-11 14:29 ` [PATCH 23/28] doc: Correct struct folio kernel-doc Matthew Wilcox (Oracle)
2023-01-11 14:29 ` [PATCH 24/28] mm: Move page->deferred_list to folio->_deferred_list Matthew Wilcox (Oracle)
2023-01-11 14:29 ` [PATCH 25/28] mm/huge_memory: Remove page_deferred_list() Matthew Wilcox (Oracle)
2023-01-11 14:29 ` [PATCH 26/28] mm/huge_memory: Convert get_deferred_split_queue() to take a folio Matthew Wilcox (Oracle)
2023-01-11 14:29 ` Matthew Wilcox (Oracle) [this message]
2023-01-11 14:29 ` [PATCH 28/28] mm: remove the hugetlb field from struct page Matthew Wilcox (Oracle)
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=20230111142915.1001531-28-willy@infradead.org \
--to=willy@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=hughd@google.com \
--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