tracing: Remove kmemtrace ftrace plugin

PATCH In review Li Zefan 5 participants 13 messages May 26, 2010

Subsystems (4)

Memory management Documentation Tracing Slab allocator

lore

Share & tools

lore

Li Zefan

author

2010-05-26 09:19 UTC #0 lore raw

PATCH 1/1 tracing: Remove kmemtrace ftrace plugin

We have been resisting new ftrace plugins and removing existing ones, and kmemtrace has been superseded by kmem trace events and perf-kmem, so we remove it.

Signed-off-by Li Zefan <[email protected]>

Acked-by Pekka Enberg <[email protected]>

---
 Documentation/ABI/testing/debugfs-kmemtrace |   71 ----
 Documentation/trace/kmemtrace.txt           |  126 -------
 MAINTAINERS                                 |    7 -
 include/linux/kmemtrace.h                   |   25 --
 include/linux/slab_def.h                    |    3 +-
 include/linux/slub_def.h                    |    3 +-
 init/main.c                                 |    2 -
 kernel/trace/Kconfig                        |   20 -
 kernel/trace/kmemtrace.c                    |  529 ---------------------------
 kernel/trace/trace.h                        |   13 -
 kernel/trace/trace_entries.h                |   35 --
 mm/slab.c                                   |    1 -
 mm/slub.c                                   |    1 -
 13 files changed, 4 insertions(+), 832 deletions(-)
 delete mode 100644 Documentation/ABI/testing/debugfs-kmemtrace
 delete mode 100644 Documentation/trace/kmemtrace.txt
 delete mode 100644 include/linux/kmemtrace.h
 delete mode 100644 kernel/trace/kmemtrace.c

Documentation/ABI/testing/debugfs-kmemtrace deleted +0 ~~-71~~

deleted file mode 100644
index 5e6a92a..0000000
@@ -1,71 +0,0 @@
-What:		/sys/kernel/debug/kmemtrace/
-Date:		July 2008
-Contact:	Eduard - Gabriel Munteanu <[email protected]>
-Description:
-
-In kmemtrace-enabled kernels, the following files are created:
-
-/sys/kernel/debug/kmemtrace/
-	cpu<n>		(0400)	Per-CPU tracing data, see below. (binary)
-	total_overruns	(0400)	Total number of bytes which were dropped from
-				cpu<n> files because of full buffer condition,
-				non-binary. (text)
-	abi_version	(0400)	Kernel's kmemtrace ABI version. (text)
-
-Each per-CPU file should be read according to the relay interface. That is,
-the reader should set affinity to that specific CPU and, as currently done by
-the userspace application (though there are other methods), use poll() with
-an infinite timeout before every read(). Otherwise, erroneous data may be
-read. The binary data has the following _core_ format:
-
-	Event ID	(1 byte)	Unsigned integer, one of:
-		0 - represents an allocation (KMEMTRACE_EVENT_ALLOC)
-		1 - represents a freeing of previously allocated memory
-		    (KMEMTRACE_EVENT_FREE)
-	Type ID		(1 byte)	Unsigned integer, one of:
-		0 - this is a kmalloc() / kfree()
-		1 - this is a kmem_cache_alloc() / kmem_cache_free()
-		2 - this is a __get_free_pages() et al.
-	Event size	(2 bytes)	Unsigned integer representing the
-					size of this event. Used to extend
-					kmemtrace. Discard the bytes you
-					don't know about.
-	Sequence number	(4 bytes)	Signed integer used to reorder data
-					logged on SMP machines. Wraparound
-					must be taken into account, although
-					it is unlikely.
-	Caller address	(8 bytes)	Return address to the caller.
-	Pointer to mem	(8 bytes)	Pointer to target memory area. Can be
-					NULL, but not all such calls might be
-					recorded.
-
-In case of KMEMTRACE_EVENT_ALLOC events, the next fields follow:
-
-	Requested bytes	(8 bytes)	Total number of requested bytes,
-					unsigned, must not be zero.
-	Allocated bytes (8 bytes)	Total number of actually allocated
-					bytes, unsigned, must not be lower
-					than requested bytes.
-	Requested flags	(4 bytes)	GFP flags supplied by the caller.
-	Target CPU	(4 bytes)	Signed integer, valid for event id 1.
-					If equal to -1, target CPU is the same
-					as origin CPU, but the reverse might
-					not be true.
-
-The data is made available in the same endianness the machine has.
-
-Other event ids and type ids may be defined and added. Other fields may be
-added by increasing event size, but see below for details.
-Every modification to the ABI, including new id definitions, are followed
-by bumping the ABI version by one.
-
-Adding new data to the packet (features) is done at the end of the mandatory
-data:
-	Feature size	(2 byte)
-	Feature ID	(1 byte)
-	Feature data	(Feature size - 3 bytes)
-
-
-Users:
-	kmemtrace-user - git://repo.or.cz/kmemtrace-user.git
-

