diff options
| author | Pekka Enberg <penberg@kernel.org> | 2011-01-09 11:05:53 +0200 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-01-09 11:05:53 +0200 |
| commit | a45b0616e7ee9db4c1b2b9a4a79a974325fa9bf3 (patch) | |
| tree | 661b2cc7b0117fc1bbec27fc196c059002b4698b /mm/slub.c | |
| parent | 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5 (diff) | |
| parent | 8165984acf825917437debae519209073c32a5a7 (diff) | |
| download | linux-a45b0616e7ee9db4c1b2b9a4a79a974325fa9bf3.tar.gz linux-a45b0616e7ee9db4c1b2b9a4a79a974325fa9bf3.tar.bz2 linux-a45b0616e7ee9db4c1b2b9a4a79a974325fa9bf3.zip | |
Merge branch 'slab/next' into for-linus
Diffstat (limited to 'mm/slub.c')
| -rw-r--r-- | mm/slub.c | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/mm/slub.c b/mm/slub.c index bec0e355fbad..48d82a55f4b6 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -28,6 +28,8 @@ #include <linux/math64.h> #include <linux/fault-inject.h> +#include <trace/events/kmem.h> + /* * Lock order: * 1. slab_lock(page) @@ -1774,11 +1776,21 @@ void *kmem_cache_alloc(struct kmem_cache *s, gfp_t gfpflags) EXPORT_SYMBOL(kmem_cache_alloc); #ifdef CONFIG_TRACING -void *kmem_cache_alloc_notrace(struct kmem_cache *s, gfp_t gfpflags) +void *kmem_cache_alloc_trace(struct kmem_cache *s, gfp_t gfpflags, size_t size) +{ + void *ret = slab_alloc(s, gfpflags, NUMA_NO_NODE, _RET_IP_); + trace_kmalloc(_RET_IP_, ret, size, s->size, gfpflags); + return ret; +} +EXPORT_SYMBOL(kmem_cache_alloc_trace); + +void *kmalloc_order_trace(size_t size, gfp_t flags, unsigned int order) { - return slab_alloc(s, gfpflags, NUMA_NO_NODE, _RET_IP_); + void *ret = kmalloc_order(size, flags, order); + trace_kmalloc(_RET_IP_, ret, size, PAGE_SIZE << order, flags); + return ret; } -EXPORT_SYMBOL(kmem_cache_alloc_notrace); +EXPORT_SYMBOL(kmalloc_order_trace); #endif #ifdef CONFIG_NUMA @@ -1794,13 +1806,17 @@ void *kmem_cache_alloc_node(struct kmem_cache *s, gfp_t gfpflags, int node) EXPORT_SYMBOL(kmem_cache_alloc_node); #ifdef CONFIG_TRACING -void *kmem_cache_alloc_node_notrace(struct kmem_cache *s, +void *kmem_cache_alloc_node_trace(struct kmem_cache *s, gfp_t gfpflags, - int node) + int node, size_t size) { - return slab_alloc(s, gfpflags, node, _RET_IP_); + void *ret = slab_alloc(s, gfpflags, node, _RET_IP_); + + trace_kmalloc_node(_RET_IP_, ret, + size, s->size, gfpflags, node); + return ret; } -EXPORT_SYMBOL(kmem_cache_alloc_node_notrace); +EXPORT_SYMBOL(kmem_cache_alloc_node_trace); #endif #endif |