mm_dump_obj() updates for v5.13
Subsystems (6)
Paul E. McKenney
maintainercover mm_dump_obj() updates for v5.13
Hello!
This series contains the following:
1. Don't build mm_dump_obj() on CONFIG_PRINTK=n kernels.
2. Add crude tests for mem_dump_obj().
Thanx, Paul
------------------------------------------------------------------------
include/linux/mm.h | 4 ++++ include/linux/slab.h | 2 ++ include/linux/vmalloc.h | 2 +- kernel/rcu/rcutorture.c | 39 +++++++++++++++++++++++++++++++++++++++ mm/slab.c | 2 ++ mm/slab.h | 2 ++ mm/slab_common.c | 4 ++++ mm/slob.c | 2 ++ mm/slub.c | 2 ++ mm/util.c | 3 +++ mm/vmalloc.c | 2 ++ 11 files changed, 63 insertions(+), 1 deletion(-)
[email protected]
maintainerPATCH 1/2 mm: Don't build mm_dump_obj() on CONFIG_PRINTK=n kernels
From: "Paul E. McKenney" <[email protected]>
The mem_dump_obj() functionality adds a few hundred bytes, which is a small price to pay. Except on kernels built with CONFIG_PRINTK=n, in which mem_dump_obj() messages will be suppressed. This commit therefore makes mem_dump_obj() be a static inline empty function on kernels built with CONFIG_PRINTK=n and excludes all of its support functions as well. This avoids kernel bloat on systems that cannot use mem_dump_obj().
--- include/linux/mm.h | 4 ++++ include/linux/slab.h | 2 ++ include/linux/vmalloc.h | 2 +- mm/slab.c | 2 ++ mm/slab.h | 2 ++ mm/slab_common.c | 2 ++ mm/slob.c | 2 ++ mm/slub.c | 2 ++ mm/util.c | 2 ++ mm/vmalloc.c | 2 ++ 10 files changed, 21 insertions(+), 1 deletion(-)
include/linux/mm.h +4 -0
@@ -3135,7 +3135,11 @@ unsigned long wp_shared_mapping_range(struct address_space *mapping,extern int sysctl_nr_trim_pages; +#ifdef CONFIG_PRINTK void mem_dump_obj (void *object); +#else +static inline void mem_dump_obj (void *object) {} +#endif #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */
include/linux/slab.h +2 -0
@@ -186,8 +186,10 @@ void kfree(const void *);void kfree_sensitive (const void *);size_t __ksize (const void *);size_t ksize (const void *); +#ifdef CONFIG_PRINTK bool kmem_valid_obj (void *object);void kmem_dump_obj (void *object); +#endif #ifdef CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR void __check_heap_object(const void *ptr, unsigned long n, struct page *page,
include/linux/vmalloc.h +1 -1
@@ -241,7 +241,7 @@ pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms)int register_vmap_purge_notifier (struct notifier_block *nb);int unregister_vmap_purge_notifier (struct notifier_block *nb); -#ifdef CONFIG_MMU +#if defined(CONFIG_MMU ) && defined(CONFIG_PRINTK )bool vmalloc_dump_obj (void *object);#else static inline bool vmalloc_dump_obj (void *object) {return false; }
mm/slab.c +2 -0
@@ -3651,6 +3651,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t flags,EXPORT_SYMBOL (__kmalloc_node_track_caller);#endif /* CONFIG_NUMA */ +#ifdef CONFIG_PRINTK void kmem_obj_info (struct kmem_obj_info *kpp,void *object,struct page *page) {struct kmem_cache *cachep;
@@ -3670,6 +3671,7 @@ void kmem_obj_info(struct kmem_obj_info *kpp, void *object, struct page *page)if (DEBUG && cachep->flags &SLAB_STORE_USER ) kpp->kp_ret = *dbg_userword(cachep, objp); } +#endif /** * __do_kmalloc - allocate memory
mm/slab.h +2 -0
@@ -619,6 +619,7 @@ static inline bool slab_want_init_on_free(struct kmem_cache *c)return false; } +#ifdef CONFIG_PRINTK #define KS_ADDRS_COUNT 16 struct kmem_obj_info { void *kp_ptr;
@@ -630,5 +631,6 @@ struct kmem_obj_info {void *kp_stack[KS_ADDRS_COUNT ]; };void kmem_obj_info (struct kmem_obj_info *kpp,void *object,struct page *page); +#endif #endif /* MM_SLAB_H */
mm/slab_common.c +2 -0
@@ -526,6 +526,7 @@ bool slab_is_available(void)return slab_state >=UP ; } +#ifdef CONFIG_PRINTK /** * kmem_valid_obj - does the pointer reference a valid slab object? * @object: pointer to query.
@@ -600,6 +601,7 @@ void kmem_dump_obj(void *object) pr_info(" %pS\n", kp.kp_stack[i]); } } +#endif #ifndef CONFIG_SLOB /* Create a cache during boot when no slab services are available yet */
mm/slob.c +2 -0
@@ -461,11 +461,13 @@ static void slob_free(void *block, int size)spin_unlock_irqrestore (&slob_lock, flags); } +#ifdef CONFIG_PRINTK void kmem_obj_info (struct kmem_obj_info *kpp,void *object,struct page *page) { kpp->kp_ptr = object; kpp->kp_page = page; } +#endif /* * End of slob allocator proper. Begin kmem_cache_alloc and kmalloc frontend.
mm/slub.c +2 -0
@@ -3963,6 +3963,7 @@ int __kmem_cache_shutdown(struct kmem_cache *s)return 0 ; } +#ifdef CONFIG_PRINTK void kmem_obj_info (struct kmem_obj_info *kpp,void *object,struct page *page) {void *base;
@@ -4002,6 +4003,7 @@ void kmem_obj_info(struct kmem_obj_info *kpp, void *object, struct page *page)#endif #endif } +#endif /******************************************************************** * Kmalloc subsystem
mm/util.c +2 -0
@@ -983,6 +983,7 @@ int __weak memcmp_pages(struct page *page1, struct page *page2)return ret; } +#ifdef CONFIG_PRINTK /** * mem_dump_obj - Print available provenance information * @object: object for which to find provenance information.
@@ -1013,3 +1014,4 @@ void mem_dump_obj(void *object) }pr_cont (" non-slab/vmalloc memory.\n" ); } +#endif
mm/vmalloc.c +2 -0
@@ -3450,6 +3450,7 @@ void pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms) }#endif /* CONFIG_SMP */ +#ifdef CONFIG_PRINTK bool vmalloc_dump_obj (void *object) {struct vm_struct *vm;
@@ -3462,6 +3463,7 @@ bool vmalloc_dump_obj(void *object) vm->nr_pages, (unsigned long)vm->addr, vm->caller); return true; } +#endif #ifdef CONFIG_PROC_FS static void *s_start (struct seq_file *m,loff_t *pos)
Signature · 1 line
2.9.5
[email protected]
maintainerPATCH 2/2 rcutorture: Add crude tests for mem_dump_obj()
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
This commit adds a few crude tests for mem_dump_obj() to rcutorture runs. Just to prevent bitrot, you understand!
--- kernel/rcu/rcutorture.c | 39 +++++++++++++++++++++++++++++++++++++++ mm/slab_common.c | 2 ++ mm/util.c | 1 + 3 files changed, 42 insertions(+)
kernel/rcu/rcutorture.c +39 -0
@@ -1861,6 +1861,45 @@ rcu_torture_stats(void *arg)torture_shutdown_absorb ("rcu_torture_stats" ); }while (!torture_must_stop ());torture_kthread_stopping ("rcu_torture_stats" ); + + { +struct rcu_head *rhp; +struct kmem_cache *kcp; +static int z; + + kcp =kmem_cache_create ("rcuscale" ,136 ,8 ,SLAB_STORE_USER ,NULL ); + rhp =kmem_cache_alloc (kcp,GFP_KERNEL ); +pr_alert ("mem_dump_obj() slab test: rcu_torture_stats = %px, &rhp = %px, rhp = %px, &z = %px\n" , stats_task, &rhp, rhp, &z); +pr_alert ("mem_dump_obj(ZERO_SIZE_PTR):" ); +mem_dump_obj (ZERO_SIZE_PTR ); +pr_alert ("mem_dump_obj(NULL):" ); +mem_dump_obj (NULL ); +pr_alert ("mem_dump_obj(%px):" , &rhp); +mem_dump_obj (&rhp); +pr_alert ("mem_dump_obj(%px):" , rhp); +mem_dump_obj (rhp); +pr_alert ("mem_dump_obj(%px):" , &rhp->func); +mem_dump_obj (&rhp->func); +pr_alert ("mem_dump_obj(%px):" , &z); +mem_dump_obj (&z); +kmem_cache_free (kcp, rhp); +kmem_cache_destroy (kcp); + rhp =kmalloc (sizeof (*rhp),GFP_KERNEL ); +pr_alert ("mem_dump_obj() kmalloc test: rcu_torture_stats = %px, &rhp = %px, rhp = %px\n" , stats_task, &rhp, rhp); +pr_alert ("mem_dump_obj(kmalloc %px):" , rhp); +mem_dump_obj (rhp); +pr_alert ("mem_dump_obj(kmalloc %px):" , &rhp->func); +mem_dump_obj (&rhp->func); +kfree (rhp); + rhp =vmalloc (4096 ); +pr_alert ("mem_dump_obj() vmalloc test: rcu_torture_stats = %px, &rhp = %px, rhp = %px\n" , stats_task, &rhp, rhp); +pr_alert ("mem_dump_obj(vmalloc %px):" , rhp); +mem_dump_obj (rhp); +pr_alert ("mem_dump_obj(vmalloc %px):" , &rhp->func); +mem_dump_obj (&rhp->func); +vfree (rhp); + } +return 0 ; }
mm/slab_common.c +2 -0
@@ -545,6 +545,7 @@ bool kmem_valid_obj(void *object) page =virt_to_head_page (object);return PageSlab (page); } +EXPORT_SYMBOL_GPL (kmem_valid_obj);/** * kmem_dump_obj - Print available slab provenance information
@@ -601,6 +602,7 @@ void kmem_dump_obj(void *object) pr_info(" %pS\n", kp.kp_stack[i]); } } +EXPORT_SYMBOL_GPL (kmem_dump_obj);#endif #ifndef CONFIG_SLOB
mm/util.c +1 -0
@@ -1014,4 +1014,5 @@ void mem_dump_obj(void *object) }pr_cont (" non-slab/vmalloc memory.\n" ); } +EXPORT_SYMBOL_GPL (mem_dump_obj);#endif
Signature · 1 line
2.9.5