Documentation/trace/kmemtrace.txt deleted +0 ~~-126~~

126 lines not on this page · raw message

MAINTAINERS +0 -7

index a8fe9b4..5be9ccf 100644
@@ -3349,13 +3349,6 @@ F:	include/linux/kmemleak.h
 F:	mm/kmemleak.c
 F:	mm/kmemleak-test.c
 
-KMEMTRACE
-M:	Eduard - Gabriel Munteanu <[email protected]>
-S:	Maintained
-F:	Documentation/trace/kmemtrace.txt
-F:	include/linux/kmemtrace.h
-F:	kernel/trace/kmemtrace.c
-
 KPROBES
 M:	Ananth N Mavinakayanahalli <[email protected]>
 M:	Anil S Keshavamurthy <[email protected]>

include/linux/kmemtrace.h deleted +0 ~~-25~~

deleted file mode 100644
index b616d39..0000000
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008 Eduard - Gabriel Munteanu
- *
- * This file is released under GPL version 2.
- */
-
-#ifndef _LINUX_KMEMTRACE_H
-#define _LINUX_KMEMTRACE_H
-
-#ifdef __KERNEL__
-
-#include <trace/events/kmem.h>
-
-#ifdef CONFIG_KMEMTRACE
-extern void kmemtrace_init(void);
-#else
-static inline void kmemtrace_init(void)
-{
-}
-#endif
-
-#endif /* __KERNEL__ */
-
-#endif /* _LINUX_KMEMTRACE_H */
-

include/linux/slab_def.h +2 -1

index 1812dac..1acfa73 100644
@@ -14,7 +14,8 @@
 #include <asm/page.h>		/* kmalloc_sizes.h needs PAGE_SIZE */
 #include <asm/cache.h>		/* kmalloc_sizes.h needs L1_CACHE_BYTES */
 #include <linux/compiler.h>
-#include <linux/kmemtrace.h>
+
+#include <trace/events/kmem.h>
 
 #ifndef ARCH_KMALLOC_MINALIGN
 /*

include/linux/slub_def.h +2 -1

index 55695c8..2345d3a 100644
@@ -10,9 +10,10 @@
 #include <linux/gfp.h>
 #include <linux/workqueue.h>
 #include <linux/kobject.h>
-#include <linux/kmemtrace.h>
 #include <linux/kmemleak.h>
 
+#include <trace/events/kmem.h>
+
 enum stat_item {
 	ALLOC_FASTPATH,		/* Allocation from cpu slab */
 	ALLOC_SLOWPATH,		/* Allocation by getting a new cpu slab */

init/main.c +0 -2

index 3bdb152..1ec21e9 100644
@@ -66,7 +66,6 @@
 #include <linux/ftrace.h>
 #include <linux/async.h>
 #include <linux/kmemcheck.h>
-#include <linux/kmemtrace.h>
 #include <linux/sfi.h>
 #include <linux/shmem_fs.h>
 #include <linux/slab.h>

@@ -653,7 +652,6 @@ asmlinkage void __init start_kernel(void)
 #endif
 	page_cgroup_init();
 	enable_debug_pagealloc();
-	kmemtrace_init();
 	kmemleak_init();
 	debug_objects_mem_init();
 	idr_init_cache();

kernel/trace/Kconfig +0 ~~-20~~

index 8b1797c..ece5cdb 100644
@@ -371,26 +371,6 @@ config STACK_TRACER
 
 	  Say N if unsure.
 
