forked from luck/tmp_suning_uos_patched
mm: Use __do_krealloc to do the krealloc job
Without this patch we can get (many) kmem trace events with call site at krealloc(). This happens because krealloc is calling __krealloc, which performs the allocation through kmalloc_track_caller. Since neither krealloc nor __krealloc are marked inline explicitly, the caller can be traced as being krealloc, which clearly is not the intended behavior. This patch allows to get the real caller of krealloc, by creating an always inlined function __do_krealloc, thus tracing the call site accurately. Acked-by: Christoph Lameter <cl@linux.com> Cc: Glauber Costa <glommer@parallels.com> Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com> Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
parent
5b74beb425
commit
e21827aadd
37
mm/util.c
37
mm/util.c
|
@ -105,24 +105,12 @@ void *memdup_user(const void __user *src, size_t len)
|
|||
}
|
||||
EXPORT_SYMBOL(memdup_user);
|
||||
|
||||
/**
|
||||
* __krealloc - like krealloc() but don't free @p.
|
||||
* @p: object to reallocate memory for.
|
||||
* @new_size: how many bytes of memory are required.
|
||||
* @flags: the type of memory to allocate.
|
||||
*
|
||||
* This function is like krealloc() except it never frees the originally
|
||||
* allocated buffer. Use this if you don't want to free the buffer immediately
|
||||
* like, for example, with RCU.
|
||||
*/
|
||||
void *__krealloc(const void *p, size_t new_size, gfp_t flags)
|
||||
static __always_inline void *__do_krealloc(const void *p, size_t new_size,
|
||||
gfp_t flags)
|
||||
{
|
||||
void *ret;
|
||||
size_t ks = 0;
|
||||
|
||||
if (unlikely(!new_size))
|
||||
return ZERO_SIZE_PTR;
|
||||
|
||||
if (p)
|
||||
ks = ksize(p);
|
||||
|
||||
|
@ -135,6 +123,25 @@ void *__krealloc(const void *p, size_t new_size, gfp_t flags)
|
|||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* __krealloc - like krealloc() but don't free @p.
|
||||
* @p: object to reallocate memory for.
|
||||
* @new_size: how many bytes of memory are required.
|
||||
* @flags: the type of memory to allocate.
|
||||
*
|
||||
* This function is like krealloc() except it never frees the originally
|
||||
* allocated buffer. Use this if you don't want to free the buffer immediately
|
||||
* like, for example, with RCU.
|
||||
*/
|
||||
void *__krealloc(const void *p, size_t new_size, gfp_t flags)
|
||||
{
|
||||
if (unlikely(!new_size))
|
||||
return ZERO_SIZE_PTR;
|
||||
|
||||
return __do_krealloc(p, new_size, flags);
|
||||
|
||||
}
|
||||
EXPORT_SYMBOL(__krealloc);
|
||||
|
||||
/**
|
||||
|
@ -157,7 +164,7 @@ void *krealloc(const void *p, size_t new_size, gfp_t flags)
|
|||
return ZERO_SIZE_PTR;
|
||||
}
|
||||
|
||||
ret = __krealloc(p, new_size, flags);
|
||||
ret = __do_krealloc(p, new_size, flags);
|
||||
if (ret && p != ret)
|
||||
kfree(p);
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user