Skip to content

Commit 11e9734

Browse files
hygonitehcaster
hygoni
authored and
tehcaster
committed
mm/slab_common: unify NUMA and UMA version of tracepoints
Drop kmem_alloc event class, rename kmem_alloc_node to kmem_alloc, and remove _node postfix for NUMA version of tracepoints. This will break some tools that depend on {kmem_cache_alloc,kmalloc}_node, but at this point maintaining both kmem_alloc and kmem_alloc_node event classes does not makes sense at all. Signed-off-by: Hyeonggon Yoo <[email protected]> Reviewed-by: Vlastimil Babka <[email protected]> Signed-off-by: Vlastimil Babka <[email protected]>
1 parent 26a4099 commit 11e9734

File tree

5 files changed

+27
-89
lines changed

5 files changed

+27
-89
lines changed

‎include/trace/events/kmem.h

Lines changed: 2 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -11,62 +11,6 @@
1111

1212
DECLARE_EVENT_CLASS(kmem_alloc,
1313

14-
TP_PROTO(unsigned long call_site,
15-
const void *ptr,
16-
struct kmem_cache *s,
17-
size_t bytes_req,
18-
size_t bytes_alloc,
19-
gfp_t gfp_flags),
20-
21-
TP_ARGS(call_site, ptr, s, bytes_req, bytes_alloc, gfp_flags),
22-
23-
TP_STRUCT__entry(
24-
__field( unsigned long, call_site )
25-
__field( const void *, ptr )
26-
__field( size_t, bytes_req )
27-
__field( size_t, bytes_alloc )
28-
__field( unsigned long, gfp_flags )
29-
__field( bool, accounted )
30-
),
31-
32-
TP_fast_assign(
33-
__entry->call_site = call_site;
34-
__entry->ptr = ptr;
35-
__entry->bytes_req = bytes_req;
36-
__entry->bytes_alloc = bytes_alloc;
37-
__entry->gfp_flags = (__force unsigned long)gfp_flags;
38-
__entry->accounted = IS_ENABLED(CONFIG_MEMCG_KMEM) ?
39-
((gfp_flags & __GFP_ACCOUNT) ||
40-
(s && s->flags & SLAB_ACCOUNT)) : false;
41-
),
42-
43-
TP_printk("call_site=%pS ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%s accounted=%s",
44-
(void *)__entry->call_site,
45-
__entry->ptr,
46-
__entry->bytes_req,
47-
__entry->bytes_alloc,
48-
show_gfp_flags(__entry->gfp_flags),
49-
__entry->accounted ? "true" : "false")
50-
);
51-
52-
DEFINE_EVENT(kmem_alloc, kmalloc,
53-
54-
TP_PROTO(unsigned long call_site, const void *ptr, struct kmem_cache *s,
55-
size_t bytes_req, size_t bytes_alloc, gfp_t gfp_flags),
56-
57-
TP_ARGS(call_site, ptr, s, bytes_req, bytes_alloc, gfp_flags)
58-
);
59-
60-
DEFINE_EVENT(kmem_alloc, kmem_cache_alloc,
61-
62-
TP_PROTO(unsigned long call_site, const void *ptr, struct kmem_cache *s,
63-
size_t bytes_req, size_t bytes_alloc, gfp_t gfp_flags),
64-
65-
TP_ARGS(call_site, ptr, s, bytes_req, bytes_alloc, gfp_flags)
66-
);
67-
68-
DECLARE_EVENT_CLASS(kmem_alloc_node,
69-
7014
TP_PROTO(unsigned long call_site,
7115
const void *ptr,
7216
struct kmem_cache *s,
@@ -109,7 +53,7 @@ DECLARE_EVENT_CLASS(kmem_alloc_node,
10953
__entry->accounted ? "true" : "false")
11054
);
11155

112-
DEFINE_EVENT(kmem_alloc_node, kmalloc_node,
56+
DEFINE_EVENT(kmem_alloc, kmalloc,
11357

11458
TP_PROTO(unsigned long call_site, const void *ptr,
11559
struct kmem_cache *s, size_t bytes_req, size_t bytes_alloc,
@@ -118,7 +62,7 @@ DEFINE_EVENT(kmem_alloc_node, kmalloc_node,
11862
TP_ARGS(call_site, ptr, s, bytes_req, bytes_alloc, gfp_flags, node)
11963
);
12064

121-
DEFINE_EVENT(kmem_alloc_node, kmem_cache_alloc_node,
65+
DEFINE_EVENT(kmem_alloc, kmem_cache_alloc,
12266

12367
TP_PROTO(unsigned long call_site, const void *ptr,
12468
struct kmem_cache *s, size_t bytes_req, size_t bytes_alloc,

‎mm/slab.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3440,8 +3440,8 @@ void *__kmem_cache_alloc_lru(struct kmem_cache *cachep, struct list_lru *lru,
34403440
{
34413441
void *ret = slab_alloc(cachep, lru, flags, cachep->object_size, _RET_IP_);
34423442

3443-
trace_kmem_cache_alloc(_RET_IP_, ret, cachep,
3444-
cachep->object_size, cachep->size, flags);
3443+
trace_kmem_cache_alloc(_RET_IP_, ret, cachep, cachep->object_size,
3444+
cachep->size, flags, NUMA_NO_NODE);
34453445

34463446
return ret;
34473447
}
@@ -3536,9 +3536,8 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid)
35363536
{
35373537
void *ret = slab_alloc_node(cachep, NULL, flags, nodeid, cachep->object_size, _RET_IP_);
35383538

3539-
trace_kmem_cache_alloc_node(_RET_IP_, ret, cachep,
3540-
cachep->object_size, cachep->size,
3541-
flags, nodeid);
3539+
trace_kmem_cache_alloc(_RET_IP_, ret, cachep, cachep->object_size,
3540+
cachep->size, flags, nodeid);
35423541

35433542
return ret;
35443543
}

‎mm/slab_common.c

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -907,9 +907,8 @@ void *__do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller
907907

908908
if (unlikely(size > KMALLOC_MAX_CACHE_SIZE)) {
909909
ret = __kmalloc_large_node(size, flags, node);
910-
trace_kmalloc_node(caller, ret, NULL,
911-
size, PAGE_SIZE << get_order(size),
912-
flags, node);
910+
trace_kmalloc(_RET_IP_, ret, NULL, size,
911+
PAGE_SIZE << get_order(size), flags, node);
913912
return ret;
914913
}
915914

@@ -920,8 +919,7 @@ void *__do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller
920919

921920
ret = __kmem_cache_alloc_node(s, flags, node, size, caller);
922921
ret = kasan_kmalloc(s, ret, size, flags);
923-
trace_kmalloc_node(caller, ret, s, size,
924-
s->size, flags, node);
922+
trace_kmalloc(_RET_IP_, ret, s, size, s->size, flags, node);
925923
return ret;
926924
}
927925

@@ -1007,8 +1005,7 @@ void *kmalloc_trace(struct kmem_cache *s, gfp_t gfpflags, size_t size)
10071005
void *ret = __kmem_cache_alloc_node(s, gfpflags, NUMA_NO_NODE,
10081006
size, _RET_IP_);
10091007

1010-
trace_kmalloc_node(_RET_IP_, ret, s, size, s->size,
1011-
gfpflags, NUMA_NO_NODE);
1008+
trace_kmalloc(_RET_IP_, ret, s, size, s->size, gfpflags, NUMA_NO_NODE);
10121009

10131010
ret = kasan_kmalloc(s, ret, size, gfpflags);
10141011
return ret;
@@ -1020,7 +1017,7 @@ void *kmalloc_node_trace(struct kmem_cache *s, gfp_t gfpflags,
10201017
{
10211018
void *ret = __kmem_cache_alloc_node(s, gfpflags, node, size, _RET_IP_);
10221019

1023-
trace_kmalloc_node(_RET_IP_, ret, s, size, s->size, gfpflags, node);
1020+
trace_kmalloc(_RET_IP_, ret, s, size, s->size, gfpflags, node);
10241021

10251022
ret = kasan_kmalloc(s, ret, size, gfpflags);
10261023
return ret;
@@ -1076,7 +1073,7 @@ void *kmalloc_large(size_t size, gfp_t flags)
10761073
void *ret = __kmalloc_large_node(size, flags, NUMA_NO_NODE);
10771074

10781075
trace_kmalloc(_RET_IP_, ret, NULL, size,
1079-
PAGE_SIZE << get_order(size), flags);
1076+
PAGE_SIZE << get_order(size), flags, NUMA_NO_NODE);
10801077
return ret;
10811078
}
10821079
EXPORT_SYMBOL(kmalloc_large);
@@ -1085,8 +1082,8 @@ void *kmalloc_large_node(size_t size, gfp_t flags, int node)
10851082
{
10861083
void *ret = __kmalloc_large_node(size, flags, node);
10871084

1088-
trace_kmalloc_node(_RET_IP_, ret, NULL, size,
1089-
PAGE_SIZE << get_order(size), flags, node);
1085+
trace_kmalloc(_RET_IP_, ret, NULL, size,
1086+
PAGE_SIZE << get_order(size), flags, node);
10901087
return ret;
10911088
}
10921089
EXPORT_SYMBOL(kmalloc_large_node);
@@ -1421,8 +1418,6 @@ EXPORT_SYMBOL(ksize);
14211418
/* Tracepoints definitions. */
14221419
EXPORT_TRACEPOINT_SYMBOL(kmalloc);
14231420
EXPORT_TRACEPOINT_SYMBOL(kmem_cache_alloc);
1424-
EXPORT_TRACEPOINT_SYMBOL(kmalloc_node);
1425-
EXPORT_TRACEPOINT_SYMBOL(kmem_cache_alloc_node);
14261421
EXPORT_TRACEPOINT_SYMBOL(kfree);
14271422
EXPORT_TRACEPOINT_SYMBOL(kmem_cache_free);
14281423

‎mm/slob.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -507,17 +507,17 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
507507
*m = size;
508508
ret = (void *)m + minalign;
509509

510-
trace_kmalloc_node(caller, ret, NULL,
511-
size, size + minalign, gfp, node);
510+
trace_kmalloc(caller, ret, NULL, size,
511+
size + minalign, gfp, node);
512512
} else {
513513
unsigned int order = get_order(size);
514514

515515
if (likely(order))
516516
gfp |= __GFP_COMP;
517517
ret = slob_new_pages(gfp, order, node);
518518

519-
trace_kmalloc_node(caller, ret, NULL,
520-
size, PAGE_SIZE << order, gfp, node);
519+
trace_kmalloc(caller, ret, NULL, size,
520+
PAGE_SIZE << order, gfp, node);
521521
}
522522

523523
kmemleak_alloc(ret, size, 1, gfp);
@@ -608,14 +608,14 @@ static void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
608608

609609
if (c->size < PAGE_SIZE) {
610610
b = slob_alloc(c->size, flags, c->align, node, 0);
611-
trace_kmem_cache_alloc_node(_RET_IP_, b, NULL, c->object_size,
612-
SLOB_UNITS(c->size) * SLOB_UNIT,
613-
flags, node);
611+
trace_kmem_cache_alloc(_RET_IP_, b, NULL, c->object_size,
612+
SLOB_UNITS(c->size) * SLOB_UNIT,
613+
flags, node);
614614
} else {
615615
b = slob_new_pages(flags, get_order(c->size), node);
616-
trace_kmem_cache_alloc_node(_RET_IP_, b, NULL, c->object_size,
617-
PAGE_SIZE << get_order(c->size),
618-
flags, node);
616+
trace_kmem_cache_alloc(_RET_IP_, b, NULL, c->object_size,
617+
PAGE_SIZE << get_order(c->size),
618+
flags, node);
619619
}
620620

621621
if (b && c->ctor) {

‎mm/slub.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3244,7 +3244,7 @@ void *__kmem_cache_alloc_lru(struct kmem_cache *s, struct list_lru *lru,
32443244
void *ret = slab_alloc(s, lru, gfpflags, _RET_IP_, s->object_size);
32453245

32463246
trace_kmem_cache_alloc(_RET_IP_, ret, s, s->object_size,
3247-
s->size, gfpflags);
3247+
s->size, gfpflags, NUMA_NO_NODE);
32483248

32493249
return ret;
32503250
}
@@ -3274,8 +3274,8 @@ void *kmem_cache_alloc_node(struct kmem_cache *s, gfp_t gfpflags, int node)
32743274
{
32753275
void *ret = slab_alloc_node(s, NULL, gfpflags, node, _RET_IP_, s->object_size);
32763276

3277-
trace_kmem_cache_alloc_node(_RET_IP_, ret, s,
3278-
s->object_size, s->size, gfpflags, node);
3277+
trace_kmem_cache_alloc(_RET_IP_, ret, s, s->object_size,
3278+
s->size, gfpflags, node);
32793279

32803280
return ret;
32813281
}

0 commit comments

Comments
 (0)