-config KMEMTRACE
-	bool "Trace SLAB allocations"
-	select GENERIC_TRACER
-	help
-	  kmemtrace provides tracing for slab allocator functions, such as
-	  kmalloc, kfree, kmem_cache_alloc, kmem_cache_free, etc. Collected
-	  data is then fed to the userspace application in order to analyse
-	  allocation hotspots, internal fragmentation and so on, making it
-	  possible to see how well an allocator performs, as well as debug
-	  and profile kernel code.
-
-	  This requires an userspace application to use. See
-	  Documentation/trace/kmemtrace.txt for more information.
-
-	  Saying Y will make the kernel somewhat larger and slower. However,
-	  if you disable kmemtrace at run-time or boot-time, the performance
-	  impact is minimal (depending on the arch the kernel is built for).
-
-	  If unsure, say N.
-
 config WORKQUEUE_TRACER
 	bool "Trace workqueues"
 	select GENERIC_TRACER

kernel/trace/kmemtrace.c deleted +0 ~~-529~~

529 lines not on this page · raw message

kernel/trace/trace.h +0 ~~-13~~

index 2cd9639..d402efc 100644
@@ -10,7 +10,6 @@
 #include <linux/tracepoint.h>
 #include <linux/ftrace.h>
 #include <trace/boot.h>
-#include <linux/kmemtrace.h>
 #include <linux/hw_breakpoint.h>
 
 #include <linux/trace_seq.h>

@@ -34,20 +33,12 @@ enum trace_type {
 	TRACE_GRAPH_RET,
 	TRACE_GRAPH_ENT,
 	TRACE_USER_STACK,
-	TRACE_KMEM_ALLOC,
-	TRACE_KMEM_FREE,
 	TRACE_BLK,
 	TRACE_KSYM,
 
 	__TRACE_LAST_TYPE,
 };
 
-enum kmemtrace_type_id {
-	KMEMTRACE_TYPE_KMALLOC = 0,	/* kmalloc() or kfree(). */
-	KMEMTRACE_TYPE_CACHE,		/* kmem_cache_*(). */
-	KMEMTRACE_TYPE_PAGES,		/* __get_free_pages() and friends. */
-};
-
 extern struct tracer boot_tracer;
 
 #undef __field

@@ -216,10 +207,6 @@ extern void __ftrace_bad_type(void);
 			  TRACE_GRAPH_ENT);		\
 		IF_ASSIGN(var, ent, struct ftrace_graph_ret_entry,	\
 			  TRACE_GRAPH_RET);		\
-		IF_ASSIGN(var, ent, struct kmemtrace_alloc_entry,	\
-			  TRACE_KMEM_ALLOC);	\
-		IF_ASSIGN(var, ent, struct kmemtrace_free_entry,	\
-			  TRACE_KMEM_FREE);	\
 		IF_ASSIGN(var, ent, struct ksym_trace_entry, TRACE_KSYM);\
 		__ftrace_bad_type();					\
 	} while (0)

kernel/trace/trace_entries.h +0 ~~-35~~

index dc008c1..08b3a29 100644
@@ -318,41 +318,6 @@ FTRACE_ENTRY(branch, trace_branch,
 		 __entry->func, __entry->file, __entry->correct)
 );
 
-FTRACE_ENTRY(kmem_alloc, kmemtrace_alloc_entry,
-
-	TRACE_KMEM_ALLOC,
-
-	F_STRUCT(
-		__field(	enum kmemtrace_type_id,	type_id		)
-		__field(	unsigned long,		call_site	)
-		__field(	const void *,		ptr		)
-		__field(	size_t,			bytes_req	)
-		__field(	size_t,			bytes_alloc	)
-		__field(	gfp_t,			gfp_flags	)
-		__field(	int,			node		)
-	),
-
-	F_printk("type:%u call_site:%lx ptr:%p req:%zi alloc:%zi"
-		 " flags:%x node:%d",
-		 __entry->type_id, __entry->call_site, __entry->ptr,
-		 __entry->bytes_req, __entry->bytes_alloc,
-		 __entry->gfp_flags, __entry->node)
-);
-
-FTRACE_ENTRY(kmem_free, kmemtrace_free_entry,
-
-	TRACE_KMEM_FREE,
-
-	F_STRUCT(
-		__field(	enum kmemtrace_type_id,	type_id		)
-		__field(	unsigned long,		call_site	)
-		__field(	const void *,		ptr		)
-	),
-
-	F_printk("type:%u call_site:%lx ptr:%p",
-		 __entry->type_id, __entry->call_site, __entry->ptr)
-);
-
 FTRACE_ENTRY(ksym_trace, ksym_trace_entry,
 
 	TRACE_KSYM,

mm/slab.c +0 -1

index 02786e1..2dba2d4 100644
@@ -102,7 +102,6 @@
 #include	<linux/cpu.h>
 #include	<linux/sysctl.h>
 #include	<linux/module.h>
-#include	<linux/kmemtrace.h>
 #include	<linux/rcupdate.h>
 #include	<linux/string.h>
 #include	<linux/uaccess.h>

mm/slub.c +0 -1

index 26f0cb9..a61f1aa 100644
@@ -17,7 +17,6 @@
 #include <linux/slab.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
-#include <linux/kmemtrace.h>
 #include <linux/kmemcheck.h>
 #include <linux/cpu.h>
 #include <linux/cpuset.h>

Signature · 7 lines

1.6.3

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to [email protected].  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>

Frederic Weisbecker

2010-05-26 09:59 UTC #1 lore raw

Quoted 17 lines · Li Zefan

We have been resisting new ftrace plugins and removing existing ones, and kmemtrace has been superseded by kmem trace events and perf-kmem, so we remove it.

Signed-off-by Li Zefan <[email protected]>

Acked-by Pekka Enberg <[email protected]>

---
 Documentation/ABI/testing/debugfs-kmemtrace |   71 ----
 Documentation/trace/kmemtrace.txt           |  126 -------
 MAINTAINERS                                 |    7 -
 include/linux/kmemtrace.h                   |   25 --
 include/linux/slab_def.h                    |    3 +-
 include/linux/slub_def.h                    |    3 +-
 init/main.c                                 |    2 -
 kernel/trace/Kconfig                        |   20 -
 kernel/trace/kmemtrace.c                    |  529 ---------------------------
 kernel/trace/trace.h                        |   13 -

Quoted 8 lines

 kernel/trace/trace_entries.h                |   35 --
 mm/slab.c                                   |    1 -
 mm/slub.c                                   |    1 -
 13 files changed, 4 insertions(+), 832 deletions(-)
 delete mode 100644 Documentation/ABI/testing/debugfs-kmemtrace
 delete mode 100644 Documentation/trace/kmemtrace.txt
 delete mode 100644 include/linux/kmemtrace.h
 delete mode 100644 kernel/trace/kmemtrace.c

Thanks!

Just one thing: you forgot to update the kernel/trace/Makefile

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>

Peter Zijlstra

2010-05-26 13:28 UTC #2 lore raw

Quoted 29 lines · Frederic Weisbecker

Quoted 17 lines · Li Zefan

We have been resisting new ftrace plugins and removing existing ones, and kmemtrace has been superseded by kmem trace events and perf-kmem, so we remove it.

Signed-off-by Li Zefan <[email protected]>

Acked-by Pekka Enberg <[email protected]>

---
 Documentation/ABI/testing/debugfs-kmemtrace |   71 ----
 Documentation/trace/kmemtrace.txt           |  126 -------
 MAINTAINERS                                 |    7 -
 include/linux/kmemtrace.h                   |   25 --
 include/linux/slab_def.h                    |    3 +-
 include/linux/slub_def.h                    |    3 +-
 init/main.c                                 |    2 -
 kernel/trace/Kconfig                        |   20 -
 kernel/trace/kmemtrace.c                    |  529 ---------------------------
 kernel/trace/trace.h                        |   13 -

Quoted 8 lines

 kernel/trace/trace_entries.h                |   35 --
 mm/slab.c                                   |    1 -
 mm/slub.c                                   |    1 -
 13 files changed, 4 insertions(+), 832 deletions(-)
 delete mode 100644 Documentation/ABI/testing/debugfs-kmemtrace
 delete mode 100644 Documentation/trace/kmemtrace.txt
 delete mode 100644 include/linux/kmemtrace.h
 delete mode 100644 kernel/trace/kmemtrace.c

Quoted 3 lines

Thanks!
Just one thing: you forgot to update the kernel/trace/Makefile

You can also axe kernel/tracing/trace_sysprof.c and related bits.

Frederic Weisbecker

2010-05-26 16:00 UTC #3 lore raw

Quoted 30 lines · Peter Zijlstra

Quoted 29 lines · Frederic Weisbecker

Quoted 25 lines · Li Zefan

We have been resisting new ftrace plugins and removing existing ones, and kmemtrace has been superseded by kmem trace events and perf-kmem, so we remove it.

Signed-off-by Li Zefan <[email protected]>

Acked-by Pekka Enberg <[email protected]>

---
 Documentation/ABI/testing/debugfs-kmemtrace |   71 ----
 Documentation/trace/kmemtrace.txt           |  126 -------
 MAINTAINERS                                 |    7 -
 include/linux/kmemtrace.h                   |   25 --
 include/linux/slab_def.h                    |    3 +-
 include/linux/slub_def.h                    |    3 +-
 init/main.c                                 |    2 -
 kernel/trace/Kconfig                        |   20 -
 kernel/trace/kmemtrace.c                    |  529 ---------------------------
 kernel/trace/trace.h                        |   13 -
 kernel/trace/trace_entries.h                |   35 --
 mm/slab.c                                   |    1 -
 mm/slub.c                                   |    1 -
 13 files changed, 4 insertions(+), 832 deletions(-)
 delete mode 100644 Documentation/ABI/testing/debugfs-kmemtrace
 delete mode 100644 Documentation/trace/kmemtrace.txt
 delete mode 100644 include/linux/kmemtrace.h
 delete mode 100644 kernel/trace/kmemtrace.c

Quoted 5 lines

Quoted 3 lines
Thanks!
Just one thing: you forgot to update the kernel/trace/Makefile
You can also axe kernel/tracing/trace_sysprof.c and related bits.

I'll do that too, but I 'll need Soeren's opinion before actually pushing it.

Thanks.

Peter Zijlstra

2010-05-26 16:07 UTC #4 lore raw

Quoted 3 lines · Frederic Weisbecker

Quoted 1 line
You can also axe kernel/tracing/trace_sysprof.c and related bits.
I'll do that too, but I 'll need Soeren's opinion before actually pushing it.

ISTR that the latest sysprof code uses the perf syscall.

Christoph Hellwig

2010-05-26 10:16 UTC #5 lore raw

In reply to Li Zefan

Quoted 3 lines · Li Zefan

We have been resisting new ftrace plugins and removing existing ones, and kmemtrace has been superseded by kmem trace events and perf-kmem, so we remove it.

While you're at it also care to remove the blk ftrace plugin? We have the old blktrace ioctl interface and the trace events as better alternatives.

Frederic Weisbecker

2010-05-26 10:18 UTC #6 lore raw

Quoted 8 lines · Christoph Hellwig

Quoted 3 lines · Li Zefan
We have been resisting new ftrace plugins and removing existing ones, and kmemtrace has been superseded by kmem trace events and perf-kmem, so we remove it.
While you're at it also care to remove the blk ftrace plugin? We have the old blktrace ioctl interface and the trace events as better alternatives.

But does the userspace tool support them?

Christoph Hellwig

2010-05-26 10:24 UTC #7 lore raw

Quoted 1 line · Frederic Weisbecker

But does the userspace tool support them?

The blktrace userspace tool only uses the ioctl/debugfs code.

Frederic Weisbecker

2010-05-26 10:32 UTC #8 lore raw

Quoted 5 lines · Christoph Hellwig

Quoted 1 line · Frederic Weisbecker
But does the userspace tool support them?
The blktrace userspace tool only uses the ioctl/debugfs code.

But which debugfs code? Nothing related to $(DEBUGFS)/tracing right?

Christoph Hellwig

2010-05-26 11:03 UTC #9 lore raw

Quoted 1 line · Frederic Weisbecker

But which debugfs code? Nothing related to $(DEBUGFS)/tracing right?

Exactly. Blktrace creates it's own files under $(DEBUGFS)/block when enabled through the old ioctls.

Frederic Weisbecker

2010-05-26 11:10 UTC #10 lore raw

Quoted 5 lines · Christoph Hellwig

Quoted 1 line · Frederic Weisbecker
But which debugfs code? Nothing related to $(DEBUGFS)/tracing right?
Exactly. Blktrace creates it's own files under $(DEBUGFS)/block when enabled through the old ioctls.

I see. So it has never been updated to support the ftrace plugin. Fine then, lets remove it.

Eduard - Gabriel Munteanu

Acked-by on v1 1/1

2010-05-26 15:39 UTC #11 lore raw

In reply to Li Zefan

Quoted 17 lines · Li Zefan

We have been resisting new ftrace plugins and removing existing ones, and kmemtrace has been superseded by kmem trace events and perf-kmem, so we remove it.

Signed-off-by Li Zefan <[email protected]>

Acked-by Pekka Enberg <[email protected]>

---
 Documentation/ABI/testing/debugfs-kmemtrace |   71 ----
 Documentation/trace/kmemtrace.txt           |  126 -------
 MAINTAINERS                                 |    7 -
 include/linux/kmemtrace.h                   |   25 --
 include/linux/slab_def.h                    |    3 +-
 include/linux/slub_def.h                    |    3 +-
 init/main.c                                 |    2 -
 kernel/trace/Kconfig                        |   20 -
 kernel/trace/kmemtrace.c                    |  529 ---------------------------
 kernel/trace/trace.h                        |   13 -

Quoted 8 lines

 kernel/trace/trace_entries.h                |   35 --
 mm/slab.c                                   |    1 -
 mm/slub.c                                   |    1 -
 13 files changed, 4 insertions(+), 832 deletions(-)
 delete mode 100644 Documentation/ABI/testing/debugfs-kmemtrace
 delete mode 100644 Documentation/trace/kmemtrace.txt
 delete mode 100644 include/linux/kmemtrace.h
 delete mode 100644 kernel/trace/kmemtrace.c

Oh my, this one started quite a massacre judging by other replies! :-)

[snip]

Quoted 30 lines

include/linux/slab_def.h +2 -1

index 1812dac..1acfa73 100644
@@ -14,7 +14,8 @@
 #include <asm/page.h>		/* kmalloc_sizes.h needs PAGE_SIZE */
 #include <asm/cache.h>		/* kmalloc_sizes.h needs L1_CACHE_BYTES */
 #include <linux/compiler.h>
-#include <linux/kmemtrace.h>
+
+#include <trace/events/kmem.h>
 
 #ifndef ARCH_KMALLOC_MINALIGN
 /*

include/linux/slub_def.h +2 -1

index 55695c8..2345d3a 100644
@@ -10,9 +10,10 @@
 #include <linux/gfp.h>
 #include <linux/workqueue.h>
 #include <linux/kobject.h>
-#include <linux/kmemtrace.h>
 #include <linux/kmemleak.h>
 
+#include <trace/events/kmem.h>
+
 enum stat_item {
 	ALLOC_FASTPATH,		/* Allocation from cpu slab */
 	ALLOC_SLOWPATH,		/* Allocation by getting a new cpu slab */

[snip]

Quoted 17 lines

mm/slab.c +0 -1

index 02786e1..2dba2d4 100644
@@ -102,7 +102,6 @@
 #include	<linux/cpu.h>
 #include	<linux/sysctl.h>
 #include	<linux/module.h>
