Add data structure for page_owner filtering functionality and create debugfs directory for filter controls. This adds: - struct page_owner_filter with compact and nid fields - Static owner_filter instance initialized with default values - page_owner_filter debugfs directory The filter infrastructure will be used to add compact mode and NUMA node filtering capabilities in subsequent commits. Signed-off-by: Zhen Ni --- mm/page_owner.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/mm/page_owner.c b/mm/page_owner.c index 8178e0be557f..6811439bf9e4 100644 --- a/mm/page_owner.c +++ b/mm/page_owner.c @@ -54,6 +54,16 @@ struct stack_print_ctx { u8 flags; }; +struct page_owner_filter { + bool compact; + int nid; +}; + +static struct page_owner_filter owner_filter = { + .compact = false, + .nid = -1, +}; + static bool page_owner_enabled __initdata; DEFINE_STATIC_KEY_FALSE(page_owner_inited); @@ -973,7 +983,7 @@ DEFINE_SIMPLE_ATTRIBUTE(page_owner_threshold_fops, &page_owner_threshold_get, static int __init pageowner_init(void) { - struct dentry *dir; + struct dentry *dir, *filter_dir; if (!static_branch_unlikely(&page_owner_inited)) { pr_info("page_owner is disabled\n"); @@ -981,6 +991,9 @@ static int __init pageowner_init(void) } debugfs_create_file("page_owner", 0400, NULL, NULL, &page_owner_fops); + + filter_dir = debugfs_create_dir("page_owner_filter", NULL); + dir = debugfs_create_dir("page_owner_stacks", NULL); debugfs_create_file("show_stacks", 0400, dir, (void *)(STACK_PRINT_FLAG_STACK | -- 2.20.1 Add compact mode functionality to reduce page_owner output size by printing only the stack handle instead of the full stack trace. Example output: Page allocated via order 0, mask 0x42800(GFP_NOWAIT|__GFP_COMP), pid 1, tgid 1 (systemd), ts 349667370 ns PFN 0xa00a2 type Unmovable Block 1280 type Unmovable Flags 0x33fffe0000004124(referenced|lru|active|private|node=3|zone=0| lastcpupid=0x1ffff) handle: 17432583 Charged to memcg / Compact mode significantly reduces output size while preserving all other page allocation information, making it easier to analyze large volumes of page owner data.The correspondence between handles and stack traces can be obtained through the show_stacks_handles interface. Signed-off-by: Zhen Ni --- mm/page_owner.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/mm/page_owner.c b/mm/page_owner.c index 6811439bf9e4..214b58eef3d8 100644 --- a/mm/page_owner.c +++ b/mm/page_owner.c @@ -585,7 +585,14 @@ print_page_owner(char __user *buf, size_t count, unsigned long pfn, migratetype_names[pageblock_mt], &page->flags); - ret += stack_depot_snprint(handle, kbuf + ret, count - ret, 0); + /* Compact mode: print handle instead of full stack trace */ + if (READ_ONCE(owner_filter.compact)) { + ret += scnprintf(kbuf + ret, count - ret, + "handle: %d\n", handle); + } else { + ret += stack_depot_snprint(handle, kbuf + ret, count - ret, 0); + } + if (ret >= count) goto err; @@ -980,6 +987,24 @@ static int page_owner_threshold_set(void *data, u64 val) DEFINE_SIMPLE_ATTRIBUTE(page_owner_threshold_fops, &page_owner_threshold_get, &page_owner_threshold_set, "%llu"); +static int page_owner_compact_get(void *data, u64 *val) +{ + *val = READ_ONCE(owner_filter.compact); + return 0; +} + +static int page_owner_compact_set(void *data, u64 val) +{ + if (val != 0 && val != 1) + return -EINVAL; + WRITE_ONCE(owner_filter.compact, val); + return 0; +} + +DEFINE_SIMPLE_ATTRIBUTE(page_owner_compact_fops, + &page_owner_compact_get, + &page_owner_compact_set, "%lld"); + static int __init pageowner_init(void) { @@ -993,6 +1018,8 @@ static int __init pageowner_init(void) debugfs_create_file("page_owner", 0400, NULL, NULL, &page_owner_fops); filter_dir = debugfs_create_dir("page_owner_filter", NULL); + debugfs_create_file("compact", 0600, filter_dir, NULL, + &page_owner_compact_fops); dir = debugfs_create_dir("page_owner_stacks", NULL); debugfs_create_file("show_stacks", 0400, dir, -- 2.20.1 Add NUMA node filtering functionality to page_owner to allow filtering pages by specific NUMA node. The filter allows users to focus on pages from a specific NUMA node, which is useful for NUMA-aware memory allocation analysis and debugging. Setting nid to -1 disables filtering (default behavior). Signed-off-by: Zhen Ni --- mm/page_owner.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/mm/page_owner.c b/mm/page_owner.c index 214b58eef3d8..ebc29f3f516d 100644 --- a/mm/page_owner.c +++ b/mm/page_owner.c @@ -726,6 +726,13 @@ read_page_owner(struct file *file, char __user *buf, size_t count, loff_t *ppos) if (unlikely(!page_ext)) continue; + if (READ_ONCE(owner_filter.nid) >= 0) { + int nid = page_to_nid(page); + + if (nid != READ_ONCE(owner_filter.nid)) + goto ext_put_continue; + } + /* * Some pages could be missed by concurrent allocation or free, * because we don't hold the zone lock. @@ -987,6 +994,24 @@ static int page_owner_threshold_set(void *data, u64 val) DEFINE_SIMPLE_ATTRIBUTE(page_owner_threshold_fops, &page_owner_threshold_get, &page_owner_threshold_set, "%llu"); +static int page_owner_nid_filter_get(void *data, u64 *val) +{ + *val = READ_ONCE(owner_filter.nid); + return 0; +} + +static int page_owner_nid_filter_set(void *data, u64 val) +{ + if (val >= MAX_NUMNODES && val != (u64)-1) + return -EINVAL; + WRITE_ONCE(owner_filter.nid, val); + return 0; +} + +DEFINE_SIMPLE_ATTRIBUTE(page_owner_nid_filter_fops, + &page_owner_nid_filter_get, + &page_owner_nid_filter_set, "%lld"); + static int page_owner_compact_get(void *data, u64 *val) { *val = READ_ONCE(owner_filter.compact); @@ -1018,6 +1043,8 @@ static int __init pageowner_init(void) debugfs_create_file("page_owner", 0400, NULL, NULL, &page_owner_fops); filter_dir = debugfs_create_dir("page_owner_filter", NULL); + debugfs_create_file("nid", 0600, filter_dir, NULL, + &page_owner_nid_filter_fops); debugfs_create_file("compact", 0600, filter_dir, NULL, &page_owner_compact_fops); -- 2.20.1