2009-04-08 18:40:59 +00:00
|
|
|
#include <trace/syscall.h>
|
2009-08-24 21:43:14 +00:00
|
|
|
#include <trace/events/syscalls.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 08:04:11 +00:00
|
|
|
#include <linux/slab.h>
|
2009-03-07 04:52:59 +00:00
|
|
|
#include <linux/kernel.h>
|
2009-08-10 20:52:47 +00:00
|
|
|
#include <linux/ftrace.h>
|
perf: Do the big rename: Performance Counters -> Performance Events
Bye-bye Performance Counters, welcome Performance Events!
In the past few months the perfcounters subsystem has grown out its
initial role of counting hardware events, and has become (and is
becoming) a much broader generic event enumeration, reporting, logging,
monitoring, analysis facility.
Naming its core object 'perf_counter' and naming the subsystem
'perfcounters' has become more and more of a misnomer. With pending
code like hw-breakpoints support the 'counter' name is less and
less appropriate.
All in one, we've decided to rename the subsystem to 'performance
events' and to propagate this rename through all fields, variables
and API names. (in an ABI compatible fashion)
The word 'event' is also a bit shorter than 'counter' - which makes
it slightly more convenient to write/handle as well.
Thanks goes to Stephane Eranian who first observed this misnomer and
suggested a rename.
User-space tooling and ABI compatibility is not affected - this patch
should be function-invariant. (Also, defconfigs were not touched to
keep the size down.)
This patch has been generated via the following script:
FILES=$(find * -type f | grep -vE 'oprofile|[^K]config')
sed -i \
-e 's/PERF_EVENT_/PERF_RECORD_/g' \
-e 's/PERF_COUNTER/PERF_EVENT/g' \
-e 's/perf_counter/perf_event/g' \
-e 's/nb_counters/nb_events/g' \
-e 's/swcounter/swevent/g' \
-e 's/tpcounter_event/tp_event/g' \
$FILES
for N in $(find . -name perf_counter.[ch]); do
M=$(echo $N | sed 's/perf_counter/perf_event/g')
mv $N $M
done
FILES=$(find . -name perf_event.*)
sed -i \
-e 's/COUNTER_MASK/REG_MASK/g' \
-e 's/COUNTER/EVENT/g' \
-e 's/\<event\>/event_id/g' \
-e 's/counter/event/g' \
-e 's/Counter/Event/g' \
$FILES
... to keep it as correct as possible. This script can also be
used by anyone who has pending perfcounters patches - it converts
a Linux kernel tree over to the new naming. We tried to time this
change to the point in time where the amount of pending patches
is the smallest: the end of the merge window.
Namespace clashes were fixed up in a preparatory patch - and some
stylistic fallout will be fixed up in a subsequent patch.
( NOTE: 'counters' are still the proper terminology when we deal
with hardware registers - and these sed scripts are a bit
over-eager in renaming them. I've undone some of that, but
in case there's something left where 'counter' would be
better than 'event' we can undo that on an individual basis
instead of touching an otherwise nicely automated patch. )
Suggested-by: Stephane Eranian <eranian@google.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Paul Mackerras <paulus@samba.org>
Reviewed-by: Arjan van de Ven <arjan@linux.intel.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: <linux-arch@vger.kernel.org>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-09-21 10:02:48 +00:00
|
|
|
#include <linux/perf_event.h>
|
2009-03-07 04:52:59 +00:00
|
|
|
#include <asm/syscall.h>
|
|
|
|
|
|
|
|
|
|
#include "trace_output.h"
|
|
|
|
|
#include "trace.h"
|
|
|
|
|
|
2009-03-15 21:10:37 +00:00
|
|
|
static DEFINE_MUTEX(syscall_trace_lock);
|
2009-08-10 20:52:47 +00:00
|
|
|
static int sys_refcount_enter;
|
|
|
|
|
static int sys_refcount_exit;
|
2009-08-24 21:40:22 +00:00
|
|
|
static DECLARE_BITMAP(enabled_enter_syscalls, NR_syscalls);
|
|
|
|
|
static DECLARE_BITMAP(enabled_exit_syscalls, NR_syscalls);
|
2009-03-07 04:52:59 +00:00
|
|
|
|
2010-04-21 16:27:06 +00:00
|
|
|
static int syscall_enter_register(struct ftrace_event_call *event,
|
|
|
|
|
enum trace_reg type);
|
|
|
|
|
static int syscall_exit_register(struct ftrace_event_call *event,
|
|
|
|
|
enum trace_reg type);
|
|
|
|
|
|
2010-04-22 14:35:55 +00:00
|
|
|
static int syscall_enter_define_fields(struct ftrace_event_call *call);
|
|
|
|
|
static int syscall_exit_define_fields(struct ftrace_event_call *call);
|
|
|
|
|
|
|
|
|
|
static struct list_head *
|
|
|
|
|
syscall_get_enter_fields(struct ftrace_event_call *call)
|
|
|
|
|
{
|
|
|
|
|
struct syscall_metadata *entry = call->data;
|
|
|
|
|
|
|
|
|
|
return &entry->enter_fields;
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-23 14:00:22 +00:00
|
|
|
struct trace_event_functions enter_syscall_print_funcs = {
|
2011-01-14 09:49:02 +00:00
|
|
|
.trace = print_syscall_enter,
|
2010-04-23 14:00:22 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct trace_event_functions exit_syscall_print_funcs = {
|
2011-01-14 09:49:02 +00:00
|
|
|
.trace = print_syscall_exit,
|
2010-04-23 14:00:22 +00:00
|
|
|
};
|
|
|
|
|
|
2010-04-21 16:27:06 +00:00
|
|
|
struct ftrace_event_class event_class_syscall_enter = {
|
2011-01-14 09:49:02 +00:00
|
|
|
.system = "syscalls",
|
|
|
|
|
.reg = syscall_enter_register,
|
|
|
|
|
.define_fields = syscall_enter_define_fields,
|
|
|
|
|
.get_fields = syscall_get_enter_fields,
|
|
|
|
|
.raw_init = init_syscall_trace,
|
2010-04-21 16:27:06 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct ftrace_event_class event_class_syscall_exit = {
|
2011-01-14 09:49:02 +00:00
|
|
|
.system = "syscalls",
|
|
|
|
|
.reg = syscall_exit_register,
|
|
|
|
|
.define_fields = syscall_exit_define_fields,
|
|
|
|
|
.fields = LIST_HEAD_INIT(event_class_syscall_exit.fields),
|
|
|
|
|
.raw_init = init_syscall_trace,
|
2010-04-20 14:47:33 +00:00
|
|
|
};
|
|
|
|
|
|
tracing: Replace syscall_meta_data struct array with pointer array
Currently the syscall_meta structures for the syscall tracepoints are
placed in the __syscall_metadata section, and at link time, the linker
makes one large array of all these syscall metadata structures. On boot
up, this array is read (much like the initcall sections) and the syscall
data is processed.
The problem is that there is no guarantee that gcc will place complex
structures nicely together in an array format. Two structures in the
same file may be placed awkwardly, because gcc has no clue that they
are suppose to be in an array.
A hack was used previous to force the alignment to 4, to pack the
structures together. But this caused alignment issues with other
architectures (sparc).
Instead of packing the structures into an array, the structures' addresses
are now put into the __syscall_metadata section. As pointers are always the
natural alignment, gcc should always pack them tightly together
(otherwise initcall, extable, etc would also fail).
By having the pointers to the structures in the section, we can still
iterate the trace_events without causing unnecessary alignment problems
with other architectures, or depending on the current behaviour of
gcc that will likely change in the future just to tick us kernel developers
off a little more.
The __syscall_metadata section is also moved into the .init.data section
as it is now only needed at boot up.
Suggested-by: David Miller <davem@davemloft.net>
Acked-by: David S. Miller <davem@davemloft.net>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2011-02-02 22:06:09 +00:00
|
|
|
extern struct syscall_metadata *__start_syscalls_metadata[];
|
|
|
|
|
extern struct syscall_metadata *__stop_syscalls_metadata[];
|
2009-09-19 04:50:42 +00:00
|
|
|
|
|
|
|
|
static struct syscall_metadata **syscalls_metadata;
|
|
|
|
|
|
2011-02-03 03:27:23 +00:00
|
|
|
#ifndef ARCH_HAS_SYSCALL_MATCH_SYM_NAME
|
|
|
|
|
static inline bool arch_syscall_match_sym_name(const char *sym, const char *name)
|
|
|
|
|
{
|
|
|
|
|
/*
|
|
|
|
|
* Only compare after the "sys" prefix. Archs that use
|
|
|
|
|
* syscall wrappers may have syscalls symbols aliases prefixed
|
|
|
|
|
* with "SyS" instead of "sys", leading to an unwanted
|
|
|
|
|
* mismatch.
|
|
|
|
|
*/
|
|
|
|
|
return !strcmp(sym + 3, name + 3);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
tracing: Replace syscall_meta_data struct array with pointer array
Currently the syscall_meta structures for the syscall tracepoints are
placed in the __syscall_metadata section, and at link time, the linker
makes one large array of all these syscall metadata structures. On boot
up, this array is read (much like the initcall sections) and the syscall
data is processed.
The problem is that there is no guarantee that gcc will place complex
structures nicely together in an array format. Two structures in the
same file may be placed awkwardly, because gcc has no clue that they
are suppose to be in an array.
A hack was used previous to force the alignment to 4, to pack the
structures together. But this caused alignment issues with other
architectures (sparc).
Instead of packing the structures into an array, the structures' addresses
are now put into the __syscall_metadata section. As pointers are always the
natural alignment, gcc should always pack them tightly together
(otherwise initcall, extable, etc would also fail).
By having the pointers to the structures in the section, we can still
iterate the trace_events without causing unnecessary alignment problems
with other architectures, or depending on the current behaviour of
gcc that will likely change in the future just to tick us kernel developers
off a little more.
The __syscall_metadata section is also moved into the .init.data section
as it is now only needed at boot up.
Suggested-by: David Miller <davem@davemloft.net>
Acked-by: David S. Miller <davem@davemloft.net>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2011-02-02 22:06:09 +00:00
|
|
|
static __init struct syscall_metadata *
|
|
|
|
|
find_syscall_meta(unsigned long syscall)
|
2009-09-19 04:50:42 +00:00
|
|
|
{
|
tracing: Replace syscall_meta_data struct array with pointer array
Currently the syscall_meta structures for the syscall tracepoints are
placed in the __syscall_metadata section, and at link time, the linker
makes one large array of all these syscall metadata structures. On boot
up, this array is read (much like the initcall sections) and the syscall
data is processed.
The problem is that there is no guarantee that gcc will place complex
structures nicely together in an array format. Two structures in the
same file may be placed awkwardly, because gcc has no clue that they
are suppose to be in an array.
A hack was used previous to force the alignment to 4, to pack the
structures together. But this caused alignment issues with other
architectures (sparc).
Instead of packing the structures into an array, the structures' addresses
are now put into the __syscall_metadata section. As pointers are always the
natural alignment, gcc should always pack them tightly together
(otherwise initcall, extable, etc would also fail).
By having the pointers to the structures in the section, we can still
iterate the trace_events without causing unnecessary alignment problems
with other architectures, or depending on the current behaviour of
gcc that will likely change in the future just to tick us kernel developers
off a little more.
The __syscall_metadata section is also moved into the .init.data section
as it is now only needed at boot up.
Suggested-by: David Miller <davem@davemloft.net>
Acked-by: David S. Miller <davem@davemloft.net>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2011-02-02 22:06:09 +00:00
|
|
|
struct syscall_metadata **start;
|
|
|
|
|
struct syscall_metadata **stop;
|
2009-09-19 04:50:42 +00:00
|
|
|
char str[KSYM_SYMBOL_LEN];
|
|
|
|
|
|
|
|
|
|
|
tracing: Replace syscall_meta_data struct array with pointer array
Currently the syscall_meta structures for the syscall tracepoints are
placed in the __syscall_metadata section, and at link time, the linker
makes one large array of all these syscall metadata structures. On boot
up, this array is read (much like the initcall sections) and the syscall
data is processed.
The problem is that there is no guarantee that gcc will place complex
structures nicely together in an array format. Two structures in the
same file may be placed awkwardly, because gcc has no clue that they
are suppose to be in an array.
A hack was used previous to force the alignment to 4, to pack the
structures together. But this caused alignment issues with other
architectures (sparc).
Instead of packing the structures into an array, the structures' addresses
are now put into the __syscall_metadata section. As pointers are always the
natural alignment, gcc should always pack them tightly together
(otherwise initcall, extable, etc would also fail).
By having the pointers to the structures in the section, we can still
iterate the trace_events without causing unnecessary alignment problems
with other architectures, or depending on the current behaviour of
gcc that will likely change in the future just to tick us kernel developers
off a little more.
The __syscall_metadata section is also moved into the .init.data section
as it is now only needed at boot up.
Suggested-by: David Miller <davem@davemloft.net>
Acked-by: David S. Miller <davem@davemloft.net>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2011-02-02 22:06:09 +00:00
|
|
|
start = __start_syscalls_metadata;
|
|
|
|
|
stop = __stop_syscalls_metadata;
|
2009-09-19 04:50:42 +00:00
|
|
|
kallsyms_lookup(syscall, NULL, NULL, NULL, str);
|
|
|
|
|
|
|
|
|
|
for ( ; start < stop; start++) {
|
2011-02-03 03:27:23 +00:00
|
|
|
if ((*start)->name && arch_syscall_match_sym_name(str, (*start)->name))
|
tracing: Replace syscall_meta_data struct array with pointer array
Currently the syscall_meta structures for the syscall tracepoints are
placed in the __syscall_metadata section, and at link time, the linker
makes one large array of all these syscall metadata structures. On boot
up, this array is read (much like the initcall sections) and the syscall
data is processed.
The problem is that there is no guarantee that gcc will place complex
structures nicely together in an array format. Two structures in the
same file may be placed awkwardly, because gcc has no clue that they
are suppose to be in an array.
A hack was used previous to force the alignment to 4, to pack the
structures together. But this caused alignment issues with other
architectures (sparc).
Instead of packing the structures into an array, the structures' addresses
are now put into the __syscall_metadata section. As pointers are always the
natural alignment, gcc should always pack them tightly together
(otherwise initcall, extable, etc would also fail).
By having the pointers to the structures in the section, we can still
iterate the trace_events without causing unnecessary alignment problems
with other architectures, or depending on the current behaviour of
gcc that will likely change in the future just to tick us kernel developers
off a little more.
The __syscall_metadata section is also moved into the .init.data section
as it is now only needed at boot up.
Suggested-by: David Miller <davem@davemloft.net>
Acked-by: David S. Miller <davem@davemloft.net>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2011-02-02 22:06:09 +00:00
|
|
|
return *start;
|
2009-09-19 04:50:42 +00:00
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct syscall_metadata *syscall_nr_to_meta(int nr)
|
|
|
|
|
{
|
|
|
|
|
if (!syscalls_metadata || nr >= NR_syscalls || nr < 0)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
return syscalls_metadata[nr];
|
|
|
|
|
}
|
|
|
|
|
|
2009-03-13 14:42:11 +00:00
|
|
|
enum print_line_t
|
2010-04-22 22:46:14 +00:00
|
|
|
print_syscall_enter(struct trace_iterator *iter, int flags,
|
|
|
|
|
struct trace_event *event)
|
2009-03-13 14:42:11 +00:00
|
|
|
{
|
|
|
|
|
struct trace_seq *s = &iter->seq;
|
|
|
|
|
struct trace_entry *ent = iter->ent;
|
|
|
|
|
struct syscall_trace_enter *trace;
|
|
|
|
|
struct syscall_metadata *entry;
|
|
|
|
|
int i, ret, syscall;
|
|
|
|
|
|
2009-08-10 20:52:53 +00:00
|
|
|
trace = (typeof(trace))ent;
|
2009-03-13 14:42:11 +00:00
|
|
|
syscall = trace->nr;
|
|
|
|
|
entry = syscall_nr_to_meta(syscall);
|
2009-08-10 20:52:53 +00:00
|
|
|
|
2009-03-13 14:42:11 +00:00
|
|
|
if (!entry)
|
|
|
|
|
goto end;
|
|
|
|
|
|
2010-04-23 14:38:03 +00:00
|
|
|
if (entry->enter_event->event.type != ent->type) {
|
2009-08-10 20:52:53 +00:00
|
|
|
WARN_ON_ONCE(1);
|
|
|
|
|
goto end;
|
|
|
|
|
}
|
|
|
|
|
|
2009-03-13 14:42:11 +00:00
|
|
|
ret = trace_seq_printf(s, "%s(", entry->name);
|
|
|
|
|
if (!ret)
|
|
|
|
|
return TRACE_TYPE_PARTIAL_LINE;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < entry->nb_args; i++) {
|
|
|
|
|
/* parameter types */
|
2009-08-17 08:55:18 +00:00
|
|
|
if (trace_flags & TRACE_ITER_VERBOSE) {
|
2009-03-13 14:42:11 +00:00
|
|
|
ret = trace_seq_printf(s, "%s ", entry->types[i]);
|
|
|
|
|
if (!ret)
|
|
|
|
|
return TRACE_TYPE_PARTIAL_LINE;
|
|
|
|
|
}
|
|
|
|
|
/* parameter values */
|
2009-08-20 08:13:35 +00:00
|
|
|
ret = trace_seq_printf(s, "%s: %lx%s", entry->args[i],
|
2009-03-13 14:42:11 +00:00
|
|
|
trace->args[i],
|
2009-08-20 08:13:35 +00:00
|
|
|
i == entry->nb_args - 1 ? "" : ", ");
|
2009-03-13 14:42:11 +00:00
|
|
|
if (!ret)
|
|
|
|
|
return TRACE_TYPE_PARTIAL_LINE;
|
|
|
|
|
}
|
|
|
|
|
|
2009-08-20 08:13:35 +00:00
|
|
|
ret = trace_seq_putc(s, ')');
|
|
|
|
|
if (!ret)
|
|
|
|
|
return TRACE_TYPE_PARTIAL_LINE;
|
|
|
|
|
|
2009-03-13 14:42:11 +00:00
|
|
|
end:
|
2009-08-20 08:13:35 +00:00
|
|
|
ret = trace_seq_putc(s, '\n');
|
|
|
|
|
if (!ret)
|
|
|
|
|
return TRACE_TYPE_PARTIAL_LINE;
|
|
|
|
|
|
2009-03-13 14:42:11 +00:00
|
|
|
return TRACE_TYPE_HANDLED;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
enum print_line_t
|
2010-04-22 22:46:14 +00:00
|
|
|
print_syscall_exit(struct trace_iterator *iter, int flags,
|
|
|
|
|
struct trace_event *event)
|
2009-03-13 14:42:11 +00:00
|
|
|
{
|
|
|
|
|
struct trace_seq *s = &iter->seq;
|
|
|
|
|
struct trace_entry *ent = iter->ent;
|
|
|
|
|
struct syscall_trace_exit *trace;
|
|
|
|
|
int syscall;
|
|
|
|
|
struct syscall_metadata *entry;
|
|
|
|
|
int ret;
|
|
|
|
|
|
2009-08-10 20:52:53 +00:00
|
|
|
trace = (typeof(trace))ent;
|
2009-03-13 14:42:11 +00:00
|
|
|
syscall = trace->nr;
|
|
|
|
|
entry = syscall_nr_to_meta(syscall);
|
2009-08-10 20:52:53 +00:00
|
|
|
|
2009-03-13 14:42:11 +00:00
|
|
|
if (!entry) {
|
|
|
|
|
trace_seq_printf(s, "\n");
|
|
|
|
|
return TRACE_TYPE_HANDLED;
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-23 14:38:03 +00:00
|
|
|
if (entry->exit_event->event.type != ent->type) {
|
2009-08-10 20:52:53 +00:00
|
|
|
WARN_ON_ONCE(1);
|
|
|
|
|
return TRACE_TYPE_UNHANDLED;
|
|
|
|
|
}
|
|
|
|
|
|
2009-03-13 14:42:11 +00:00
|
|
|
ret = trace_seq_printf(s, "%s -> 0x%lx\n", entry->name,
|
|
|
|
|
trace->ret);
|
|
|
|
|
if (!ret)
|
|
|
|
|
return TRACE_TYPE_PARTIAL_LINE;
|
|
|
|
|
|
|
|
|
|
return TRACE_TYPE_HANDLED;
|
|
|
|
|
}
|
|
|
|
|
|
2009-08-19 07:52:25 +00:00
|
|
|
extern char *__bad_type_size(void);
|
|
|
|
|
|
|
|
|
|
#define SYSCALL_FIELD(type, name) \
|
|
|
|
|
sizeof(type) != sizeof(trace.name) ? \
|
|
|
|
|
__bad_type_size() : \
|
2009-10-06 06:09:50 +00:00
|
|
|
#type, #name, offsetof(typeof(trace), name), \
|
|
|
|
|
sizeof(trace.name), is_signed_type(type)
|
2009-08-19 07:52:25 +00:00
|
|
|
|
2009-12-15 07:39:45 +00:00
|
|
|
static
|
|
|
|
|
int __set_enter_print_fmt(struct syscall_metadata *entry, char *buf, int len)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
int pos = 0;
|
|
|
|
|
|
|
|
|
|
/* When len=0, we just calculate the needed length */
|
|
|
|
|
#define LEN_OR_ZERO (len ? len - pos : 0)
|
|
|
|
|
|
|
|
|
|
pos += snprintf(buf + pos, LEN_OR_ZERO, "\"");
|
|
|
|
|
for (i = 0; i < entry->nb_args; i++) {
|
|
|
|
|
pos += snprintf(buf + pos, LEN_OR_ZERO, "%s: 0x%%0%zulx%s",
|
|
|
|
|
entry->args[i], sizeof(unsigned long),
|
|
|
|
|
i == entry->nb_args - 1 ? "" : ", ");
|
|
|
|
|
}
|
|
|
|
|
pos += snprintf(buf + pos, LEN_OR_ZERO, "\"");
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < entry->nb_args; i++) {
|
|
|
|
|
pos += snprintf(buf + pos, LEN_OR_ZERO,
|
|
|
|
|
", ((unsigned long)(REC->%s))", entry->args[i]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#undef LEN_OR_ZERO
|
|
|
|
|
|
|
|
|
|
/* return the length of print_fmt */
|
|
|
|
|
return pos;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int set_syscall_print_fmt(struct ftrace_event_call *call)
|
|
|
|
|
{
|
|
|
|
|
char *print_fmt;
|
|
|
|
|
int len;
|
|
|
|
|
struct syscall_metadata *entry = call->data;
|
|
|
|
|
|
|
|
|
|
if (entry->enter_event != call) {
|
|
|
|
|
call->print_fmt = "\"0x%lx\", REC->ret";
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* First: called with 0 length to calculate the needed length */
|
|
|
|
|
len = __set_enter_print_fmt(entry, NULL, 0);
|
|
|
|
|
|
|
|
|
|
print_fmt = kmalloc(len + 1, GFP_KERNEL);
|
|
|
|
|
if (!print_fmt)
|
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
|
|
/* Second: actually write the @print_fmt */
|
|
|
|
|
__set_enter_print_fmt(entry, print_fmt, len + 1);
|
|
|
|
|
call->print_fmt = print_fmt;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void free_syscall_print_fmt(struct ftrace_event_call *call)
|
|
|
|
|
{
|
|
|
|
|
struct syscall_metadata *entry = call->data;
|
|
|
|
|
|
|
|
|
|
if (entry->enter_event == call)
|
|
|
|
|
kfree(call->print_fmt);
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-22 14:35:55 +00:00
|
|
|
static int syscall_enter_define_fields(struct ftrace_event_call *call)
|
2009-08-19 07:54:51 +00:00
|
|
|
{
|
|
|
|
|
struct syscall_trace_enter trace;
|
2009-12-01 08:23:30 +00:00
|
|
|
struct syscall_metadata *meta = call->data;
|
2009-08-19 07:54:51 +00:00
|
|
|
int ret;
|
|
|
|
|
int i;
|
|
|
|
|
int offset = offsetof(typeof(trace), args);
|
|
|
|
|
|
2009-11-26 07:49:33 +00:00
|
|
|
ret = trace_define_field(call, SYSCALL_FIELD(int, nr), FILTER_OTHER);
|
|
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2009-08-19 07:54:51 +00:00
|
|
|
for (i = 0; i < meta->nb_args; i++) {
|
2009-08-27 03:09:51 +00:00
|
|
|
ret = trace_define_field(call, meta->types[i],
|
|
|
|
|
meta->args[i], offset,
|
2009-08-07 02:33:22 +00:00
|
|
|
sizeof(unsigned long), 0,
|
|
|
|
|
FILTER_OTHER);
|
2009-08-19 07:54:51 +00:00
|
|
|
offset += sizeof(unsigned long);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-22 14:35:55 +00:00
|
|
|
static int syscall_exit_define_fields(struct ftrace_event_call *call)
|
2009-08-19 07:54:51 +00:00
|
|
|
{
|
|
|
|
|
struct syscall_trace_exit trace;
|
|
|
|
|
int ret;
|
|
|
|
|
|
2009-11-26 07:49:33 +00:00
|
|
|
ret = trace_define_field(call, SYSCALL_FIELD(int, nr), FILTER_OTHER);
|
|
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2009-10-06 06:09:50 +00:00
|
|
|
ret = trace_define_field(call, SYSCALL_FIELD(long, ret),
|
2009-08-07 02:33:22 +00:00
|
|
|
FILTER_OTHER);
|
2009-08-19 07:54:51 +00:00
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
tracing: Let tracepoints have data passed to tracepoint callbacks
This patch adds data to be passed to tracepoint callbacks.
The created functions from DECLARE_TRACE() now need a mandatory data
parameter. For example:
DECLARE_TRACE(mytracepoint, int value, value)
Will create the register function:
int register_trace_mytracepoint((void(*)(void *data, int value))probe,
void *data);
As the first argument, all callbacks (probes) must take a (void *data)
parameter. So a callback for the above tracepoint will look like:
void myprobe(void *data, int value)
{
}
The callback may choose to ignore the data parameter.
This change allows callbacks to register a private data pointer along
with the function probe.
void mycallback(void *data, int value);
register_trace_mytracepoint(mycallback, mydata);
Then the mycallback() will receive the "mydata" as the first parameter
before the args.
A more detailed example:
DECLARE_TRACE(mytracepoint, TP_PROTO(int status), TP_ARGS(status));
/* In the C file */
DEFINE_TRACE(mytracepoint, TP_PROTO(int status), TP_ARGS(status));
[...]
trace_mytracepoint(status);
/* In a file registering this tracepoint */
int my_callback(void *data, int status)
{
struct my_struct my_data = data;
[...]
}
[...]
my_data = kmalloc(sizeof(*my_data), GFP_KERNEL);
init_my_data(my_data);
register_trace_mytracepoint(my_callback, my_data);
The same callback can also be registered to the same tracepoint as long
as the data registered is different. Note, the data must also be used
to unregister the callback:
unregister_trace_mytracepoint(my_callback, my_data);
Because of the data parameter, tracepoints declared this way can not have
no args. That is:
DECLARE_TRACE(mytracepoint, TP_PROTO(void), TP_ARGS());
will cause an error.
If no arguments are needed, a new macro can be used instead:
DECLARE_TRACE_NOARGS(mytracepoint);
Since there are no arguments, the proto and args fields are left out.
This is part of a series to make the tracepoint footprint smaller:
text data bss dec hex filename
4913961 1088356 861512 6863829 68bbd5 vmlinux.orig
4914025 1088868 861512 6864405 68be15 vmlinux.class
4918492 1084612 861512 6864616 68bee8 vmlinux.tracepoint
Again, this patch also increases the size of the kernel, but
lays the ground work for decreasing it.
v5: Fixed net/core/drop_monitor.c to handle these updates.
v4: Moved the DECLARE_TRACE() DECLARE_TRACE_NOARGS out of the
#ifdef CONFIG_TRACE_POINTS, since the two are the same in both
cases. The __DECLARE_TRACE() is what changes.
Thanks to Frederic Weisbecker for pointing this out.
v3: Made all register_* functions require data to be passed and
all callbacks to take a void * parameter as its first argument.
This makes the calling functions comply with C standards.
Also added more comments to the modifications of DECLARE_TRACE().
v2: Made the DECLARE_TRACE() have the ability to pass arguments
and added a new DECLARE_TRACE_NOARGS() for tracepoints that
do not need any arguments.
Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2010-04-20 21:04:50 +00:00
|
|
|
void ftrace_syscall_enter(void *ignore, struct pt_regs *regs, long id)
|
2009-03-07 04:52:59 +00:00
|
|
|
{
|
2009-03-13 14:42:11 +00:00
|
|
|
struct syscall_trace_enter *entry;
|
|
|
|
|
struct syscall_metadata *sys_data;
|
|
|
|
|
struct ring_buffer_event *event;
|
2009-09-02 18:17:06 +00:00
|
|
|
struct ring_buffer *buffer;
|
2009-03-13 14:42:11 +00:00
|
|
|
int size;
|
2009-03-07 04:52:59 +00:00
|
|
|
int syscall_nr;
|
|
|
|
|
|
|
|
|
|
syscall_nr = syscall_get_nr(current, regs);
|
tracing: Check invalid syscall nr while tracing syscalls
Most arch syscall_get_nr() implementations returns -1 if the syscall
number is not valid. Accessing the bit field without a check might
result in a kernel oops (at least I saw it on s390 for ftrace selftest).
Before this change, this problem did not occur, because the invalid
syscall number (-1) caused syscall_nr_to_meta() to return NULL.
There are at least two scenarios where syscall_get_nr() can return -1:
1. For example, ptrace stores an invalid syscall number, and thus,
tracing code resets it.
(see do_syscall_trace_enter in arch/s390/kernel/ptrace.c)
2. The syscall_regfunc() (kernel/tracepoint.c) sets the
TIF_SYSCALL_FTRACE (now: TIF_SYSCALL_TRACEPOINT) flag for all threads
which include kernel threads.
However, the ftrace selftest triggers a kernel oops when testing
syscall trace points:
- The kernel thread is started as ususal (do_fork()),
- tracing code sets TIF_SYSCALL_FTRACE,
- the ret_from_fork() function is triggered and starts
ftrace_syscall_exit() with an invalid syscall number.
To avoid these scenarios, I suggest to check the syscall_nr.
For instance, the ftrace selftest fails for s390 (with config option
CONFIG_FTRACE_SYSCALLS set) and produces the following kernel oops.
Unable to handle kernel pointer dereference at virtual kernel address 2000000000
Oops: 0038 [#1] PREEMPT SMP
Modules linked in:
CPU: 0 Not tainted 2.6.31-rc6-next-20090819-dirty #18
Process kthreadd (pid: 818, task: 000000003ea207e8, ksp: 000000003e813eb8)
Krnl PSW : 0704100180000000 00000000000ea54c (ftrace_syscall_exit+0x58/0xdc)
R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:0 CC:1 PM:0 EA:3
Krnl GPRS: 0000000000000000 00000000000e0000 ffffffffffffffff 20000000008c2650
0000000000000007 0000000000000000 0000000000000000 0000000000000000
0000000000000000 0000000000000000 ffffffffffffffff 000000003e813d78
000000003e813f58 0000000000505ba8 000000003e813e18 000000003e813d78
Krnl Code: 00000000000ea540: e330d0000008 ag %r3,0(%r13)
00000000000ea546: a7480007 lhi %r4,7
00000000000ea54a: 1442 nr %r4,%r2
>00000000000ea54c: e31030000090 llgc %r1,0(%r3)
00000000000ea552: 5410d008 n %r1,8(%r13)
00000000000ea556: 8a104000 sra %r1,0(%r4)
00000000000ea55a: 5410d00c n %r1,12(%r13)
00000000000ea55e: 1211 ltr %r1,%r1
Call Trace:
([<0000000000000000>] 0x0)
[<000000000001fa22>] do_syscall_trace_exit+0x132/0x18c
[<000000000002d0c4>] sysc_return+0x0/0x8
[<000000000001c738>] kernel_thread_starter+0x0/0xc
Last Breaking-Event-Address:
[<00000000000ea51e>] ftrace_syscall_exit+0x2a/0xdc
Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Jason Baron <jbaron@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Jiaying Zhang <jiayingz@google.com>
Cc: Martin Bligh <mbligh@google.com>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Paul Mundt <lethal@linux-sh.org>
LKML-Reference: <20090825125027.GE4639@cetus.boeblingen.de.ibm.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
2009-08-25 12:50:27 +00:00
|
|
|
if (syscall_nr < 0)
|
|
|
|
|
return;
|
2009-08-10 20:52:47 +00:00
|
|
|
if (!test_bit(syscall_nr, enabled_enter_syscalls))
|
|
|
|
|
return;
|
2009-03-07 04:52:59 +00:00
|
|
|
|
2009-03-13 14:42:11 +00:00
|
|
|
sys_data = syscall_nr_to_meta(syscall_nr);
|
|
|
|
|
if (!sys_data)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
size = sizeof(*entry) + sizeof(unsigned long) * sys_data->nb_args;
|
|
|
|
|
|
2009-12-01 08:23:36 +00:00
|
|
|
event = trace_current_buffer_lock_reserve(&buffer,
|
2010-04-23 14:38:03 +00:00
|
|
|
sys_data->enter_event->event.type, size, 0, 0);
|
2009-03-13 14:42:11 +00:00
|
|
|
if (!event)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
entry = ring_buffer_event_data(event);
|
|
|
|
|
entry->nr = syscall_nr;
|
|
|
|
|
syscall_get_arguments(current, regs, 0, sys_data->nb_args, entry->args);
|
|
|
|
|
|
2009-09-02 18:17:06 +00:00
|
|
|
if (!filter_current_check_discard(buffer, sys_data->enter_event,
|
|
|
|
|
entry, event))
|
|
|
|
|
trace_current_buffer_unlock_commit(buffer, event, 0, 0);
|
2009-03-07 04:52:59 +00:00
|
|
|
}
|
|
|
|
|
|
tracing: Let tracepoints have data passed to tracepoint callbacks
This patch adds data to be passed to tracepoint callbacks.
The created functions from DECLARE_TRACE() now need a mandatory data
parameter. For example:
DECLARE_TRACE(mytracepoint, int value, value)
Will create the register function:
int register_trace_mytracepoint((void(*)(void *data, int value))probe,
void *data);
As the first argument, all callbacks (probes) must take a (void *data)
parameter. So a callback for the above tracepoint will look like:
void myprobe(void *data, int value)
{
}
The callback may choose to ignore the data parameter.
This change allows callbacks to register a private data pointer along
with the function probe.
void mycallback(void *data, int value);
register_trace_mytracepoint(mycallback, mydata);
Then the mycallback() will receive the "mydata" as the first parameter
before the args.
A more detailed example:
DECLARE_TRACE(mytracepoint, TP_PROTO(int status), TP_ARGS(status));
/* In the C file */
DEFINE_TRACE(mytracepoint, TP_PROTO(int status), TP_ARGS(status));
[...]
trace_mytracepoint(status);
/* In a file registering this tracepoint */
int my_callback(void *data, int status)
{
struct my_struct my_data = data;
[...]
}
[...]
my_data = kmalloc(sizeof(*my_data), GFP_KERNEL);
init_my_data(my_data);
register_trace_mytracepoint(my_callback, my_data);
The same callback can also be registered to the same tracepoint as long
as the data registered is different. Note, the data must also be used
to unregister the callback:
unregister_trace_mytracepoint(my_callback, my_data);
Because of the data parameter, tracepoints declared this way can not have
no args. That is:
DECLARE_TRACE(mytracepoint, TP_PROTO(void), TP_ARGS());
will cause an error.
If no arguments are needed, a new macro can be used instead:
DECLARE_TRACE_NOARGS(mytracepoint);
Since there are no arguments, the proto and args fields are left out.
This is part of a series to make the tracepoint footprint smaller:
text data bss dec hex filename
4913961 1088356 861512 6863829 68bbd5 vmlinux.orig
4914025 1088868 861512 6864405 68be15 vmlinux.class
4918492 1084612 861512 6864616 68bee8 vmlinux.tracepoint
Again, this patch also increases the size of the kernel, but
lays the ground work for decreasing it.
v5: Fixed net/core/drop_monitor.c to handle these updates.
v4: Moved the DECLARE_TRACE() DECLARE_TRACE_NOARGS out of the
#ifdef CONFIG_TRACE_POINTS, since the two are the same in both
cases. The __DECLARE_TRACE() is what changes.
Thanks to Frederic Weisbecker for pointing this out.
v3: Made all register_* functions require data to be passed and
all callbacks to take a void * parameter as its first argument.
This makes the calling functions comply with C standards.
Also added more comments to the modifications of DECLARE_TRACE().
v2: Made the DECLARE_TRACE() have the ability to pass arguments
and added a new DECLARE_TRACE_NOARGS() for tracepoints that
do not need any arguments.
Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2010-04-20 21:04:50 +00:00
|
|
|
void ftrace_syscall_exit(void *ignore, struct pt_regs *regs, long ret)
|
2009-03-07 04:52:59 +00:00
|
|
|
{
|
2009-03-13 14:42:11 +00:00
|
|
|
struct syscall_trace_exit *entry;
|
|
|
|
|
struct syscall_metadata *sys_data;
|
|
|
|
|
struct ring_buffer_event *event;
|
2009-09-02 18:17:06 +00:00
|
|
|
struct ring_buffer *buffer;
|
2009-03-07 04:52:59 +00:00
|
|
|
int syscall_nr;
|
|
|
|
|
|
|
|
|
|
syscall_nr = syscall_get_nr(current, regs);
|
tracing: Check invalid syscall nr while tracing syscalls
Most arch syscall_get_nr() implementations returns -1 if the syscall
number is not valid. Accessing the bit field without a check might
result in a kernel oops (at least I saw it on s390 for ftrace selftest).
Before this change, this problem did not occur, because the invalid
syscall number (-1) caused syscall_nr_to_meta() to return NULL.
There are at least two scenarios where syscall_get_nr() can return -1:
1. For example, ptrace stores an invalid syscall number, and thus,
tracing code resets it.
(see do_syscall_trace_enter in arch/s390/kernel/ptrace.c)
2. The syscall_regfunc() (kernel/tracepoint.c) sets the
TIF_SYSCALL_FTRACE (now: TIF_SYSCALL_TRACEPOINT) flag for all threads
which include kernel threads.
However, the ftrace selftest triggers a kernel oops when testing
syscall trace points:
- The kernel thread is started as ususal (do_fork()),
- tracing code sets TIF_SYSCALL_FTRACE,
- the ret_from_fork() function is triggered and starts
ftrace_syscall_exit() with an invalid syscall number.
To avoid these scenarios, I suggest to check the syscall_nr.
For instance, the ftrace selftest fails for s390 (with config option
CONFIG_FTRACE_SYSCALLS set) and produces the following kernel oops.
Unable to handle kernel pointer dereference at virtual kernel address 2000000000
Oops: 0038 [#1] PREEMPT SMP
Modules linked in:
CPU: 0 Not tainted 2.6.31-rc6-next-20090819-dirty #18
Process kthreadd (pid: 818, task: 000000003ea207e8, ksp: 000000003e813eb8)
Krnl PSW : 0704100180000000 00000000000ea54c (ftrace_syscall_exit+0x58/0xdc)
R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:0 CC:1 PM:0 EA:3
Krnl GPRS: 0000000000000000 00000000000e0000 ffffffffffffffff 20000000008c2650
0000000000000007 0000000000000000 0000000000000000 0000000000000000
0000000000000000 0000000000000000 ffffffffffffffff 000000003e813d78
000000003e813f58 0000000000505ba8 000000003e813e18 000000003e813d78
Krnl Code: 00000000000ea540: e330d0000008 ag %r3,0(%r13)
00000000000ea546: a7480007 lhi %r4,7
00000000000ea54a: 1442 nr %r4,%r2
>00000000000ea54c: e31030000090 llgc %r1,0(%r3)
00000000000ea552: 5410d008 n %r1,8(%r13)
00000000000ea556: 8a104000 sra %r1,0(%r4)
00000000000ea55a: 5410d00c n %r1,12(%r13)
00000000000ea55e: 1211 ltr %r1,%r1
Call Trace:
([<0000000000000000>] 0x0)
[<000000000001fa22>] do_syscall_trace_exit+0x132/0x18c
[<000000000002d0c4>] sysc_return+0x0/0x8
[<000000000001c738>] kernel_thread_starter+0x0/0xc
Last Breaking-Event-Address:
[<00000000000ea51e>] ftrace_syscall_exit+0x2a/0xdc
Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Jason Baron <jbaron@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Jiaying Zhang <jiayingz@google.com>
Cc: Martin Bligh <mbligh@google.com>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Paul Mundt <lethal@linux-sh.org>
LKML-Reference: <20090825125027.GE4639@cetus.boeblingen.de.ibm.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
2009-08-25 12:50:27 +00:00
|
|
|
if (syscall_nr < 0)
|
|
|
|
|
return;
|
2009-08-10 20:52:47 +00:00
|
|
|
if (!test_bit(syscall_nr, enabled_exit_syscalls))
|
|
|
|
|
return;
|
2009-03-07 04:52:59 +00:00
|
|
|
|
2009-03-13 14:42:11 +00:00
|
|
|
sys_data = syscall_nr_to_meta(syscall_nr);
|
|
|
|
|
if (!sys_data)
|
|
|
|
|
return;
|
|
|
|
|
|
2009-12-01 08:23:36 +00:00
|
|
|
event = trace_current_buffer_lock_reserve(&buffer,
|
2010-04-23 14:38:03 +00:00
|
|
|
sys_data->exit_event->event.type, sizeof(*entry), 0, 0);
|
2009-03-13 14:42:11 +00:00
|
|
|
if (!event)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
entry = ring_buffer_event_data(event);
|
|
|
|
|
entry->nr = syscall_nr;
|
|
|
|
|
entry->ret = syscall_get_return_value(current, regs);
|
|
|
|
|
|
2009-09-02 18:17:06 +00:00
|
|
|
if (!filter_current_check_discard(buffer, sys_data->exit_event,
|
|
|
|
|
entry, event))
|
|
|
|
|
trace_current_buffer_unlock_commit(buffer, event, 0, 0);
|
2009-03-07 04:52:59 +00:00
|
|
|
}
|
|
|
|
|
|
2009-08-13 20:34:53 +00:00
|
|
|
int reg_event_syscall_enter(struct ftrace_event_call *call)
|
2009-03-07 04:52:59 +00:00
|
|
|
{
|
2009-08-10 20:52:47 +00:00
|
|
|
int ret = 0;
|
|
|
|
|
int num;
|
|
|
|
|
|
2009-12-01 08:23:47 +00:00
|
|
|
num = ((struct syscall_metadata *)call->data)->syscall_nr;
|
2011-02-03 03:27:21 +00:00
|
|
|
if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
|
2009-08-10 20:52:47 +00:00
|
|
|
return -ENOSYS;
|
|
|
|
|
mutex_lock(&syscall_trace_lock);
|
|
|
|
|
if (!sys_refcount_enter)
|
tracing: Let tracepoints have data passed to tracepoint callbacks
This patch adds data to be passed to tracepoint callbacks.
The created functions from DECLARE_TRACE() now need a mandatory data
parameter. For example:
DECLARE_TRACE(mytracepoint, int value, value)
Will create the register function:
int register_trace_mytracepoint((void(*)(void *data, int value))probe,
void *data);
As the first argument, all callbacks (probes) must take a (void *data)
parameter. So a callback for the above tracepoint will look like:
void myprobe(void *data, int value)
{
}
The callback may choose to ignore the data parameter.
This change allows callbacks to register a private data pointer along
with the function probe.
void mycallback(void *data, int value);
register_trace_mytracepoint(mycallback, mydata);
Then the mycallback() will receive the "mydata" as the first parameter
before the args.
A more detailed example:
DECLARE_TRACE(mytracepoint, TP_PROTO(int status), TP_ARGS(status));
/* In the C file */
DEFINE_TRACE(mytracepoint, TP_PROTO(int status), TP_ARGS(status));
[...]
trace_mytracepoint(status);
/* In a file registering this tracepoint */
int my_callback(void *data, int status)
{
struct my_struct my_data = data;
[...]
}
[...]
my_data = kmalloc(sizeof(*my_data), GFP_KERNEL);
init_my_data(my_data);
register_trace_mytracepoint(my_callback, my_data);
The same callback can also be registered to the same tracepoint as long
as the data registered is different. Note, the data must also be used
to unregister the callback:
unregister_trace_mytracepoint(my_callback, my_data);
Because of the data parameter, tracepoints declared this way can not have
no args. That is:
DECLARE_TRACE(mytracepoint, TP_PROTO(void), TP_ARGS());
will cause an error.
If no arguments are needed, a new macro can be used instead:
DECLARE_TRACE_NOARGS(mytracepoint);
Since there are no arguments, the proto and args fields are left out.
This is part of a series to make the tracepoint footprint smaller:
text data bss dec hex filename
4913961 1088356 861512 6863829 68bbd5 vmlinux.orig
4914025 1088868 861512 6864405 68be15 vmlinux.class
4918492 1084612 861512 6864616 68bee8 vmlinux.tracepoint
Again, this patch also increases the size of the kernel, but
lays the ground work for decreasing it.
v5: Fixed net/core/drop_monitor.c to handle these updates.
v4: Moved the DECLARE_TRACE() DECLARE_TRACE_NOARGS out of the
#ifdef CONFIG_TRACE_POINTS, since the two are the same in both
cases. The __DECLARE_TRACE() is what changes.
Thanks to Frederic Weisbecker for pointing this out.
v3: Made all register_* functions require data to be passed and
all callbacks to take a void * parameter as its first argument.
This makes the calling functions comply with C standards.
Also added more comments to the modifications of DECLARE_TRACE().
v2: Made the DECLARE_TRACE() have the ability to pass arguments
and added a new DECLARE_TRACE_NOARGS() for tracepoints that
do not need any arguments.
Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2010-04-20 21:04:50 +00:00
|
|
|
ret = register_trace_sys_enter(ftrace_syscall_enter, NULL);
|
2009-12-08 03:14:52 +00:00
|
|
|
if (!ret) {
|
2009-08-10 20:52:47 +00:00
|
|
|
set_bit(num, enabled_enter_syscalls);
|
|
|
|
|
sys_refcount_enter++;
|
|
|
|
|
}
|
|
|
|
|
mutex_unlock(&syscall_trace_lock);
|
|
|
|
|
return ret;
|
2009-03-07 04:52:59 +00:00
|
|
|
}
|
|
|
|
|
|
2009-08-13 20:34:53 +00:00
|
|
|
void unreg_event_syscall_enter(struct ftrace_event_call *call)
|
2009-03-07 04:52:59 +00:00
|
|
|
{
|
2009-08-10 20:52:47 +00:00
|
|
|
int num;
|
2009-03-07 04:52:59 +00:00
|
|
|
|
2009-12-01 08:23:47 +00:00
|
|
|
num = ((struct syscall_metadata *)call->data)->syscall_nr;
|
2011-02-03 03:27:21 +00:00
|
|
|
if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
|
2009-08-10 20:52:47 +00:00
|
|
|
return;
|
|
|
|
|
mutex_lock(&syscall_trace_lock);
|
|
|
|
|
sys_refcount_enter--;
|
|
|
|
|
clear_bit(num, enabled_enter_syscalls);
|
|
|
|
|
if (!sys_refcount_enter)
|
tracing: Let tracepoints have data passed to tracepoint callbacks
This patch adds data to be passed to tracepoint callbacks.
The created functions from DECLARE_TRACE() now need a mandatory data
parameter. For example:
DECLARE_TRACE(mytracepoint, int value, value)
Will create the register function:
int register_trace_mytracepoint((void(*)(void *data, int value))probe,
void *data);
As the first argument, all callbacks (probes) must take a (void *data)
parameter. So a callback for the above tracepoint will look like:
void myprobe(void *data, int value)
{
}
The callback may choose to ignore the data parameter.
This change allows callbacks to register a private data pointer along
with the function probe.
void mycallback(void *data, int value);
register_trace_mytracepoint(mycallback, mydata);
Then the mycallback() will receive the "mydata" as the first parameter
before the args.
A more detailed example:
DECLARE_TRACE(mytracepoint, TP_PROTO(int status), TP_ARGS(status));
/* In the C file */
DEFINE_TRACE(mytracepoint, TP_PROTO(int status), TP_ARGS(status));
[...]
trace_mytracepoint(status);
/* In a file registering this tracepoint */
int my_callback(void *data, int status)
{
struct my_struct my_data = data;
[...]
}
[...]
my_data = kmalloc(sizeof(*my_data), GFP_KERNEL);
init_my_data(my_data);
register_trace_mytracepoint(my_callback, my_data);
The same callback can also be registered to the same tracepoint as long
as the data registered is different. Note, the data must also be used
to unregister the callback:
unregister_trace_mytracepoint(my_callback, my_data);
Because of the data parameter, tracepoints declared this way can not have
no args. That is:
DECLARE_TRACE(mytracepoint, TP_PROTO(void), TP_ARGS());
will cause an error.
If no arguments are needed, a new macro can be used instead:
DECLARE_TRACE_NOARGS(mytracepoint);
Since there are no arguments, the proto and args fields are left out.
This is part of a series to make the tracepoint footprint smaller:
text data bss dec hex filename
4913961 1088356 861512 6863829 68bbd5 vmlinux.orig
4914025 1088868 861512 6864405 68be15 vmlinux.class
4918492 1084612 861512 6864616 68bee8 vmlinux.tracepoint
Again, this patch also increases the size of the kernel, but
lays the ground work for decreasing it.
v5: Fixed net/core/drop_monitor.c to handle these updates.
v4: Moved the DECLARE_TRACE() DECLARE_TRACE_NOARGS out of the
#ifdef CONFIG_TRACE_POINTS, since the two are the same in both
cases. The __DECLARE_TRACE() is what changes.
Thanks to Frederic Weisbecker for pointing this out.
v3: Made all register_* functions require data to be passed and
all callbacks to take a void * parameter as its first argument.
This makes the calling functions comply with C standards.
Also added more comments to the modifications of DECLARE_TRACE().
v2: Made the DECLARE_TRACE() have the ability to pass arguments
and added a new DECLARE_TRACE_NOARGS() for tracepoints that
do not need any arguments.
Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2010-04-20 21:04:50 +00:00
|
|
|
unregister_trace_sys_enter(ftrace_syscall_enter, NULL);
|
2009-08-10 20:52:47 +00:00
|
|
|
mutex_unlock(&syscall_trace_lock);
|
|
|
|
|
}
|
2009-03-07 04:52:59 +00:00
|
|
|
|
2009-08-13 20:34:53 +00:00
|
|
|
int reg_event_syscall_exit(struct ftrace_event_call *call)
|
2009-03-07 04:52:59 +00:00
|
|
|
{
|
2009-08-10 20:52:47 +00:00
|
|
|
int ret = 0;
|
|
|
|
|
int num;
|
|
|
|
|
|
2009-12-01 08:23:47 +00:00
|
|
|
num = ((struct syscall_metadata *)call->data)->syscall_nr;
|
2011-02-03 03:27:21 +00:00
|
|
|
if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
|
2009-08-10 20:52:47 +00:00
|
|
|
return -ENOSYS;
|
|
|
|
|
mutex_lock(&syscall_trace_lock);
|
|
|
|
|
if (!sys_refcount_exit)
|
tracing: Let tracepoints have data passed to tracepoint callbacks
This patch adds data to be passed to tracepoint callbacks.
The created functions from DECLARE_TRACE() now need a mandatory data
parameter. For example:
DECLARE_TRACE(mytracepoint, int value, value)
Will create the register function:
int register_trace_mytracepoint((void(*)(void *data, int value))probe,
void *data);
As the first argument, all callbacks (probes) must take a (void *data)
parameter. So a callback for the above tracepoint will look like:
void myprobe(void *data, int value)
{
}
The callback may choose to ignore the data parameter.
This change allows callbacks to register a private data pointer along
with the function probe.
void mycallback(void *data, int value);
register_trace_mytracepoint(mycallback, mydata);
Then the mycallback() will receive the "mydata" as the first parameter
before the args.
A more detailed example:
DECLARE_TRACE(mytracepoint, TP_PROTO(int status), TP_ARGS(status));
/* In the C file */
DEFINE_TRACE(mytracepoint, TP_PROTO(int status), TP_ARGS(status));
[...]
trace_mytracepoint(status);
/* In a file registering this tracepoint */
int my_callback(void *data, int status)
{
struct my_struct my_data = data;
[...]
}
[...]
my_data = kmalloc(sizeof(*my_data), GFP_KERNEL);
init_my_data(my_data);
register_trace_mytracepoint(my_callback, my_data);
The same callback can also be registered to the same tracepoint as long
as the data registered is different. Note, the data must also be used
to unregister the callback:
unregister_trace_mytracepoint(my_callback, my_data);
Because of the data parameter, tracepoints declared this way can not have
no args. That is:
DECLARE_TRACE(mytracepoint, TP_PROTO(void), TP_ARGS());
will cause an error.
If no arguments are needed, a new macro can be used instead:
DECLARE_TRACE_NOARGS(mytracepoint);
Since there are no arguments, the proto and args fields are left out.
This is part of a series to make the tracepoint footprint smaller:
text data bss dec hex filename
4913961 1088356 861512 6863829 68bbd5 vmlinux.orig
4914025 1088868 861512 6864405 68be15 vmlinux.class
4918492 1084612 861512 6864616 68bee8 vmlinux.tracepoint
Again, this patch also increases the size of the kernel, but
lays the ground work for decreasing it.
v5: Fixed net/core/drop_monitor.c to handle these updates.
v4: Moved the DECLARE_TRACE() DECLARE_TRACE_NOARGS out of the
#ifdef CONFIG_TRACE_POINTS, since the two are the same in both
cases. The __DECLARE_TRACE() is what changes.
Thanks to Frederic Weisbecker for pointing this out.
v3: Made all register_* functions require data to be passed and
all callbacks to take a void * parameter as its first argument.
This makes the calling functions comply with C standards.
Also added more comments to the modifications of DECLARE_TRACE().
v2: Made the DECLARE_TRACE() have the ability to pass arguments
and added a new DECLARE_TRACE_NOARGS() for tracepoints that
do not need any arguments.
Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2010-04-20 21:04:50 +00:00
|
|
|
ret = register_trace_sys_exit(ftrace_syscall_exit, NULL);
|
2009-12-08 03:14:52 +00:00
|
|
|
if (!ret) {
|
2009-08-10 20:52:47 +00:00
|
|
|
set_bit(num, enabled_exit_syscalls);
|
|
|
|
|
sys_refcount_exit++;
|
2009-03-07 04:52:59 +00:00
|
|
|
}
|
2009-08-10 20:52:47 +00:00
|
|
|
mutex_unlock(&syscall_trace_lock);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
2009-03-07 04:52:59 +00:00
|
|
|
|
2009-08-13 20:34:53 +00:00
|
|
|
void unreg_event_syscall_exit(struct ftrace_event_call *call)
|
2009-08-10 20:52:47 +00:00
|
|
|
{
|
|
|
|
|
int num;
|
2009-03-07 04:52:59 +00:00
|
|
|
|
2009-12-01 08:23:47 +00:00
|
|
|
num = ((struct syscall_metadata *)call->data)->syscall_nr;
|
2011-02-03 03:27:21 +00:00
|
|
|
if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
|
2009-08-10 20:52:47 +00:00
|
|
|
return;
|
|
|
|
|
mutex_lock(&syscall_trace_lock);
|
|
|
|
|
sys_refcount_exit--;
|
|
|
|
|
clear_bit(num, enabled_exit_syscalls);
|
|
|
|
|
if (!sys_refcount_exit)
|
tracing: Let tracepoints have data passed to tracepoint callbacks
This patch adds data to be passed to tracepoint callbacks.
The created functions from DECLARE_TRACE() now need a mandatory data
parameter. For example:
DECLARE_TRACE(mytracepoint, int value, value)
Will create the register function:
int register_trace_mytracepoint((void(*)(void *data, int value))probe,
void *data);
As the first argument, all callbacks (probes) must take a (void *data)
parameter. So a callback for the above tracepoint will look like:
void myprobe(void *data, int value)
{
}
The callback may choose to ignore the data parameter.
This change allows callbacks to register a private data pointer along
with the function probe.
void mycallback(void *data, int value);
register_trace_mytracepoint(mycallback, mydata);
Then the mycallback() will receive the "mydata" as the first parameter
before the args.
A more detailed example:
DECLARE_TRACE(mytracepoint, TP_PROTO(int status), TP_ARGS(status));
/* In the C file */
DEFINE_TRACE(mytracepoint, TP_PROTO(int status), TP_ARGS(status));
[...]
trace_mytracepoint(status);
/* In a file registering this tracepoint */
int my_callback(void *data, int status)
{
struct my_struct my_data = data;
[...]
}
[...]
my_data = kmalloc(sizeof(*my_data), GFP_KERNEL);
init_my_data(my_data);
register_trace_mytracepoint(my_callback, my_data);
The same callback can also be registered to the same tracepoint as long
as the data registered is different. Note, the data must also be used
to unregister the callback:
unregister_trace_mytracepoint(my_callback, my_data);
Because of the data parameter, tracepoints declared this way can not have
no args. That is:
DECLARE_TRACE(mytracepoint, TP_PROTO(void), TP_ARGS());
will cause an error.
If no arguments are needed, a new macro can be used instead:
DECLARE_TRACE_NOARGS(mytracepoint);
Since there are no arguments, the proto and args fields are left out.
This is part of a series to make the tracepoint footprint smaller:
text data bss dec hex filename
4913961 1088356 861512 6863829 68bbd5 vmlinux.orig
4914025 1088868 861512 6864405 68be15 vmlinux.class
4918492 1084612 861512 6864616 68bee8 vmlinux.tracepoint
Again, this patch also increases the size of the kernel, but
lays the ground work for decreasing it.
v5: Fixed net/core/drop_monitor.c to handle these updates.
v4: Moved the DECLARE_TRACE() DECLARE_TRACE_NOARGS out of the
#ifdef CONFIG_TRACE_POINTS, since the two are the same in both
cases. The __DECLARE_TRACE() is what changes.
Thanks to Frederic Weisbecker for pointing this out.
v3: Made all register_* functions require data to be passed and
all callbacks to take a void * parameter as its first argument.
This makes the calling functions comply with C standards.
Also added more comments to the modifications of DECLARE_TRACE().
v2: Made the DECLARE_TRACE() have the ability to pass arguments
and added a new DECLARE_TRACE_NOARGS() for tracepoints that
do not need any arguments.
Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2010-04-20 21:04:50 +00:00
|
|
|
unregister_trace_sys_exit(ftrace_syscall_exit, NULL);
|
2009-08-10 20:52:47 +00:00
|
|
|
mutex_unlock(&syscall_trace_lock);
|
2009-03-07 04:52:59 +00:00
|
|
|
}
|
2009-08-10 20:52:47 +00:00
|
|
|
|
2009-12-01 08:23:55 +00:00
|
|
|
int init_syscall_trace(struct ftrace_event_call *call)
|
|
|
|
|
{
|
|
|
|
|
int id;
|
2011-02-03 03:27:20 +00:00
|
|
|
int num;
|
|
|
|
|
|
|
|
|
|
num = ((struct syscall_metadata *)call->data)->syscall_nr;
|
|
|
|
|
if (num < 0 || num >= NR_syscalls) {
|
|
|
|
|
pr_debug("syscall %s metadata not mapped, disabling ftrace event\n",
|
|
|
|
|
((struct syscall_metadata *)call->data)->name);
|
|
|
|
|
return -ENOSYS;
|
|
|
|
|
}
|
2009-12-01 08:23:55 +00:00
|
|
|
|
2009-12-15 07:39:45 +00:00
|
|
|
if (set_syscall_print_fmt(call) < 0)
|
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
2009-12-29 02:13:59 +00:00
|
|
|
id = trace_event_raw_init(call);
|
|
|
|
|
|
|
|
|
|
if (id < 0) {
|
2009-12-15 07:39:45 +00:00
|
|
|
free_syscall_print_fmt(call);
|
2009-12-29 02:13:59 +00:00
|
|
|
return id;
|
2009-12-15 07:39:45 +00:00
|
|
|
}
|
2009-12-29 02:13:59 +00:00
|
|
|
|
|
|
|
|
return id;
|
2009-12-01 08:23:55 +00:00
|
|
|
}
|
|
|
|
|
|
2011-02-03 03:27:22 +00:00
|
|
|
unsigned long __init __weak arch_syscall_addr(int nr)
|
2010-01-26 09:40:03 +00:00
|
|
|
{
|
|
|
|
|
return (unsigned long)sys_call_table[nr];
|
|
|
|
|
}
|
|
|
|
|
|
2009-09-19 04:50:42 +00:00
|
|
|
int __init init_ftrace_syscalls(void)
|
|
|
|
|
{
|
|
|
|
|
struct syscall_metadata *meta;
|
|
|
|
|
unsigned long addr;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
syscalls_metadata = kzalloc(sizeof(*syscalls_metadata) *
|
|
|
|
|
NR_syscalls, GFP_KERNEL);
|
|
|
|
|
if (!syscalls_metadata) {
|
|
|
|
|
WARN_ON(1);
|
|
|
|
|
return -ENOMEM;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < NR_syscalls; i++) {
|
|
|
|
|
addr = arch_syscall_addr(i);
|
|
|
|
|
meta = find_syscall_meta(addr);
|
2009-12-01 08:23:47 +00:00
|
|
|
if (!meta)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
meta->syscall_nr = i;
|
2009-09-19 04:50:42 +00:00
|
|
|
syscalls_metadata[i] = meta;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
core_initcall(init_ftrace_syscalls);
|
|
|
|
|
|
2009-12-21 06:27:35 +00:00
|
|
|
#ifdef CONFIG_PERF_EVENTS
|
2009-08-11 18:22:53 +00:00
|
|
|
|
2010-03-05 04:35:37 +00:00
|
|
|
static DECLARE_BITMAP(enabled_perf_enter_syscalls, NR_syscalls);
|
|
|
|
|
static DECLARE_BITMAP(enabled_perf_exit_syscalls, NR_syscalls);
|
|
|
|
|
static int sys_perf_refcount_enter;
|
|
|
|
|
static int sys_perf_refcount_exit;
|
2009-08-10 20:53:02 +00:00
|
|
|
|
tracing: Let tracepoints have data passed to tracepoint callbacks
This patch adds data to be passed to tracepoint callbacks.
The created functions from DECLARE_TRACE() now need a mandatory data
parameter. For example:
DECLARE_TRACE(mytracepoint, int value, value)
Will create the register function:
int register_trace_mytracepoint((void(*)(void *data, int value))probe,
void *data);
As the first argument, all callbacks (probes) must take a (void *data)
parameter. So a callback for the above tracepoint will look like:
void myprobe(void *data, int value)
{
}
The callback may choose to ignore the data parameter.
This change allows callbacks to register a private data pointer along
with the function probe.
void mycallback(void *data, int value);
register_trace_mytracepoint(mycallback, mydata);
Then the mycallback() will receive the "mydata" as the first parameter
before the args.
A more detailed example:
DECLARE_TRACE(mytracepoint, TP_PROTO(int status), TP_ARGS(status));
/* In the C file */
DEFINE_TRACE(mytracepoint, TP_PROTO(int status), TP_ARGS(status));
[...]
trace_mytracepoint(status);
/* In a file registering this tracepoint */
int my_callback(void *data, int status)
{
struct my_struct my_data = data;
[...]
}
[...]
my_data = kmalloc(sizeof(*my_data), GFP_KERNEL);
init_my_data(my_data);
register_trace_mytracepoint(my_callback, my_data);
The same callback can also be registered to the same tracepoint as long
as the data registered is different. Note, the data must also be used
to unregister the callback:
unregister_trace_mytracepoint(my_callback, my_data);
Because of the data parameter, tracepoints declared this way can not have
no args. That is:
DECLARE_TRACE(mytracepoint, TP_PROTO(void), TP_ARGS());
will cause an error.
If no arguments are needed, a new macro can be used instead:
DECLARE_TRACE_NOARGS(mytracepoint);
Since there are no arguments, the proto and args fields are left out.
This is part of a series to make the tracepoint footprint smaller:
text data bss dec hex filename
4913961 1088356 861512 6863829 68bbd5 vmlinux.orig
4914025 1088868 861512 6864405 68be15 vmlinux.class
4918492 1084612 861512 6864616 68bee8 vmlinux.tracepoint
Again, this patch also increases the size of the kernel, but
lays the ground work for decreasing it.
v5: Fixed net/core/drop_monitor.c to handle these updates.
v4: Moved the DECLARE_TRACE() DECLARE_TRACE_NOARGS out of the
#ifdef CONFIG_TRACE_POINTS, since the two are the same in both
cases. The __DECLARE_TRACE() is what changes.
Thanks to Frederic Weisbecker for pointing this out.
v3: Made all register_* functions require data to be passed and
all callbacks to take a void * parameter as its first argument.
This makes the calling functions comply with C standards.
Also added more comments to the modifications of DECLARE_TRACE().
v2: Made the DECLARE_TRACE() have the ability to pass arguments
and added a new DECLARE_TRACE_NOARGS() for tracepoints that
do not need any arguments.
Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2010-04-20 21:04:50 +00:00
|
|
|
static void perf_syscall_enter(void *ignore, struct pt_regs *regs, long id)
|
2009-08-10 20:53:02 +00:00
|
|
|
{
|
|
|
|
|
struct syscall_metadata *sys_data;
|
2009-09-18 04:10:28 +00:00
|
|
|
struct syscall_trace_enter *rec;
|
2010-05-19 12:02:22 +00:00
|
|
|
struct hlist_head *head;
|
2009-08-10 20:53:02 +00:00
|
|
|
int syscall_nr;
|
2009-11-23 10:37:29 +00:00
|
|
|
int rctx;
|
2009-08-11 18:22:53 +00:00
|
|
|
int size;
|
2009-08-10 20:53:02 +00:00
|
|
|
|
|
|
|
|
syscall_nr = syscall_get_nr(current, regs);
|
2010-03-05 04:35:37 +00:00
|
|
|
if (!test_bit(syscall_nr, enabled_perf_enter_syscalls))
|
2009-08-10 20:53:02 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
sys_data = syscall_nr_to_meta(syscall_nr);
|
|
|
|
|
if (!sys_data)
|
|
|
|
|
return;
|
|
|
|
|
|
2009-08-11 18:22:53 +00:00
|
|
|
/* get the size after alignment with the u32 buffer size field */
|
|
|
|
|
size = sizeof(unsigned long) * sys_data->nb_args + sizeof(*rec);
|
|
|
|
|
size = ALIGN(size + sizeof(u32), sizeof(u64));
|
|
|
|
|
size -= sizeof(u32);
|
|
|
|
|
|
2010-03-05 04:35:37 +00:00
|
|
|
if (WARN_ONCE(size > PERF_MAX_TRACE_SIZE,
|
|
|
|
|
"perf buffer not large enough"))
|
2009-09-18 04:10:28 +00:00
|
|
|
return;
|
|
|
|
|
|
2010-03-05 04:35:37 +00:00
|
|
|
rec = (struct syscall_trace_enter *)perf_trace_buf_prepare(size,
|
2010-05-21 15:49:57 +00:00
|
|
|
sys_data->enter_event->event.type, regs, &rctx);
|
2010-01-28 01:32:29 +00:00
|
|
|
if (!rec)
|
|
|
|
|
return;
|
2009-09-18 04:10:28 +00:00
|
|
|
|
|
|
|
|
rec->nr = syscall_nr;
|
|
|
|
|
syscall_get_arguments(current, regs, 0, sys_data->nb_args,
|
|
|
|
|
(unsigned long *)&rec->args);
|
2010-05-19 12:02:22 +00:00
|
|
|
|
2010-05-21 10:31:09 +00:00
|
|
|
head = this_cpu_ptr(sys_data->enter_event->perf_events);
|
2010-05-19 12:02:22 +00:00
|
|
|
perf_trace_buf_submit(rec, size, rctx, 0, 1, regs, head);
|
2009-08-10 20:53:02 +00:00
|
|
|
}
|
|
|
|
|
|
2010-03-05 04:35:37 +00:00
|
|
|
int perf_sysenter_enable(struct ftrace_event_call *call)
|
2009-08-10 20:53:02 +00:00
|
|
|
{
|
|
|
|
|
int ret = 0;
|
|
|
|
|
int num;
|
|
|
|
|
|
2009-12-01 08:24:01 +00:00
|
|
|
num = ((struct syscall_metadata *)call->data)->syscall_nr;
|
2009-08-10 20:53:02 +00:00
|
|
|
|
|
|
|
|
mutex_lock(&syscall_trace_lock);
|
2010-03-05 04:35:37 +00:00
|
|
|
if (!sys_perf_refcount_enter)
|
tracing: Let tracepoints have data passed to tracepoint callbacks
This patch adds data to be passed to tracepoint callbacks.
The created functions from DECLARE_TRACE() now need a mandatory data
parameter. For example:
DECLARE_TRACE(mytracepoint, int value, value)
Will create the register function:
int register_trace_mytracepoint((void(*)(void *data, int value))probe,
void *data);
As the first argument, all callbacks (probes) must take a (void *data)
parameter. So a callback for the above tracepoint will look like:
void myprobe(void *data, int value)
{
}
The callback may choose to ignore the data parameter.
This change allows callbacks to register a private data pointer along
with the function probe.
void mycallback(void *data, int value);
register_trace_mytracepoint(mycallback, mydata);
Then the mycallback() will receive the "mydata" as the first parameter
before the args.
A more detailed example:
DECLARE_TRACE(mytracepoint, TP_PROTO(int status), TP_ARGS(status));
/* In the C file */
DEFINE_TRACE(mytracepoint, TP_PROTO(int status), TP_ARGS(status));
[...]
trace_mytracepoint(status);
/* In a file registering this tracepoint */
int my_callback(void *data, int status)
{
struct my_struct my_data = data;
[...]
}
[...]
my_data = kmalloc(sizeof(*my_data), GFP_KERNEL);
init_my_data(my_data);
register_trace_mytracepoint(my_callback, my_data);
The same callback can also be registered to the same tracepoint as long
as the data registered is different. Note, the data must also be used
to unregister the callback:
unregister_trace_mytracepoint(my_callback, my_data);
Because of the data parameter, tracepoints declared this way can not have
no args. That is:
DECLARE_TRACE(mytracepoint, TP_PROTO(void), TP_ARGS());
will cause an error.
If no arguments are needed, a new macro can be used instead:
DECLARE_TRACE_NOARGS(mytracepoint);
Since there are no arguments, the proto and args fields are left out.
This is part of a series to make the tracepoint footprint smaller:
text data bss dec hex filename
4913961 1088356 861512 6863829 68bbd5 vmlinux.orig
4914025 1088868 861512 6864405 68be15 vmlinux.class
4918492 1084612 861512 6864616 68bee8 vmlinux.tracepoint
Again, this patch also increases the size of the kernel, but
lays the ground work for decreasing it.
v5: Fixed net/core/drop_monitor.c to handle these updates.
v4: Moved the DECLARE_TRACE() DECLARE_TRACE_NOARGS out of the
#ifdef CONFIG_TRACE_POINTS, since the two are the same in both
cases. The __DECLARE_TRACE() is what changes.
Thanks to Frederic Weisbecker for pointing this out.
v3: Made all register_* functions require data to be passed and
all callbacks to take a void * parameter as its first argument.
This makes the calling functions comply with C standards.
Also added more comments to the modifications of DECLARE_TRACE().
v2: Made the DECLARE_TRACE() have the ability to pass arguments
and added a new DECLARE_TRACE_NOARGS() for tracepoints that
do not need any arguments.
Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2010-04-20 21:04:50 +00:00
|
|
|
ret = register_trace_sys_enter(perf_syscall_enter, NULL);
|
2009-08-10 20:53:02 +00:00
|
|
|
if (ret) {
|
|
|
|
|
pr_info("event trace: Could not activate"
|
|
|
|
|
"syscall entry trace point");
|
|
|
|
|
} else {
|
2010-03-05 04:35:37 +00:00
|
|
|
set_bit(num, enabled_perf_enter_syscalls);
|
|
|
|
|
sys_perf_refcount_enter++;
|
2009-08-10 20:53:02 +00:00
|
|
|
}
|
|
|
|
|
mutex_unlock(&syscall_trace_lock);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2010-03-05 04:35:37 +00:00
|
|
|
void perf_sysenter_disable(struct ftrace_event_call *call)
|
2009-08-10 20:53:02 +00:00
|
|
|
{
|
|
|
|
|
int num;
|
|
|
|
|
|
2009-12-01 08:24:01 +00:00
|
|
|
num = ((struct syscall_metadata *)call->data)->syscall_nr;
|
2009-08-10 20:53:02 +00:00
|
|
|
|
|
|
|
|
mutex_lock(&syscall_trace_lock);
|
2010-03-05 04:35:37 +00:00
|
|
|
sys_perf_refcount_enter--;
|
|
|
|
|
clear_bit(num, enabled_perf_enter_syscalls);
|
|
|
|
|
if (!sys_perf_refcount_enter)
|
tracing: Let tracepoints have data passed to tracepoint callbacks
This patch adds data to be passed to tracepoint callbacks.
The created functions from DECLARE_TRACE() now need a mandatory data
parameter. For example:
DECLARE_TRACE(mytracepoint, int value, value)
Will create the register function:
int register_trace_mytracepoint((void(*)(void *data, int value))probe,
void *data);
As the first argument, all callbacks (probes) must take a (void *data)
parameter. So a callback for the above tracepoint will look like:
void myprobe(void *data, int value)
{
}
The callback may choose to ignore the data parameter.
This change allows callbacks to register a private data pointer along
with the function probe.
void mycallback(void *data, int value);
register_trace_mytracepoint(mycallback, mydata);
Then the mycallback() will receive the "mydata" as the first parameter
before the args.
A more detailed example:
DECLARE_TRACE(mytracepoint, TP_PROTO(int status), TP_ARGS(status));
/* In the C file */
DEFINE_TRACE(mytracepoint, TP_PROTO(int status), TP_ARGS(status));
[...]
trace_mytracepoint(status);
/* In a file registering this tracepoint */
int my_callback(void *data, int status)
{
struct my_struct my_data = data;
[...]
}
[...]
my_data = kmalloc(sizeof(*my_data), GFP_KERNEL);
init_my_data(my_data);
register_trace_mytracepoint(my_callback, my_data);
The same callback can also be registered to the same tracepoint as long
as the data registered is different. Note, the data must also be used
to unregister the callback:
unregister_trace_mytracepoint(my_callback, my_data);
Because of the data parameter, tracepoints declared this way can not have
no args. That is:
DECLARE_TRACE(mytracepoint, TP_PROTO(void), TP_ARGS());
will cause an error.
If no arguments are needed, a new macro can be used instead:
DECLARE_TRACE_NOARGS(mytracepoint);
Since there are no arguments, the proto and args fields are left out.
This is part of a series to make the tracepoint footprint smaller:
text data bss dec hex filename
4913961 1088356 861512 6863829 68bbd5 vmlinux.orig
4914025 1088868 861512 6864405 68be15 vmlinux.class
4918492 1084612 861512 6864616 68bee8 vmlinux.tracepoint
Again, this patch also increases the size of the kernel, but
lays the ground work for decreasing it.
v5: Fixed net/core/drop_monitor.c to handle these updates.
v4: Moved the DECLARE_TRACE() DECLARE_TRACE_NOARGS out of the
#ifdef CONFIG_TRACE_POINTS, since the two are the same in both
cases. The __DECLARE_TRACE() is what changes.
Thanks to Frederic Weisbecker for pointing this out.
v3: Made all register_* functions require data to be passed and
all callbacks to take a void * parameter as its first argument.
This makes the calling functions comply with C standards.
Also added more comments to the modifications of DECLARE_TRACE().
v2: Made the DECLARE_TRACE() have the ability to pass arguments
and added a new DECLARE_TRACE_NOARGS() for tracepoints that
do not need any arguments.
Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2010-04-20 21:04:50 +00:00
|
|
|
unregister_trace_sys_enter(perf_syscall_enter, NULL);
|
2009-08-10 20:53:02 +00:00
|
|
|
mutex_unlock(&syscall_trace_lock);
|
|
|
|
|
}
|
|
|
|
|
|
tracing: Let tracepoints have data passed to tracepoint callbacks
This patch adds data to be passed to tracepoint callbacks.
The created functions from DECLARE_TRACE() now need a mandatory data
parameter. For example:
DECLARE_TRACE(mytracepoint, int value, value)
Will create the register function:
int register_trace_mytracepoint((void(*)(void *data, int value))probe,
void *data);
As the first argument, all callbacks (probes) must take a (void *data)
parameter. So a callback for the above tracepoint will look like:
void myprobe(void *data, int value)
{
}
The callback may choose to ignore the data parameter.
This change allows callbacks to register a private data pointer along
with the function probe.
void mycallback(void *data, int value);
register_trace_mytracepoint(mycallback, mydata);
Then the mycallback() will receive the "mydata" as the first parameter
before the args.
A more detailed example:
DECLARE_TRACE(mytracepoint, TP_PROTO(int status), TP_ARGS(status));
/* In the C file */
DEFINE_TRACE(mytracepoint, TP_PROTO(int status), TP_ARGS(status));
[...]
trace_mytracepoint(status);
/* In a file registering this tracepoint */
int my_callback(void *data, int status)
{
struct my_struct my_data = data;
[...]
}
[...]
my_data = kmalloc(sizeof(*my_data), GFP_KERNEL);
init_my_data(my_data);
register_trace_mytracepoint(my_callback, my_data);
The same callback can also be registered to the same tracepoint as long
as the data registered is different. Note, the data must also be used
to unregister the callback:
unregister_trace_mytracepoint(my_callback, my_data);
Because of the data parameter, tracepoints declared this way can not have
no args. That is:
DECLARE_TRACE(mytracepoint, TP_PROTO(void), TP_ARGS());
will cause an error.
If no arguments are needed, a new macro can be used instead:
DECLARE_TRACE_NOARGS(mytracepoint);
Since there are no arguments, the proto and args fields are left out.
This is part of a series to make the tracepoint footprint smaller:
text data bss dec hex filename
4913961 1088356 861512 6863829 68bbd5 vmlinux.orig
4914025 1088868 861512 6864405 68be15 vmlinux.class
4918492 1084612 861512 6864616 68bee8 vmlinux.tracepoint
Again, this patch also increases the size of the kernel, but
lays the ground work for decreasing it.
v5: Fixed net/core/drop_monitor.c to handle these updates.
v4: Moved the DECLARE_TRACE() DECLARE_TRACE_NOARGS out of the
#ifdef CONFIG_TRACE_POINTS, since the two are the same in both
cases. The __DECLARE_TRACE() is what changes.
Thanks to Frederic Weisbecker for pointing this out.
v3: Made all register_* functions require data to be passed and
all callbacks to take a void * parameter as its first argument.
This makes the calling functions comply with C standards.
Also added more comments to the modifications of DECLARE_TRACE().
v2: Made the DECLARE_TRACE() have the ability to pass arguments
and added a new DECLARE_TRACE_NOARGS() for tracepoints that
do not need any arguments.
Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2010-04-20 21:04:50 +00:00
|
|
|
static void perf_syscall_exit(void *ignore, struct pt_regs *regs, long ret)
|
2009-08-10 20:53:02 +00:00
|
|
|
{
|
|
|
|
|
struct syscall_metadata *sys_data;
|
2009-09-18 04:10:28 +00:00
|
|
|
struct syscall_trace_exit *rec;
|
2010-05-19 12:02:22 +00:00
|
|
|
struct hlist_head *head;
|
2009-08-10 20:53:02 +00:00
|
|
|
int syscall_nr;
|
2009-11-23 10:37:29 +00:00
|
|
|
int rctx;
|
2009-09-18 04:10:28 +00:00
|
|
|
int size;
|
2009-08-10 20:53:02 +00:00
|
|
|
|
|
|
|
|
syscall_nr = syscall_get_nr(current, regs);
|
2010-03-05 04:35:37 +00:00
|
|
|
if (!test_bit(syscall_nr, enabled_perf_exit_syscalls))
|
2009-08-10 20:53:02 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
sys_data = syscall_nr_to_meta(syscall_nr);
|
|
|
|
|
if (!sys_data)
|
|
|
|
|
return;
|
|
|
|
|
|
2009-09-18 04:10:28 +00:00
|
|
|
/* We can probably do that at build time */
|
|
|
|
|
size = ALIGN(sizeof(*rec) + sizeof(u32), sizeof(u64));
|
|
|
|
|
size -= sizeof(u32);
|
2009-08-11 18:22:53 +00:00
|
|
|
|
2009-09-18 04:10:28 +00:00
|
|
|
/*
|
|
|
|
|
* Impossible, but be paranoid with the future
|
|
|
|
|
* How to put this check outside runtime?
|
|
|
|
|
*/
|
2010-03-05 04:35:37 +00:00
|
|
|
if (WARN_ONCE(size > PERF_MAX_TRACE_SIZE,
|
|
|
|
|
"exit event has grown above perf buffer size"))
|
2009-09-18 04:10:28 +00:00
|
|
|
return;
|
|
|
|
|
|
2010-03-05 04:35:37 +00:00
|
|
|
rec = (struct syscall_trace_exit *)perf_trace_buf_prepare(size,
|
2010-05-21 15:49:57 +00:00
|
|
|
sys_data->exit_event->event.type, regs, &rctx);
|
2010-01-28 01:32:29 +00:00
|
|
|
if (!rec)
|
|
|
|
|
return;
|
2009-09-18 04:10:28 +00:00
|
|
|
|
|
|
|
|
rec->nr = syscall_nr;
|
|
|
|
|
rec->ret = syscall_get_return_value(current, regs);
|
|
|
|
|
|
2010-05-21 10:31:09 +00:00
|
|
|
head = this_cpu_ptr(sys_data->exit_event->perf_events);
|
2010-05-19 12:02:22 +00:00
|
|
|
perf_trace_buf_submit(rec, size, rctx, 0, 1, regs, head);
|
2009-08-10 20:53:02 +00:00
|
|
|
}
|
|
|
|
|
|
2010-03-05 04:35:37 +00:00
|
|
|
int perf_sysexit_enable(struct ftrace_event_call *call)
|
2009-08-10 20:53:02 +00:00
|
|
|
{
|
|
|
|
|
int ret = 0;
|
|
|
|
|
int num;
|
|
|
|
|
|
2009-12-01 08:24:01 +00:00
|
|
|
num = ((struct syscall_metadata *)call->data)->syscall_nr;
|
2009-08-10 20:53:02 +00:00
|
|
|
|
|
|
|
|
mutex_lock(&syscall_trace_lock);
|
2010-03-05 04:35:37 +00:00
|
|
|
if (!sys_perf_refcount_exit)
|
tracing: Let tracepoints have data passed to tracepoint callbacks
This patch adds data to be passed to tracepoint callbacks.
The created functions from DECLARE_TRACE() now need a mandatory data
parameter. For example:
DECLARE_TRACE(mytracepoint, int value, value)
Will create the register function:
int register_trace_mytracepoint((void(*)(void *data, int value))probe,
void *data);
As the first argument, all callbacks (probes) must take a (void *data)
parameter. So a callback for the above tracepoint will look like:
void myprobe(void *data, int value)
{
}
The callback may choose to ignore the data parameter.
This change allows callbacks to register a private data pointer along
with the function probe.
void mycallback(void *data, int value);
register_trace_mytracepoint(mycallback, mydata);
Then the mycallback() will receive the "mydata" as the first parameter
before the args.
A more detailed example:
DECLARE_TRACE(mytracepoint, TP_PROTO(int status), TP_ARGS(status));
/* In the C file */
DEFINE_TRACE(mytracepoint, TP_PROTO(int status), TP_ARGS(status));
[...]
trace_mytracepoint(status);
/* In a file registering this tracepoint */
int my_callback(void *data, int status)
{
struct my_struct my_data = data;
[...]
}
[...]
my_data = kmalloc(sizeof(*my_data), GFP_KERNEL);
init_my_data(my_data);
register_trace_mytracepoint(my_callback, my_data);
The same callback can also be registered to the same tracepoint as long
as the data registered is different. Note, the data must also be used
to unregister the callback:
unregister_trace_mytracepoint(my_callback, my_data);
Because of the data parameter, tracepoints declared this way can not have
no args. That is:
DECLARE_TRACE(mytracepoint, TP_PROTO(void), TP_ARGS());
will cause an error.
If no arguments are needed, a new macro can be used instead:
DECLARE_TRACE_NOARGS(mytracepoint);
Since there are no arguments, the proto and args fields are left out.
This is part of a series to make the tracepoint footprint smaller:
text data bss dec hex filename
4913961 1088356 861512 6863829 68bbd5 vmlinux.orig
4914025 1088868 861512 6864405 68be15 vmlinux.class
4918492 1084612 861512 6864616 68bee8 vmlinux.tracepoint
Again, this patch also increases the size of the kernel, but
lays the ground work for decreasing it.
v5: Fixed net/core/drop_monitor.c to handle these updates.
v4: Moved the DECLARE_TRACE() DECLARE_TRACE_NOARGS out of the
#ifdef CONFIG_TRACE_POINTS, since the two are the same in both
cases. The __DECLARE_TRACE() is what changes.
Thanks to Frederic Weisbecker for pointing this out.
v3: Made all register_* functions require data to be passed and
all callbacks to take a void * parameter as its first argument.
This makes the calling functions comply with C standards.
Also added more comments to the modifications of DECLARE_TRACE().
v2: Made the DECLARE_TRACE() have the ability to pass arguments
and added a new DECLARE_TRACE_NOARGS() for tracepoints that
do not need any arguments.
Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2010-04-20 21:04:50 +00:00
|
|
|
ret = register_trace_sys_exit(perf_syscall_exit, NULL);
|
2009-08-10 20:53:02 +00:00
|
|
|
if (ret) {
|
|
|
|
|
pr_info("event trace: Could not activate"
|
2010-02-24 07:40:22 +00:00
|
|
|
"syscall exit trace point");
|
2009-08-10 20:53:02 +00:00
|
|
|
} else {
|
2010-03-05 04:35:37 +00:00
|
|
|
set_bit(num, enabled_perf_exit_syscalls);
|
|
|
|
|
sys_perf_refcount_exit++;
|
2009-08-10 20:53:02 +00:00
|
|
|
}
|
|
|
|
|
mutex_unlock(&syscall_trace_lock);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2010-03-05 04:35:37 +00:00
|
|
|
void perf_sysexit_disable(struct ftrace_event_call *call)
|
2009-08-10 20:53:02 +00:00
|
|
|
{
|
|
|
|
|
int num;
|
|
|
|
|
|
2009-12-01 08:24:01 +00:00
|
|
|
num = ((struct syscall_metadata *)call->data)->syscall_nr;
|
2009-08-10 20:53:02 +00:00
|
|
|
|
|
|
|
|
mutex_lock(&syscall_trace_lock);
|
2010-03-05 04:35:37 +00:00
|
|
|
sys_perf_refcount_exit--;
|
|
|
|
|
clear_bit(num, enabled_perf_exit_syscalls);
|
|
|
|
|
if (!sys_perf_refcount_exit)
|
tracing: Let tracepoints have data passed to tracepoint callbacks
This patch adds data to be passed to tracepoint callbacks.
The created functions from DECLARE_TRACE() now need a mandatory data
parameter. For example:
DECLARE_TRACE(mytracepoint, int value, value)
Will create the register function:
int register_trace_mytracepoint((void(*)(void *data, int value))probe,
void *data);
As the first argument, all callbacks (probes) must take a (void *data)
parameter. So a callback for the above tracepoint will look like:
void myprobe(void *data, int value)
{
}
The callback may choose to ignore the data parameter.
This change allows callbacks to register a private data pointer along
with the function probe.
void mycallback(void *data, int value);
register_trace_mytracepoint(mycallback, mydata);
Then the mycallback() will receive the "mydata" as the first parameter
before the args.
A more detailed example:
DECLARE_TRACE(mytracepoint, TP_PROTO(int status), TP_ARGS(status));
/* In the C file */
DEFINE_TRACE(mytracepoint, TP_PROTO(int status), TP_ARGS(status));
[...]
trace_mytracepoint(status);
/* In a file registering this tracepoint */
int my_callback(void *data, int status)
{
struct my_struct my_data = data;
[...]
}
[...]
my_data = kmalloc(sizeof(*my_data), GFP_KERNEL);
init_my_data(my_data);
register_trace_mytracepoint(my_callback, my_data);
The same callback can also be registered to the same tracepoint as long
as the data registered is different. Note, the data must also be used
to unregister the callback:
unregister_trace_mytracepoint(my_callback, my_data);
Because of the data parameter, tracepoints declared this way can not have
no args. That is:
DECLARE_TRACE(mytracepoint, TP_PROTO(void), TP_ARGS());
will cause an error.
If no arguments are needed, a new macro can be used instead:
DECLARE_TRACE_NOARGS(mytracepoint);
Since there are no arguments, the proto and args fields are left out.
This is part of a series to make the tracepoint footprint smaller:
text data bss dec hex filename
4913961 1088356 861512 6863829 68bbd5 vmlinux.orig
4914025 1088868 861512 6864405 68be15 vmlinux.class
4918492 1084612 861512 6864616 68bee8 vmlinux.tracepoint
Again, this patch also increases the size of the kernel, but
lays the ground work for decreasing it.
v5: Fixed net/core/drop_monitor.c to handle these updates.
v4: Moved the DECLARE_TRACE() DECLARE_TRACE_NOARGS out of the
#ifdef CONFIG_TRACE_POINTS, since the two are the same in both
cases. The __DECLARE_TRACE() is what changes.
Thanks to Frederic Weisbecker for pointing this out.
v3: Made all register_* functions require data to be passed and
all callbacks to take a void * parameter as its first argument.
This makes the calling functions comply with C standards.
Also added more comments to the modifications of DECLARE_TRACE().
v2: Made the DECLARE_TRACE() have the ability to pass arguments
and added a new DECLARE_TRACE_NOARGS() for tracepoints that
do not need any arguments.
Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2010-04-20 21:04:50 +00:00
|
|
|
unregister_trace_sys_exit(perf_syscall_exit, NULL);
|
2009-08-10 20:53:02 +00:00
|
|
|
mutex_unlock(&syscall_trace_lock);
|
|
|
|
|
}
|
|
|
|
|
|
2009-12-21 06:27:35 +00:00
|
|
|
#endif /* CONFIG_PERF_EVENTS */
|
2009-08-10 20:53:02 +00:00
|
|
|
|
2010-04-21 16:27:06 +00:00
|
|
|
static int syscall_enter_register(struct ftrace_event_call *event,
|
|
|
|
|
enum trace_reg type)
|
|
|
|
|
{
|
|
|
|
|
switch (type) {
|
|
|
|
|
case TRACE_REG_REGISTER:
|
|
|
|
|
return reg_event_syscall_enter(event);
|
|
|
|
|
case TRACE_REG_UNREGISTER:
|
|
|
|
|
unreg_event_syscall_enter(event);
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_PERF_EVENTS
|
|
|
|
|
case TRACE_REG_PERF_REGISTER:
|
|
|
|
|
return perf_sysenter_enable(event);
|
|
|
|
|
case TRACE_REG_PERF_UNREGISTER:
|
|
|
|
|
perf_sysenter_disable(event);
|
|
|
|
|
return 0;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int syscall_exit_register(struct ftrace_event_call *event,
|
|
|
|
|
enum trace_reg type)
|
|
|
|
|
{
|
|
|
|
|
switch (type) {
|
|
|
|
|
case TRACE_REG_REGISTER:
|
|
|
|
|
return reg_event_syscall_exit(event);
|
|
|
|
|
case TRACE_REG_UNREGISTER:
|
|
|
|
|
unreg_event_syscall_exit(event);
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_PERF_EVENTS
|
|
|
|
|
case TRACE_REG_PERF_REGISTER:
|
|
|
|
|
return perf_sysexit_enable(event);
|
|
|
|
|
case TRACE_REG_PERF_UNREGISTER:
|
|
|
|
|
perf_sysexit_disable(event);
|
|
|
|
|
return 0;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
