From: Chris Mason With memory allocation profiling enabled, mempool_resize() allocates new elements without an allocation tag: mempool_alloc_slab() and friends use the _noprof allocators and rely on the caller to have set current->alloc_tag. Unlike mempool_init() or mempool_alloc(), mempool_resize() is not an alloc_hooks() wrapper, though. Therefore, the newly allocated elements are missing from /proc/allocinfo, and with CONFIG_MEM_ALLOC_PROFILING_DEBUG=y we can trigger "current->alloc_tag not set" and "alloc_tag was not set" warnings. Fix it by turning mempool_resize() into an alloc_hooks() wrapper, just like the other mempool functions that allocate elements. This has low urgency. Fixes: e26d8769da6d ("mempool: hook up to memory allocation profiling") Signed-off-by: Chris Mason [ david: adjust description, remove kmalloc_objs() change ] Signed-off-by: David Hildenbrand (Arm) --- include/linux/mempool.h | 4 +++- mm/mempool.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/linux/mempool.h b/include/linux/mempool.h index 6da502aef2f71..5444dcb63efa8 100644 --- a/include/linux/mempool.h +++ b/include/linux/mempool.h @@ -59,7 +59,9 @@ struct mempool *mempool_create_node_noprof(int min_nr, mempool_create_node(_min_nr, _alloc_fn, _free_fn, _pool_data, \ GFP_KERNEL, NUMA_NO_NODE) -int mempool_resize(struct mempool *pool, int new_min_nr); +int mempool_resize_noprof(struct mempool *pool, int new_min_nr); +#define mempool_resize(...) \ + alloc_hooks(mempool_resize_noprof(__VA_ARGS__)) void mempool_destroy(struct mempool *pool); void *mempool_alloc_noprof(struct mempool *pool, gfp_t gfp_mask) __malloc; diff --git a/mm/mempool.c b/mm/mempool.c index cb74e718b2c65..5e0ba516efdbf 100644 --- a/mm/mempool.c +++ b/mm/mempool.c @@ -361,7 +361,7 @@ EXPORT_SYMBOL(mempool_create_node_noprof); * * Return: %0 on success, negative error code otherwise. */ -int mempool_resize(struct mempool *pool, int new_min_nr) +int mempool_resize_noprof(struct mempool *pool, int new_min_nr) { void *element; void **new_elements; @@ -420,7 +420,7 @@ int mempool_resize(struct mempool *pool, int new_min_nr) out: return 0; } -EXPORT_SYMBOL(mempool_resize); +EXPORT_SYMBOL(mempool_resize_noprof); static unsigned int mempool_alloc_from_pool(struct mempool *pool, void **elems, unsigned int count, unsigned int allocated, -- 2.56.1