Commit fdf3bf80 authored by Vlastimil Babka's avatar Vlastimil Babka Committed by Linus Torvalds

mm, page_owner: rename flag indicating that page is allocated

Commit 37389167 ("mm, page_owner: keep owner info when freeing the
page") has introduced a flag PAGE_EXT_OWNER_ACTIVE to indicate that page
is tracked as being allocated.  Kirril suggested naming it
PAGE_EXT_OWNER_ALLOCATED to make it more clear, as "active is somewhat
loaded term for a page".

Link: http://lkml.kernel.org/r/20190930122916.14969-4-vbabka@suse.czSigned-off-by: default avatarVlastimil Babka <vbabka@suse.cz>
Suggested-by: default avatarKirill A. Shutemov <kirill@shutemov.name>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Walter Wu <walter-zh.wu@mediatek.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0fe9a448
...@@ -18,7 +18,7 @@ struct page_ext_operations { ...@@ -18,7 +18,7 @@ struct page_ext_operations {
enum page_ext_flags { enum page_ext_flags {
PAGE_EXT_OWNER, PAGE_EXT_OWNER,
PAGE_EXT_OWNER_ACTIVE, PAGE_EXT_OWNER_ALLOCATED,
#if defined(CONFIG_IDLE_PAGE_TRACKING) && !defined(CONFIG_64BIT) #if defined(CONFIG_IDLE_PAGE_TRACKING) && !defined(CONFIG_64BIT)
PAGE_EXT_YOUNG, PAGE_EXT_YOUNG,
PAGE_EXT_IDLE, PAGE_EXT_IDLE,
......
...@@ -152,7 +152,7 @@ void __reset_page_owner(struct page *page, unsigned int order) ...@@ -152,7 +152,7 @@ void __reset_page_owner(struct page *page, unsigned int order)
if (unlikely(!page_ext)) if (unlikely(!page_ext))
return; return;
for (i = 0; i < (1 << order); i++) { for (i = 0; i < (1 << order); i++) {
__clear_bit(PAGE_EXT_OWNER_ACTIVE, &page_ext->flags); __clear_bit(PAGE_EXT_OWNER_ALLOCATED, &page_ext->flags);
page_owner = get_page_owner(page_ext); page_owner = get_page_owner(page_ext);
page_owner->free_handle = handle; page_owner->free_handle = handle;
page_ext = page_ext_next(page_ext); page_ext = page_ext_next(page_ext);
...@@ -173,7 +173,7 @@ static inline void __set_page_owner_handle(struct page *page, ...@@ -173,7 +173,7 @@ static inline void __set_page_owner_handle(struct page *page,
page_owner->gfp_mask = gfp_mask; page_owner->gfp_mask = gfp_mask;
page_owner->last_migrate_reason = -1; page_owner->last_migrate_reason = -1;
__set_bit(PAGE_EXT_OWNER, &page_ext->flags); __set_bit(PAGE_EXT_OWNER, &page_ext->flags);
__set_bit(PAGE_EXT_OWNER_ACTIVE, &page_ext->flags); __set_bit(PAGE_EXT_OWNER_ALLOCATED, &page_ext->flags);
page_ext = page_ext_next(page_ext); page_ext = page_ext_next(page_ext);
} }
...@@ -247,7 +247,7 @@ void __copy_page_owner(struct page *oldpage, struct page *newpage) ...@@ -247,7 +247,7 @@ void __copy_page_owner(struct page *oldpage, struct page *newpage)
* the new page, which will be freed. * the new page, which will be freed.
*/ */
__set_bit(PAGE_EXT_OWNER, &new_ext->flags); __set_bit(PAGE_EXT_OWNER, &new_ext->flags);
__set_bit(PAGE_EXT_OWNER_ACTIVE, &new_ext->flags); __set_bit(PAGE_EXT_OWNER_ALLOCATED, &new_ext->flags);
} }
void pagetypeinfo_showmixedcount_print(struct seq_file *m, void pagetypeinfo_showmixedcount_print(struct seq_file *m,
...@@ -307,7 +307,7 @@ void pagetypeinfo_showmixedcount_print(struct seq_file *m, ...@@ -307,7 +307,7 @@ void pagetypeinfo_showmixedcount_print(struct seq_file *m,
if (unlikely(!page_ext)) if (unlikely(!page_ext))
continue; continue;
if (!test_bit(PAGE_EXT_OWNER_ACTIVE, &page_ext->flags)) if (!test_bit(PAGE_EXT_OWNER_ALLOCATED, &page_ext->flags))
continue; continue;
page_owner = get_page_owner(page_ext); page_owner = get_page_owner(page_ext);
...@@ -422,7 +422,7 @@ void __dump_page_owner(struct page *page) ...@@ -422,7 +422,7 @@ void __dump_page_owner(struct page *page)
return; return;
} }
if (test_bit(PAGE_EXT_OWNER_ACTIVE, &page_ext->flags)) if (test_bit(PAGE_EXT_OWNER_ALLOCATED, &page_ext->flags))
pr_alert("page_owner tracks the page as allocated\n"); pr_alert("page_owner tracks the page as allocated\n");
else else
pr_alert("page_owner tracks the page as freed\n"); pr_alert("page_owner tracks the page as freed\n");
...@@ -512,7 +512,7 @@ read_page_owner(struct file *file, char __user *buf, size_t count, loff_t *ppos) ...@@ -512,7 +512,7 @@ read_page_owner(struct file *file, char __user *buf, size_t count, loff_t *ppos)
* Although we do have the info about past allocation of free * Although we do have the info about past allocation of free
* pages, it's not relevant for current memory usage. * pages, it's not relevant for current memory usage.
*/ */
if (!test_bit(PAGE_EXT_OWNER_ACTIVE, &page_ext->flags)) if (!test_bit(PAGE_EXT_OWNER_ALLOCATED, &page_ext->flags))
continue; continue;
page_owner = get_page_owner(page_ext); page_owner = get_page_owner(page_ext);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment