trace_syscalls: Add syscall_nr field to struct syscall_metadata
Add syscall_nr field to struct syscall_metadata, it helps us to get syscall number easier. Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com> Acked-by: Jason Baron <jbaron@redhat.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Frederic Weisbecker <fweisbec@gmail.com> LKML-Reference: <4B14D293.6090800@cn.fujitsu.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
committed by
Ingo Molnar
parent
fcc19438dd
commit
c252f65793
@@ -161,7 +161,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \
|
|||||||
static int init_enter_##sname(struct ftrace_event_call *call) \
|
static int init_enter_##sname(struct ftrace_event_call *call) \
|
||||||
{ \
|
{ \
|
||||||
int num, id; \
|
int num, id; \
|
||||||
num = syscall_name_to_nr("sys"#sname); \
|
num = __syscall_meta_##sname.syscall_nr; \
|
||||||
if (num < 0) \
|
if (num < 0) \
|
||||||
return -ENOSYS; \
|
return -ENOSYS; \
|
||||||
id = register_ftrace_event(&enter_syscall_print_##sname);\
|
id = register_ftrace_event(&enter_syscall_print_##sname);\
|
||||||
@@ -197,7 +197,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \
|
|||||||
static int init_exit_##sname(struct ftrace_event_call *call) \
|
static int init_exit_##sname(struct ftrace_event_call *call) \
|
||||||
{ \
|
{ \
|
||||||
int num, id; \
|
int num, id; \
|
||||||
num = syscall_name_to_nr("sys"#sname); \
|
num = __syscall_meta_##sname.syscall_nr; \
|
||||||
if (num < 0) \
|
if (num < 0) \
|
||||||
return -ENOSYS; \
|
return -ENOSYS; \
|
||||||
id = register_ftrace_event(&exit_syscall_print_##sname);\
|
id = register_ftrace_event(&exit_syscall_print_##sname);\
|
||||||
|
@@ -12,6 +12,7 @@
|
|||||||
* A syscall entry in the ftrace syscalls array.
|
* A syscall entry in the ftrace syscalls array.
|
||||||
*
|
*
|
||||||
* @name: name of the syscall
|
* @name: name of the syscall
|
||||||
|
* @syscall_nr: number of the syscall
|
||||||
* @nb_args: number of parameters it takes
|
* @nb_args: number of parameters it takes
|
||||||
* @types: list of types as strings
|
* @types: list of types as strings
|
||||||
* @args: list of args as strings (args[i] matches types[i])
|
* @args: list of args as strings (args[i] matches types[i])
|
||||||
@@ -20,6 +21,7 @@
|
|||||||
*/
|
*/
|
||||||
struct syscall_metadata {
|
struct syscall_metadata {
|
||||||
const char *name;
|
const char *name;
|
||||||
|
int syscall_nr;
|
||||||
int nb_args;
|
int nb_args;
|
||||||
const char **types;
|
const char **types;
|
||||||
const char **args;
|
const char **args;
|
||||||
@@ -30,7 +32,6 @@ struct syscall_metadata {
|
|||||||
|
|
||||||
#ifdef CONFIG_FTRACE_SYSCALLS
|
#ifdef CONFIG_FTRACE_SYSCALLS
|
||||||
extern unsigned long arch_syscall_addr(int nr);
|
extern unsigned long arch_syscall_addr(int nr);
|
||||||
extern int syscall_name_to_nr(const char *name);
|
|
||||||
|
|
||||||
extern int syscall_enter_format(struct ftrace_event_call *call,
|
extern int syscall_enter_format(struct ftrace_event_call *call,
|
||||||
struct trace_seq *s);
|
struct trace_seq *s);
|
||||||
|
@@ -51,7 +51,7 @@ static struct syscall_metadata *syscall_nr_to_meta(int nr)
|
|||||||
return syscalls_metadata[nr];
|
return syscalls_metadata[nr];
|
||||||
}
|
}
|
||||||
|
|
||||||
int syscall_name_to_nr(const char *name)
|
static int syscall_name_to_nr(const char *name)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
@@ -342,10 +342,8 @@ int reg_event_syscall_enter(struct ftrace_event_call *call)
|
|||||||
{
|
{
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
int num;
|
int num;
|
||||||
const char *name;
|
|
||||||
|
|
||||||
name = ((struct syscall_metadata *)call->data)->name;
|
num = ((struct syscall_metadata *)call->data)->syscall_nr;
|
||||||
num = syscall_name_to_nr(name);
|
|
||||||
if (num < 0 || num >= NR_syscalls)
|
if (num < 0 || num >= NR_syscalls)
|
||||||
return -ENOSYS;
|
return -ENOSYS;
|
||||||
mutex_lock(&syscall_trace_lock);
|
mutex_lock(&syscall_trace_lock);
|
||||||
@@ -365,10 +363,8 @@ int reg_event_syscall_enter(struct ftrace_event_call *call)
|
|||||||
void unreg_event_syscall_enter(struct ftrace_event_call *call)
|
void unreg_event_syscall_enter(struct ftrace_event_call *call)
|
||||||
{
|
{
|
||||||
int num;
|
int num;
|
||||||
const char *name;
|
|
||||||
|
|
||||||
name = ((struct syscall_metadata *)call->data)->name;
|
num = ((struct syscall_metadata *)call->data)->syscall_nr;
|
||||||
num = syscall_name_to_nr(name);
|
|
||||||
if (num < 0 || num >= NR_syscalls)
|
if (num < 0 || num >= NR_syscalls)
|
||||||
return;
|
return;
|
||||||
mutex_lock(&syscall_trace_lock);
|
mutex_lock(&syscall_trace_lock);
|
||||||
@@ -383,10 +379,8 @@ int reg_event_syscall_exit(struct ftrace_event_call *call)
|
|||||||
{
|
{
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
int num;
|
int num;
|
||||||
const char *name;
|
|
||||||
|
|
||||||
name = ((struct syscall_metadata *)call->data)->name;
|
num = ((struct syscall_metadata *)call->data)->syscall_nr;
|
||||||
num = syscall_name_to_nr(name);
|
|
||||||
if (num < 0 || num >= NR_syscalls)
|
if (num < 0 || num >= NR_syscalls)
|
||||||
return -ENOSYS;
|
return -ENOSYS;
|
||||||
mutex_lock(&syscall_trace_lock);
|
mutex_lock(&syscall_trace_lock);
|
||||||
@@ -406,10 +400,8 @@ int reg_event_syscall_exit(struct ftrace_event_call *call)
|
|||||||
void unreg_event_syscall_exit(struct ftrace_event_call *call)
|
void unreg_event_syscall_exit(struct ftrace_event_call *call)
|
||||||
{
|
{
|
||||||
int num;
|
int num;
|
||||||
const char *name;
|
|
||||||
|
|
||||||
name = ((struct syscall_metadata *)call->data)->name;
|
num = ((struct syscall_metadata *)call->data)->syscall_nr;
|
||||||
num = syscall_name_to_nr(name);
|
|
||||||
if (num < 0 || num >= NR_syscalls)
|
if (num < 0 || num >= NR_syscalls)
|
||||||
return;
|
return;
|
||||||
mutex_lock(&syscall_trace_lock);
|
mutex_lock(&syscall_trace_lock);
|
||||||
@@ -436,6 +428,10 @@ int __init init_ftrace_syscalls(void)
|
|||||||
for (i = 0; i < NR_syscalls; i++) {
|
for (i = 0; i < NR_syscalls; i++) {
|
||||||
addr = arch_syscall_addr(i);
|
addr = arch_syscall_addr(i);
|
||||||
meta = find_syscall_meta(addr);
|
meta = find_syscall_meta(addr);
|
||||||
|
if (!meta)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
meta->syscall_nr = i;
|
||||||
syscalls_metadata[i] = meta;
|
syscalls_metadata[i] = meta;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user