-#include	<linux/kmemtrace.h>
 #include	<linux/rcupdate.h>
 #include	<linux/string.h>
 #include	<linux/uaccess.h>

mm/slub.c +0 -0

index 26f0cb9..a61f1aa 100644

mm/slub.c line 22

Quoted 7 lines

mm/slub.c +0 -1

@@ -17,7 +17,6 @@
 #include <linux/slab.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
-#include <linux/kmemtrace.h>
 #include <linux/kmemcheck.h>
 #include <linux/cpu.h>
 #include <linux/cpuset.h>

I'd suggest including 'trace/events/kmem.h' here as well. Though it most likely gets the trace_kmem_* stuff through 'linux/slab.h'.

Here's my ack if you need it:

Acked-by Eduard - Gabriel Munteanu <[email protected]>

Eduard

Frederic Weisbecker

2010-05-26 15:54 UTC #12 lore raw

Quoted 92 lines · Eduard - Gabriel Munteanu

Quoted 17 lines · Li Zefan

We have been resisting new ftrace plugins and removing existing ones, and kmemtrace has been superseded by kmem trace events and perf-kmem, so we remove it.

Signed-off-by Li Zefan <[email protected]>

Acked-by Pekka Enberg <[email protected]>

---
 Documentation/ABI/testing/debugfs-kmemtrace |   71 ----
 Documentation/trace/kmemtrace.txt           |  126 -------
 MAINTAINERS                                 |    7 -
 include/linux/kmemtrace.h                   |   25 --
 include/linux/slab_def.h                    |    3 +-
 include/linux/slub_def.h                    |    3 +-
 init/main.c                                 |    2 -
 kernel/trace/Kconfig                        |   20 -
 kernel/trace/kmemtrace.c                    |  529 ---------------------------
 kernel/trace/trace.h                        |   13 -

