| Message ID | 20231109032521.392217-3-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:19AM +0800, Jeff Xie wrote: > +#ifdef CONFIG_PAGE_OWNER > +static int slab_alloc_post_page_owner(struct folio *folio, struct task_struct *tsk, > + void *data, char *kbuf, size_t count) > +{ > + int ret; > + struct kmem_cache *kmem_cache = data; > + > + ret = scnprintf(kbuf, count, "SLAB_PAGE slab_name:%s\n", kmem_cache->name); > + > + return ret; > +} > +#endif Or we could do this typesafely ... struct slab *slab = folio_slab(folio); struct kmem_cache *kmem_cache = slab->slab_cache; ... and then there's no need to pass in a 'data' to the function.
November 9, 2023 at 10:05 PM, "Matthew Wilcox" <willy@infradead.org> wrote: > > On Thu, Nov 09, 2023 at 11:25:19AM +0800, Jeff Xie wrote: > > > > > +#ifdef CONFIG_PAGE_OWNER > > +static int slab_alloc_post_page_owner(struct folio *folio, struct task_struct *tsk, > > + void *data, char *kbuf, size_t count) > > +{ > > + int ret; > > + struct kmem_cache *kmem_cache = data; > > + > > + ret = scnprintf(kbuf, count, "SLAB_PAGE slab_name:%s\n", kmem_cache->name); > > + > > + return ret; > > +} > > +#endif > > > > Or we could do this typesafely ... > > struct slab *slab = folio_slab(folio); > struct kmem_cache *kmem_cache = slab->slab_cache; > > ... and then there's no need to pass in a 'data' to the function. > I accidentally replied using my other email (xiehuan09@gmail.com) just now. Thank you for your advice. Indeed, the "data" didn't serve any purpose here. -- Jeff Xie
diff --git a/include/linux/slab.h b/include/linux/slab.h index d6d6ffeeb9a2..c8969eb4f322 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -795,5 +795,11 @@ int slab_dead_cpu(unsigned int cpu); #define slab_prepare_cpu NULL #define slab_dead_cpu NULL #endif - +#ifndef CONFIG_PAGE_OWNER +static inline int slab_alloc_post_page_owner(struct folio *folio, struct task_struct *tsk, + void *data, char *kbuf, size_t count) +{ + return 0; +} +#endif #endif /* _LINUX_SLAB_H */ diff --git a/mm/slub.c b/mm/slub.c index 63d281dfacdb..7ab8c7aa78e5 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -44,6 +44,7 @@ #include <linux/debugfs.h> #include <trace/events/kmem.h> +#include <linux/page_owner.h> #include "internal.h" @@ -1993,6 +1994,19 @@ static inline bool shuffle_freelist(struct kmem_cache *s, struct slab *slab) } #endif /* CONFIG_SLAB_FREELIST_RANDOM */ +#ifdef CONFIG_PAGE_OWNER +static int slab_alloc_post_page_owner(struct folio *folio, struct task_struct *tsk, + void *data, char *kbuf, size_t count) +{ + int ret; + struct kmem_cache *kmem_cache = data; + + ret = scnprintf(kbuf, count, "SLAB_PAGE slab_name:%s\n", kmem_cache->name); + + return ret; +} +#endif + static struct slab *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) { struct slab *slab; @@ -2028,6 +2042,7 @@ static struct slab *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) stat(s, ORDER_FALLBACK); } + set_folio_alloc_post_page_owner(slab_folio(slab), slab_alloc_post_page_owner, s); slab->objects = oo_objects(oo); slab->inuse = 0; slab->frozen = 0;
Implement the callback function slab_alloc_post_page_owner for the page_owner to make the owner of the slab page clearer For example, for slab page, a line is added to the result of page_owner added: "SLAB_PAGE slab_name:kmalloc-32" Page allocated via order 0, mask 0x12cc0(GFP_KERNEL|__GFP_NOWARN|__GFP_NORETRY), pid 1, tgid 1 (swapper/0), ts 340615384 ns SLAB_PAGE slab_name:kmalloc-32 PFN 0x4be0 type Unmovable Block 37 type Unmovable Flags 0x1fffc0000000800(slab|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 allocate_slab+0x31f/0x410 ___slab_alloc+0x3e8/0x850 __kmem_cache_alloc_node+0x111/0x2b0 kmalloc_trace+0x29/0x90 iommu_setup_dma_ops+0x299/0x470 bus_iommu_probe+0xe1/0x150 iommu_device_register+0xad/0x120 intel_iommu_init+0xe3a/0x1260 pci_iommu_init+0x12/0x40 do_one_initcall+0x45/0x210 kernel_init_freeable+0x1a4/0x2e0 kernel_init+0x1a/0x1c0 added: "SLAB_PAGE slab_name:mm_struct" Page allocated via order 3, mask 0xd20c0(__GFP_IO|__GFP_FS|__GFP_NOWARN|__GFP_NORETRY|__GFP_COMP|__GFP_NOMEMALLOC), \ pid 86, tgid 86 (linuxrc), ts 1121118666 ns SLAB_PAGE slab_name:mm_struct PFN 0x6388 type Unmovable Block 49 type Unmovable Flags 0x1fffc0000000840(slab|head|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 allocate_slab+0x31f/0x410 ___slab_alloc+0x3e8/0x850 kmem_cache_alloc+0x2b8/0x2f0 mm_alloc+0x1a/0x50 alloc_bprm+0x8a/0x300 do_execveat_common.isra.0+0x68/0x240 __x64_sys_execve+0x37/0x50 do_syscall_64+0x42/0xf0 entry_SYSCALL_64_after_hwframe+0x6e/0x76 Signed-off-by: Jeff Xie <jeff.xie@linux.dev> --- include/linux/slab.h | 8 +++++++- mm/slub.c | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-)