Commit 5bb1bb35 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

mm: Don't build mm_dump_obj() on CONFIG_PRINTK=n kernels 



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().

Cc: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: <linux-mm@kvack.org>
Suggested-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent a38fd874

include/linux/mm.h

+4 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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 */