perf trace: Mark syscall ids that are not allocated to avoid unnecessary error messages

There are holes in syscall tables with IDs not associated with any
syscall, mark those when trying to read information for syscalls, which
could happen when iterating thru all syscalls from 0 to the highest
numbered syscall id.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Luis Cláudio Gonçalves <lclaudio@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-cku9mpcrcsqaiq0jepu86r68@git.kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 5d2bd889
...@@ -976,6 +976,7 @@ static struct syscall_fmt *syscall_fmt__find_by_alias(const char *alias) ...@@ -976,6 +976,7 @@ static struct syscall_fmt *syscall_fmt__find_by_alias(const char *alias)
* is_exit: is this "exit" or "exit_group"? * is_exit: is this "exit" or "exit_group"?
* is_open: is this "open" or "openat"? To associate the fd returned in sys_exit with the pathname in sys_enter. * is_open: is this "open" or "openat"? To associate the fd returned in sys_exit with the pathname in sys_enter.
* args_size: sum of the sizes of the syscall arguments, anything after that is augmented stuff: pathname for openat, etc. * args_size: sum of the sizes of the syscall arguments, anything after that is augmented stuff: pathname for openat, etc.
* nonexistent: Just a hole in the syscall table, syscall id not allocated
*/ */
struct syscall { struct syscall {
struct tep_event *tp_format; struct tep_event *tp_format;
...@@ -987,6 +988,7 @@ struct syscall { ...@@ -987,6 +988,7 @@ struct syscall {
} bpf_prog; } bpf_prog;
bool is_exit; bool is_exit;
bool is_open; bool is_open;
bool nonexistent;
struct tep_format_field *args; struct tep_format_field *args;
const char *name; const char *name;
struct syscall_fmt *fmt; struct syscall_fmt *fmt;
...@@ -1491,9 +1493,6 @@ static int trace__read_syscall_info(struct trace *trace, int id) ...@@ -1491,9 +1493,6 @@ static int trace__read_syscall_info(struct trace *trace, int id)
struct syscall *sc; struct syscall *sc;
const char *name = syscalltbl__name(trace->sctbl, id); const char *name = syscalltbl__name(trace->sctbl, id);
if (name == NULL)
return -EINVAL;
if (id > trace->syscalls.max) { if (id > trace->syscalls.max) {
struct syscall *nsyscalls = realloc(trace->syscalls.table, (id + 1) * sizeof(*sc)); struct syscall *nsyscalls = realloc(trace->syscalls.table, (id + 1) * sizeof(*sc));
...@@ -1512,8 +1511,15 @@ static int trace__read_syscall_info(struct trace *trace, int id) ...@@ -1512,8 +1511,15 @@ static int trace__read_syscall_info(struct trace *trace, int id)
} }
sc = trace->syscalls.table + id; sc = trace->syscalls.table + id;
sc->name = name; if (sc->nonexistent)
return 0;
if (name == NULL) {
sc->nonexistent = true;
return 0;
}
sc->name = name;
sc->fmt = syscall_fmt__find(sc->name); sc->fmt = syscall_fmt__find(sc->name);
snprintf(tp_name, sizeof(tp_name), "sys_enter_%s", sc->name); snprintf(tp_name, sizeof(tp_name), "sys_enter_%s", sc->name);
...@@ -1811,14 +1817,21 @@ static struct syscall *trace__syscall_info(struct trace *trace, ...@@ -1811,14 +1817,21 @@ static struct syscall *trace__syscall_info(struct trace *trace,
return NULL; return NULL;
} }
err = -EINVAL;
if ((id > trace->syscalls.max || trace->syscalls.table[id].name == NULL) && if ((id > trace->syscalls.max || trace->syscalls.table[id].name == NULL) &&
(err = trace__read_syscall_info(trace, id)) != 0) (err = trace__read_syscall_info(trace, id)) != 0)
goto out_cant_read; goto out_cant_read;
err = -EINVAL; if (id > trace->syscalls.max)
if ((id > trace->syscalls.max || trace->syscalls.table[id].name == NULL))
goto out_cant_read; goto out_cant_read;
if (trace->syscalls.table[id].name == NULL) {
if (trace->syscalls.table[id].nonexistent)
return NULL;
goto out_cant_read;
}
return &trace->syscalls.table[id]; return &trace->syscalls.table[id];
out_cant_read: out_cant_read:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment