2e33af0295
Move the defined fields from the event to the class structure.
Since the fields of the event are defined by the class they belong
to, it makes sense to have the class hold the information instead
of the individual events. The events of the same class would just
hold duplicate information.
After this change the size of the kernel dropped another 3K:
text data bss dec hex filename
4913961 1088356 861512 6863829 68bbd5 vmlinux.orig
4900252 1057412 861512 6819176 680d68 vmlinux.regs
4900375 1053380 861512 6815267 67fe23 vmlinux.fields
Although the text increased, this was mainly due to the C files
having to adapt to the change. This is a constant increase, where
new tracepoints will not increase the Text. But the big drop is
in the data size (as well as needed allocations to hold the fields).
This will give even more savings as more tracepoints are created.
Note, if just TRACE_EVENT()s are used and not DECLARE_EVENT_CLASS()
with several DEFINE_EVENT()s, then the savings will be lost. But
we are pushing developers to consolidate events with DEFINE_EVENT()
so this should not be an issue.
The kprobes define a unique class to every new event, but are dynamic
so it should not be a issue.
The syscalls however have a single class but the fields for the individual
events are different. The syscalls use a metadata to define the
fields. I moved the fields list from the event to the metadata and
added a "get_fields()" function to the class. This function is used
to find the fields. For normal events and kprobes, get_fields() just
returns a pointer to the fields list_head in the class. For syscall
events, it returns the fields list_head in the metadata for the event.
v2: Fixed the syscall fields. The syscall metadata needs a list
of fields for both enter and exit.
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
174 lines
4.3 KiB
C
174 lines
4.3 KiB
C
/*
|
|
* trace_export.c - export basic ftrace utilities to user space
|
|
*
|
|
* Copyright (C) 2009 Steven Rostedt <srostedt@redhat.com>
|
|
*/
|
|
#include <linux/stringify.h>
|
|
#include <linux/kallsyms.h>
|
|
#include <linux/seq_file.h>
|
|
#include <linux/debugfs.h>
|
|
#include <linux/uaccess.h>
|
|
#include <linux/ftrace.h>
|
|
#include <linux/module.h>
|
|
#include <linux/init.h>
|
|
#include <linux/fs.h>
|
|
|
|
#include "trace_output.h"
|
|
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM ftrace
|
|
|
|
/* not needed for this file */
|
|
#undef __field_struct
|
|
#define __field_struct(type, item)
|
|
|
|
#undef __field
|
|
#define __field(type, item) type item;
|
|
|
|
#undef __field_desc
|
|
#define __field_desc(type, container, item) type item;
|
|
|
|
#undef __array
|
|
#define __array(type, item, size) type item[size];
|
|
|
|
#undef __array_desc
|
|
#define __array_desc(type, container, item, size) type item[size];
|
|
|
|
#undef __dynamic_array
|
|
#define __dynamic_array(type, item) type item[];
|
|
|
|
#undef F_STRUCT
|
|
#define F_STRUCT(args...) args
|
|
|
|
#undef F_printk
|
|
#define F_printk(fmt, args...) fmt, args
|
|
|
|
#undef FTRACE_ENTRY
|
|
#define FTRACE_ENTRY(name, struct_name, id, tstruct, print) \
|
|
struct ____ftrace_##name { \
|
|
tstruct \
|
|
}; \
|
|
static void __always_unused ____ftrace_check_##name(void) \
|
|
{ \
|
|
struct ____ftrace_##name *__entry = NULL; \
|
|
\
|
|
/* force compile-time check on F_printk() */ \
|
|
printk(print); \
|
|
}
|
|
|
|
#undef FTRACE_ENTRY_DUP
|
|
#define FTRACE_ENTRY_DUP(name, struct_name, id, tstruct, print) \
|
|
FTRACE_ENTRY(name, struct_name, id, PARAMS(tstruct), PARAMS(print))
|
|
|
|
#include "trace_entries.h"
|
|
|
|
#undef __field
|
|
#define __field(type, item) \
|
|
ret = trace_define_field(event_call, #type, #item, \
|
|
offsetof(typeof(field), item), \
|
|
sizeof(field.item), \
|
|
is_signed_type(type), FILTER_OTHER); \
|
|
if (ret) \
|
|
return ret;
|
|
|
|
#undef __field_desc
|
|
#define __field_desc(type, container, item) \
|
|
ret = trace_define_field(event_call, #type, #item, \
|
|
offsetof(typeof(field), \
|
|
container.item), \
|
|
sizeof(field.container.item), \
|
|
is_signed_type(type), FILTER_OTHER); \
|
|
if (ret) \
|
|
return ret;
|
|
|
|
#undef __array
|
|
#define __array(type, item, len) \
|
|
BUILD_BUG_ON(len > MAX_FILTER_STR_VAL); \
|
|
ret = trace_define_field(event_call, #type "[" #len "]", #item, \
|
|
offsetof(typeof(field), item), \
|
|
sizeof(field.item), \
|
|
is_signed_type(type), FILTER_OTHER); \
|
|
if (ret) \
|
|
return ret;
|
|
|
|
#undef __array_desc
|
|
#define __array_desc(type, container, item, len) \
|
|
BUILD_BUG_ON(len > MAX_FILTER_STR_VAL); \
|
|
ret = trace_define_field(event_call, #type "[" #len "]", #item, \
|
|
offsetof(typeof(field), \
|
|
container.item), \
|
|
sizeof(field.container.item), \
|
|
is_signed_type(type), FILTER_OTHER); \
|
|
if (ret) \
|
|
return ret;
|
|
|
|
#undef __dynamic_array
|
|
#define __dynamic_array(type, item) \
|
|
ret = trace_define_field(event_call, #type, #item, \
|
|
offsetof(typeof(field), item), \
|
|
0, is_signed_type(type), FILTER_OTHER);\
|
|
if (ret) \
|
|
return ret;
|
|
|
|
#undef FTRACE_ENTRY
|
|
#define FTRACE_ENTRY(name, struct_name, id, tstruct, print) \
|
|
int \
|
|
ftrace_define_fields_##name(struct ftrace_event_call *event_call) \
|
|
{ \
|
|
struct struct_name field; \
|
|
int ret; \
|
|
\
|
|
tstruct; \
|
|
\
|
|
return ret; \
|
|
}
|
|
|
|
#include "trace_entries.h"
|
|
|
|
static int ftrace_raw_init_event(struct ftrace_event_call *call)
|
|
{
|
|
INIT_LIST_HEAD(&call->class->fields);
|
|
return 0;
|
|
}
|
|
|
|
#undef __entry
|
|
#define __entry REC
|
|
|
|
#undef __field
|
|
#define __field(type, item)
|
|
|
|
#undef __field_desc
|
|
#define __field_desc(type, container, item)
|
|
|
|
#undef __array
|
|
#define __array(type, item, len)
|
|
|
|
#undef __array_desc
|
|
#define __array_desc(type, container, item, len)
|
|
|
|
#undef __dynamic_array
|
|
#define __dynamic_array(type, item)
|
|
|
|
#undef F_printk
|
|
#define F_printk(fmt, args...) #fmt ", " __stringify(args)
|
|
|
|
#undef FTRACE_ENTRY
|
|
#define FTRACE_ENTRY(call, struct_name, type, tstruct, print) \
|
|
\
|
|
struct ftrace_event_class event_class_ftrace_##call = { \
|
|
.system = __stringify(TRACE_SYSTEM), \
|
|
.define_fields = ftrace_define_fields_##call, \
|
|
}; \
|
|
\
|
|
struct ftrace_event_call __used \
|
|
__attribute__((__aligned__(4))) \
|
|
__attribute__((section("_ftrace_events"))) event_##call = { \
|
|
.name = #call, \
|
|
.id = type, \
|
|
.class = &event_class_ftrace_##call, \
|
|
.raw_init = ftrace_raw_init_event, \
|
|
.print_fmt = print, \
|
|
}; \
|
|
|
|
#include "trace_entries.h"
|