Quoted 8 lines

 kernel/trace/trace_entries.h                |   35 --
 mm/slab.c                                   |    1 -
 mm/slub.c                                   |    1 -
 13 files changed, 4 insertions(+), 832 deletions(-)
 delete mode 100644 Documentation/ABI/testing/debugfs-kmemtrace
 delete mode 100644 Documentation/trace/kmemtrace.txt
 delete mode 100644 include/linux/kmemtrace.h
 delete mode 100644 kernel/trace/kmemtrace.c

Oh my, this one started quite a massacre judging by other replies! :-)

[snip]

Quoted 30 lines

include/linux/slab_def.h +2 -1

index 1812dac..1acfa73 100644
@@ -14,7 +14,8 @@
 #include <asm/page.h>		/* kmalloc_sizes.h needs PAGE_SIZE */
 #include <asm/cache.h>		/* kmalloc_sizes.h needs L1_CACHE_BYTES */
 #include <linux/compiler.h>
-#include <linux/kmemtrace.h>
+
+#include <trace/events/kmem.h>
 
 #ifndef ARCH_KMALLOC_MINALIGN
 /*

include/linux/slub_def.h +2 -1

index 55695c8..2345d3a 100644
@@ -10,9 +10,10 @@
 #include <linux/gfp.h>
 #include <linux/workqueue.h>
 #include <linux/kobject.h>
-#include <linux/kmemtrace.h>
 #include <linux/kmemleak.h>
 
+#include <trace/events/kmem.h>
+
 enum stat_item {
 	ALLOC_FASTPATH,		/* Allocation from cpu slab */
 	ALLOC_SLOWPATH,		/* Allocation by getting a new cpu slab */

[snip]

Quoted 17 lines

mm/slab.c +0 -1

index 02786e1..2dba2d4 100644
@@ -102,7 +102,6 @@
 #include	<linux/cpu.h>
 #include	<linux/sysctl.h>
 #include	<linux/module.h>
-#include	<linux/kmemtrace.h>
 #include	<linux/rcupdate.h>
 #include	<linux/string.h>
 #include	<linux/uaccess.h>

mm/slub.c +0 -0

index 26f0cb9..a61f1aa 100644

mm/slub.c line 22

Quoted 7 lines

mm/slub.c +0 -1

@@ -17,7 +17,6 @@
 #include <linux/slab.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
-#include <linux/kmemtrace.h>
 #include <linux/kmemcheck.h>
 #include <linux/cpu.h>
 #include <linux/cpuset.h>

I'd suggest including 'trace/events/kmem.h' here as well. Though it most likely gets the trace_kmem_* stuff through 'linux/slab.h'.

Quoted 3 lines

Here's my ack if you need it:
Acked-by Eduard - Gabriel Munteanu <[email protected]>

Thanks, I'm queuing this patch, will add the forgotten Makefile change as well.