lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: Temporarily backout SKB sources tracer.

Browse Source 
Steven Rostedt has suggested that Neil work with the tracing
folks, trying to use TRACE_EVENT as the mechanism for
implementation.  And if that doesn't workout we can investigate
other solutions such as that one which was tried here.

This reverts the following 2 commits:

5a165657be
("net: skb ftracer - Add config option to enable new ftracer (v3)")

9ec04da748
("net: skb ftracer - Add actual ftrace code to kernel (v3)")

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2009-08-26 16:32:37 -07:00
parent f656f39801
commit 31ffe249e5
4 changed files with 0 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
kernel/trace/trace.h
View File

@@ -11,7 +11,6 @@
#include <trace/boot.h>
#include <linux/kmemtrace.h>
#include <trace/power.h>
#include <trace/events/skb.h>
#include <linux/trace_seq.h>
#include <linux/ftrace_event.h>
@@ -41,7 +40,6 @@ enum trace_type {
TRACE_KMEM_FREE,
TRACE_POWER,
TRACE_BLK,
TRACE_SKB_SOURCE,
__TRACE_LAST_TYPE,
};
@@ -173,21 +171,6 @@ struct trace_power {
struct power_trace state_data;
};
struct skb_record {
pid_t pid; /* pid of the copying process */
int anid; /* node where skb was allocated */
int cnid; /* node to which skb was copied in userspace */
char ifname[IFNAMSIZ]; /* Name of the receiving interface */
int rx_queue; /* The rx queue the skb was received on */
int ccpu; /* Cpu the application got this frame from */
int len; /* length of the data copied */
};
struct trace_skb_event {
struct trace_entry ent;
struct skb_record event_data;
};
enum kmemtrace_type_id {
KMEMTRACE_TYPE_KMALLOC = 0, /* kmalloc() or kfree(). */
KMEMTRACE_TYPE_CACHE, /* kmem_cache_*(). */
@@ -340,8 +323,6 @@ extern void __ftrace_bad_type(void);
TRACE_SYSCALL_ENTER); \
IF_ASSIGN(var, ent, struct syscall_trace_exit, \
TRACE_SYSCALL_EXIT); \
IF_ASSIGN(var, ent, struct trace_skb_event, \
TRACE_SKB_SOURCE); \
__ftrace_bad_type(); \
} while (0)