kevin/linux
1
Fork 0
Code

mm: page_owner: add support for splitting to any order in split page_owner

Browse Source 
It adds a new_order parameter to set new page order in page owner.  It
prepares for upcoming changes to support split huge page to any lower
order.

Link: https://lkml.kernel.org/r/20240226205534.1603748-7-zi.yan@sent.com
Signed-off-by: Zi Yan <ziy@nvidia.com>
Cc: David Hildenbrand <david@redhat.com>
Acked-by: David Hildenbrand <david@redhat.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Luis Chamberlain <mcgrof@kernel.org>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: Michal Koutny <mkoutny@suse.com>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: Yang Shi <shy828301@gmail.com>
Cc: Yu Zhao <yuzhao@google.com>
Cc: Zach O'Keefe <zokeefe@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Zi Yan 2024-02-26 15:55:32 -05:00 committed by Andrew Morton
parent b8791381d7
commit 46d44d09d2
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/linux/page_owner.h
View File

@ -11,7 +11,8 @@ extern struct page_ext_operations page_owner_ops;
extern void __reset_page_owner(struct page *page, unsigned short order); extern void __reset_page_owner(struct page *page, unsigned short order);
extern void __set_page_owner(struct page *page, extern void __set_page_owner(struct page *page,
unsigned short order, gfp_t gfp_mask); unsigned short order, gfp_t gfp_mask);
extern void __split_page_owner(struct page *page, int order); extern void __split_page_owner(struct page *page, int old_order,
int new_order);
extern void __folio_copy_owner(struct folio *newfolio, struct folio *old); extern void __folio_copy_owner(struct folio *newfolio, struct folio *old);
extern void __set_page_owner_migrate_reason(struct page *page, int reason); extern void __set_page_owner_migrate_reason(struct page *page, int reason);
extern void __dump_page_owner(const struct page *page); extern void __dump_page_owner(const struct page *page);
@ -31,10 +32,11 @@ static inline void set_page_owner(struct page *page,
__set_page_owner(page, order, gfp_mask); __set_page_owner(page, order, gfp_mask);
} }
static inline void split_page_owner(struct page *page, int order) static inline void split_page_owner(struct page *page, int old_order,
int new_order)
{ {
if (static_branch_unlikely(&page_owner_inited)) if (static_branch_unlikely(&page_owner_inited))
__split_page_owner(page, order); __split_page_owner(page, old_order, new_order);
} }
static inline void folio_copy_owner(struct folio *newfolio, struct folio *old) static inline void folio_copy_owner(struct folio *newfolio, struct folio *old)
{ {
@ -56,10 +58,11 @@ static inline void reset_page_owner(struct page *page, unsigned short order)
{ {
} }
static inline void set_page_owner(struct page *page, static inline void set_page_owner(struct page *page,
unsigned int order, gfp_t gfp_mask) unsigned short order, gfp_t gfp_mask)
{ {
} }
static inline void split_page_owner(struct page *page, int order) static inline void split_page_owner(struct page *page, int old_order,
int new_order)
{ {
} }
static inline void folio_copy_owner(struct folio *newfolio, struct folio *folio) static inline void folio_copy_owner(struct folio *newfolio, struct folio *folio)

2
mm/huge_memory.c
View File

@ -2933,7 +2933,7 @@ static void __split_huge_page(struct page *page, struct list_head *list,
unlock_page_lruvec(lruvec); unlock_page_lruvec(lruvec);
/* Caller disabled irqs, so they are still disabled here */ /* Caller disabled irqs, so they are still disabled here */
split_page_owner(head, order); split_page_owner(head, order, 0);
/* See comment in __split_huge_page_tail() */ /* See comment in __split_huge_page_tail() */
if (PageAnon(head)) { if (PageAnon(head)) {

4
mm/page_alloc.c
View File

@ -2616,7 +2616,7 @@ void split_page(struct page *page, unsigned int order)
for (i = 1; i < (1 << order); i++) for (i = 1; i < (1 << order); i++)
set_page_refcounted(page + i); set_page_refcounted(page + i);
split_page_owner(page, order); split_page_owner(page, order, 0);
split_page_memcg(page, order, 0); split_page_memcg(page, order, 0);
} }
EXPORT_SYMBOL_GPL(split_page); EXPORT_SYMBOL_GPL(split_page);
@ -4801,7 +4801,7 @@ static void *make_alloc_exact(unsigned long addr, unsigned int order,
struct page *page = virt_to_page((void *)addr); struct page *page = virt_to_page((void *)addr);
struct page *last = page + nr; struct page *last = page + nr;
split_page_owner(page, order); split_page_owner(page, order, 0);
split_page_memcg(page, order, 0); split_page_memcg(page, order, 0);
while (page < --last) while (page < --last)
set_page_refcounted(last); set_page_refcounted(last);

7
mm/page_owner.c
View File

@ -306,19 +306,18 @@ void __set_page_owner_migrate_reason(struct page *page, int reason)
page_ext_put(page_ext); page_ext_put(page_ext);
} }
void __split_page_owner(struct page *page, int order) void __split_page_owner(struct page *page, int old_order, int new_order)
{ {
int i; int i;
struct page_ext *page_ext = page_ext_get(page); struct page_ext *page_ext = page_ext_get(page);
struct page_owner *page_owner; struct page_owner *page_owner;
unsigned int nr = 1 << order;
if (unlikely(!page_ext)) if (unlikely(!page_ext))
return; return;
for (i = 0; i < nr; i++) { for (i = 0; i < (1 << old_order); i++) {
page_owner = get_page_owner(page_ext); page_owner = get_page_owner(page_ext);
page_owner->order = 0; page_owner->order = new_order;
page_ext = page_ext_next(page_ext); page_ext = page_ext_next(page_ext);
} }
page_ext_put(page_ext); page_ext_put(page_ext);