mm/page_owner: use order instead of nr in split_page_owner()

We do not have non power of two pages, using nr is error prone if nr is
not power-of-two.  Use page order instead.

Link: https://lkml.kernel.org/r/20230403201839.4097845-3-zi.yan@sent.com
Signed-off-by: Zi Yan <ziy@nvidia.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Michal Koutný <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>

diff --git a/include/linux/page_owner.h b/include/linux/page_owner.h
index 119a0c9d2a8b50a97db218d880d4ac869c08de7d..d7878523adfc3abebbcf6d5d8aa4b0803f4e692a 100644 (file)
--- a/include/linux/page_owner.h
+++ b/include/linux/page_owner.h
@@ -11,7 +11,7 @@ extern struct page_ext_operations page_owner_ops;
 extern void __reset_page_owner(struct page *page, unsigned short order);
 extern void __set_page_owner(struct page *page,
                        unsigned short order, gfp_t gfp_mask);
-extern void __split_page_owner(struct page *page, unsigned int nr);
+extern void __split_page_owner(struct page *page, int order);
 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 __dump_page_owner(const struct page *page);
@@ -31,10 +31,10 @@ static inline void set_page_owner(struct page *page,
                __set_page_owner(page, order, gfp_mask);
 }
 
-static inline void split_page_owner(struct page *page, unsigned int nr)
+static inline void split_page_owner(struct page *page, int order)
 {
        if (static_branch_unlikely(&page_owner_inited))
-               __split_page_owner(page, nr);
+               __split_page_owner(page, order);
 }
 static inline void folio_copy_owner(struct folio *newfolio, struct folio *old)
 {
@@ -60,7 +60,7 @@ static inline void set_page_owner(struct page *page,
 {
 }
 static inline void split_page_owner(struct page *page,
-                       unsigned short order)
+                       int order)
 {
 }
 static inline void folio_copy_owner(struct folio *newfolio, struct folio *folio)

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 82a875a61d735753bfe71bd3e40e59bcdb58cd5d..7c5a8301159f490041192d018bb5b841a359d42c 100644 (file)
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2565,7 +2565,7 @@ static void __split_huge_page(struct page *page, struct list_head *list,
        unlock_page_lruvec(lruvec);
        /* Caller disabled irqs, so they are still disabled here */
 
-       split_page_owner(head, nr);
+       split_page_owner(head, order);
 
        /* See comment in __split_huge_page_tail() */
        if (PageAnon(head)) {

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 0fe6404289c93eb5c55c7a23294d8a025a0ad33a..279019f727f93b02abd10ed2cb003b282e717284 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2780,7 +2780,7 @@ void split_page(struct page *page, unsigned int order)
 
        for (i = 1; i < (1 << order); i++)
                set_page_refcounted(page + i);
-       split_page_owner(page, 1 << order);
+       split_page_owner(page, order);
        split_page_memcg(page, order);
 }
 EXPORT_SYMBOL_GPL(split_page);
@@ -4996,7 +4996,7 @@ static void *make_alloc_exact(unsigned long addr, unsigned int order,
                struct page *page = virt_to_page((void *)addr);
                struct page *last = page + nr;
 
-               split_page_owner(page, 1 << order);
+               split_page_owner(page, order);
                split_page_memcg(page, order);
                while (page < --last)
                        set_page_refcounted(last);

diff --git a/mm/page_owner.c b/mm/page_owner.c
index 31169b3e7f0672d93d97f443e03c239c354600c0..64233b5b09d53e961cc7e9a246548687573fabeb 100644 (file)
--- a/mm/page_owner.c
+++ b/mm/page_owner.c
@@ -211,11 +211,12 @@ void __set_page_owner_migrate_reason(struct page *page, int reason)
        page_ext_put(page_ext);
 }
 
-void __split_page_owner(struct page *page, unsigned int nr)
+void __split_page_owner(struct page *page, int order)
 {
        int i;
        struct page_ext *page_ext = page_ext_get(page);
        struct page_owner *page_owner;
+       unsigned int nr = 1 << order;
 
        if (unlikely(!page_ext))
                return;