| Message ID | 20231109032521.392217-5-jeff.xie@linux.dev (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | mm, page_owner: make the owner in page owner clearer | expand |
On Thu, Nov 09, 2023 at 11:25:21AM +0800, Jeff Xie wrote: > +static int anon_alloc_post_page_owner(struct folio *folio, struct task_struct *tsk, > + void *data, char *kbuf, size_t count) > +{ > + int ret; > + unsigned long address = (unsigned long)data; > + > + ret = scnprintf(kbuf, count, "ANON_PAGE address 0x%lx\n", address); ... completely ignoring that it might have been mremap() since ... I'm not an expert on anon memory. I'm sure someone can tell you how to figure out the current address that a folio is mapped at.
November 9, 2023 at 10:10 PM, "Matthew Wilcox" <willy@infradead.org> wrote: > > On Thu, Nov 09, 2023 at 11:25:21AM +0800, Jeff Xie wrote: > > > > > +static int anon_alloc_post_page_owner(struct folio *folio, struct task_struct *tsk, > > + void *data, char *kbuf, size_t count) > > +{ > > + int ret; > > + unsigned long address = (unsigned long)data; > > + > > + ret = scnprintf(kbuf, count, "ANON_PAGE address 0x%lx\n", address); > > > > ... completely ignoring that it might have been mremap() since ... > > I'm not an expert on anon memory. I'm sure someone can tell you how to > figure out the current address that a folio is mapped at. > I'm currently not sure if the address parameter is the mapped address, so this is an RFC patchset ;-)
diff --git a/include/linux/rmap.h b/include/linux/rmap.h index b26fe858fd44..d85650c9c520 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -502,4 +502,11 @@ static inline int page_mkclean(struct page *page) { return folio_mkclean(page_folio(page)); } +#ifndef CONFIG_PAGE_OWNER +static inline int anon_alloc_post_page_owner(struct folio *folio, struct task_struct *tsk, + void *data, char *kbuf, size_t count) +{ + return 0; +} +#endif #endif /* _LINUX_RMAP_H */ diff --git a/mm/rmap.c b/mm/rmap.c index 7a27a2b41802..41c8a387cd37 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -75,7 +75,7 @@ #include <linux/memremap.h> #include <linux/userfaultfd_k.h> #include <linux/mm_inline.h> - +#include <linux/page_owner.h> #include <asm/tlbflush.h> #define CREATE_TRACE_POINTS @@ -1151,6 +1151,18 @@ void folio_move_anon_rmap(struct folio *folio, struct vm_area_struct *vma) */ WRITE_ONCE(folio->mapping, anon_vma); } +#ifdef CONFIG_PAGE_OWNER +static int anon_alloc_post_page_owner(struct folio *folio, struct task_struct *tsk, + void *data, char *kbuf, size_t count) +{ + int ret; + unsigned long address = (unsigned long)data; + + ret = scnprintf(kbuf, count, "ANON_PAGE address 0x%lx\n", address); + + return ret; +} +#endif /** * __folio_set_anon - set up a new anonymous rmap for a folio @@ -1182,6 +1194,7 @@ static void __folio_set_anon(struct folio *folio, struct vm_area_struct *vma, anon_vma = (void *) anon_vma + PAGE_MAPPING_ANON; WRITE_ONCE(folio->mapping, (struct address_space *) anon_vma); folio->index = linear_page_index(vma, address); + set_folio_alloc_post_page_owner(folio, anon_alloc_post_page_owner, (void *)address); } /**
Implement the callback function anon_alloc_post_page_owner for the page_owner to make the owner of the anon page clearer For the pid 98: [root@JeffXie ]# cat /proc/98/maps 00400000-00401000 r--p 00000000 fd:00 1954 /test/mm/a.out 00401000-00499000 r-xp 00001000 fd:00 1954 /test/mm/a.out 00499000-004c2000 r--p 00099000 fd:00 1954 /test/mm/a.out 004c2000-004c6000 r--p 000c1000 fd:00 1954 /test/mm/a.out 004c6000-004c9000 rw-p 000c5000 fd:00 1954 /test/mm/a.out 004c9000-004ce000 rw-p 00000000 00:00 0 01d97000-01db9000 rw-p 00000000 00:00 0 [heap] 7f1588fc8000-7f1588fc9000 rw-p 00000000 fd:00 1945 /a.txt 7ffda207a000-7ffda209b000 rw-p 00000000 00:00 0 [stack] 7ffda2152000-7ffda2156000 r--p 00000000 00:00 0 [vvar] 7ffda2156000-7ffda2158000 r-xp 00000000 00:00 0 [vdso] ffffffffff600000-ffffffffff601000 --xp 00000000 00:00 0 [vsyscall] added: "ANON_PAGE address 0x4c4000" Page allocated via order 0, mask 0x140cca(GFP_HIGHUSER_MOVABLE|__GFP_COMP), pid 98, tgid 98 (a.out), ts 28442066180 ns ANON_PAGE address 0x4c4000 PFN 0x2c3db type Movable Block 353 type Movable Flags 0x1fffc00000a0028(uptodate|lru|mappedtodisk|swapbacked|node=0|zone=1|lastcpupid=0x3fff) post_alloc_hook+0x77/0xf0 get_page_from_freelist+0x58d/0x14e0 __alloc_pages+0x1b2/0x380 alloc_pages_mpol+0x97/0x1f0 vma_alloc_folio+0x5c/0xd0 do_wp_page+0x288/0xe30 __handle_mm_fault+0x8ca/0x1760 handle_mm_fault+0xbc/0x2f0 do_user_addr_fault+0x158/0x5e0 exc_page_fault+0x73/0x170 asm_exc_page_fault+0x26/0x30 Charged to memcg / Signed-off-by: Jeff Xie <jeff.xie@linux.dev> --- include/linux/rmap.h | 7 +++++++ mm/rmap.c | 15 ++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-)