mm: fix xyz_noprof functions calling profiled functions
Subsystems (4)
Suren Baghdasaryan
reviewerPATCH 1/1 mm: fix xyz_noprof functions calling profiled functions
Grepping /proc/allocinfo for "noprof" reveals several xyz_noprof functions, which means internally they are calling profiled functions. This should never happen as such calls move allocation charge from a higher level location where it should be accounted for into these lower level helpers. Fix this by replacing profiled function calls with noprof ones.
--- mm/filemap.c | 2 +- mm/mempool.c | 2 +- mm/util.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-)
mm/filemap.c +1 -1
@@ -1000,7 +1000,7 @@ struct folio *filemap_alloc_folio_noprof(gfp_t gfp, unsigned int order)do { cpuset_mems_cookie =read_mems_allowed_begin (); n =cpuset_mem_spread_node (); - folio =__folio_alloc_node (gfp, order, n); + folio =__folio_alloc_node_noprof (gfp, order, n); }while (!folio &&read_mems_allowed_retry (cpuset_mems_cookie));return folio;
mm/mempool.c +1 -1
@@ -273,7 +273,7 @@ mempool_t *mempool_create_node_noprof(int min_nr, mempool_alloc_t *alloc_fn, {mempool_t *pool; - pool =kzalloc_node (sizeof (*pool), gfp_mask, node_id); + pool =kmalloc_node_noprof (sizeof (*pool), gfp_mask | __GFP_ZERO, node_id);if (!pool)return NULL ;
mm/util.c +5 -5
@@ -705,7 +705,7 @@ void *kvrealloc_noprof(const void *p, size_t oldsize, size_t newsize, gfp_t flagif (oldsize >= newsize)return (void *)p; - newp =kvmalloc (newsize, flags); + newp =kvmalloc_noprof (newsize, flags);if (!newp)return NULL ;memcpy (newp, p, oldsize);
@@ -726,7 +726,7 @@ void *__vmalloc_array_noprof(size_t n, size_t size, gfp_t flags)if (unlikely (check_mul_overflow (n, size, &bytes)))return NULL ; -return __vmalloc (bytes, flags); +return __vmalloc_noprof (bytes, flags); }EXPORT_SYMBOL (__vmalloc_array_noprof);
@@ -737,7 +737,7 @@ EXPORT_SYMBOL(__vmalloc_array_noprof);*/ void *vmalloc_array_noprof (size_t n,size_t size) { -return __vmalloc_array (n, size,GFP_KERNEL ); +return __vmalloc_array_noprof (n, size,GFP_KERNEL ); }EXPORT_SYMBOL (vmalloc_array_noprof);
@@ -749,7 +749,7 @@ EXPORT_SYMBOL(vmalloc_array_noprof);*/ void *__vcalloc_noprof (size_t n,size_t size,gfp_t flags) { -return __vmalloc_array (n, size, flags | __GFP_ZERO); +return __vmalloc_array_noprof (n, size, flags | __GFP_ZERO); }EXPORT_SYMBOL (__vcalloc_noprof);
@@ -760,7 +760,7 @@ EXPORT_SYMBOL(__vcalloc_noprof);*/ void *vcalloc_noprof (size_t n,size_t size) { -return __vmalloc_array (n, size,GFP_KERNEL | __GFP_ZERO); +return __vmalloc_array_noprof (n, size,GFP_KERNEL | __GFP_ZERO); }EXPORT_SYMBOL (vcalloc_noprof);
base-commit: 8e06d6b9274dc504af6021a8bbc2daf6713ceb20
Signature · 1 line
2.45.1.288.g0e0cd299f1-goog
Quoted 10 lines · Suren Baghdasaryan
Grepping
/proc/allocinfofor "noprof" reveals severalxyz_noproffunctions, which means internally they are calling profiled functions. This should never happen as such calls move allocation charge from a higher level location where it should be accounted for into these lower level helpers. Fix this by replacing profiled function calls with noprof ones.Fixes b951aaff5035 ("mm: enable page allocation tagging")Fixes e26d8769da6d ("mempool: hook up to memory allocation profiling")Fixes 88ae5fb755b0 ("mm: vmalloc: enable memory allocation profiling")Signed-off-by Suren Baghdasaryan <[email protected]>
Signature · 1 line
Kees Cook
Quoted 11 lines · Suren Baghdasaryan
Grepping
/proc/allocinfofor "noprof" reveals severalxyz_noproffunctions, which means internally they are calling profiled functions. This should never happen as such calls move allocation charge from a higher level location where it should be accounted for into these lower level helpers. Fix this by replacing profiled function calls with noprof ones.Fixes b951aaff5035 ("mm: enable page allocation tagging")Fixes e26d8769da6d ("mempool: hook up to memory allocation profiling")Fixes 88ae5fb755b0 ("mm: vmalloc: enable memory allocation profiling")Signed-off-by Suren Baghdasaryan <[email protected]>Cc Kent Overstreet <[email protected]>
Quoted 83 lines
--- mm/filemap.c | 2 +- mm/mempool.c | 2 +- mm/util.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-)mm/filemap.c +1
-1@@ -1000,7 +1000,7 @@ struct folio *filemap_alloc_folio_noprof(gfp_t gfp, unsigned int order)do { cpuset_mems_cookie =read_mems_allowed_begin (); n =cpuset_mem_spread_node (); - folio =__folio_alloc_node (gfp, order, n); + folio =__folio_alloc_node_noprof (gfp, order, n); }while (!folio &&read_mems_allowed_retry (cpuset_mems_cookie));return folio;mm/mempool.c +1
-1@@ -273,7 +273,7 @@ mempool_t *mempool_create_node_noprof(int min_nr, mempool_alloc_t *alloc_fn, {mempool_t *pool; - pool =kzalloc_node (sizeof (*pool), gfp_mask, node_id); + pool =kmalloc_node_noprof (sizeof (*pool), gfp_mask | __GFP_ZERO, node_id);if (!pool)return NULL ;mm/util.c +5
-5@@ -705,7 +705,7 @@ void *kvrealloc_noprof(const void *p, size_t oldsize, size_t newsize, gfp_t flagif (oldsize >= newsize)return (void *)p; - newp =kvmalloc (newsize, flags); + newp =kvmalloc_noprof (newsize, flags);if (!newp)return NULL ;memcpy (newp, p, oldsize);@@ -726,7 +726,7 @@ void *__vmalloc_array_noprof(size_t n, size_t size, gfp_t flags)if (unlikely (check_mul_overflow (n, size, &bytes)))return NULL ; -return __vmalloc (bytes, flags); +return __vmalloc_noprof (bytes, flags); }EXPORT_SYMBOL (__vmalloc_array_noprof);@@ -737,7 +737,7 @@ EXPORT_SYMBOL(__vmalloc_array_noprof);*/ void *vmalloc_array_noprof (size_t n,size_t size) { -return __vmalloc_array (n, size,GFP_KERNEL ); +return __vmalloc_array_noprof (n, size,GFP_KERNEL ); }EXPORT_SYMBOL (vmalloc_array_noprof);@@ -749,7 +749,7 @@ EXPORT_SYMBOL(vmalloc_array_noprof);*/ void *__vcalloc_noprof (size_t n,size_t size,gfp_t flags) { -return __vmalloc_array (n, size, flags | __GFP_ZERO); +return __vmalloc_array_noprof (n, size, flags | __GFP_ZERO); }EXPORT_SYMBOL (__vcalloc_noprof);@@ -760,7 +760,7 @@ EXPORT_SYMBOL(__vcalloc_noprof);*/ void *vcalloc_noprof (size_t n,size_t size) { -return __vmalloc_array (n, size,GFP_KERNEL | __GFP_ZERO); +return __vmalloc_array_noprof (n, size,GFP_KERNEL | __GFP_ZERO); }EXPORT_SYMBOL (vcalloc_noprof);base-commit:
8e06d6b9274dc504af6021a8bbc2daf6713ceb20