perf trace: Forward error codes when trying to read syscall info

We iterate thru the syscall table produced from the kernel syscall
tables reading info, propagate the error and add to the debug message.

This helps in fixing further bugs, such as failing to read the
"sendfile" syscall info when it really should try the aliasm
"sendfile64".

  Problems reading syscall 40: 2 (No such file or directory)(sendfile) information

  # grep sendfile /tmp/build/perf/arch/x86/include/generated/asm/syscalls_64.c
	[40] = "sendfile",
  #

I.e. in the tracefs format file for the syscall tracepoints we have it
as sendfile64:

  # find /sys -type f -name format | grep sendfile
  /sys/kernel/debug/tracing/events/syscalls/sys_enter_sendfile64/format
  /sys/kernel/debug/tracing/events/syscalls/sys_exit_sendfile64/format
  #

But as "sendfile" in the file used to build the syscall table used in
perf:

  $ grep sendfile arch/x86/entry/syscalls/syscall_64.tbl
  40	common	sendfile		__x64_sys_sendfile64
  $

So we need to add, in followup patches, aliases in 'perf trace' syscall
data structures to cope with thie.

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-w3eluap63x9je0bb8o3t79tz@git.kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent cfa9ac73
...@@ -1492,13 +1492,13 @@ static int trace__read_syscall_info(struct trace *trace, int id) ...@@ -1492,13 +1492,13 @@ static int trace__read_syscall_info(struct trace *trace, int id)
const char *name = syscalltbl__name(trace->sctbl, id); const char *name = syscalltbl__name(trace->sctbl, id);
if (name == NULL) if (name == NULL)
return -1; 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));
if (nsyscalls == NULL) if (nsyscalls == NULL)
return -1; return -ENOMEM;
if (trace->syscalls.max != -1) { if (trace->syscalls.max != -1) {
memset(nsyscalls + trace->syscalls.max + 1, 0, memset(nsyscalls + trace->syscalls.max + 1, 0,
...@@ -1525,10 +1525,10 @@ static int trace__read_syscall_info(struct trace *trace, int id) ...@@ -1525,10 +1525,10 @@ static int trace__read_syscall_info(struct trace *trace, int id)
} }
if (syscall__alloc_arg_fmts(sc, IS_ERR(sc->tp_format) ? 6 : sc->tp_format->format.nr_fields)) if (syscall__alloc_arg_fmts(sc, IS_ERR(sc->tp_format) ? 6 : sc->tp_format->format.nr_fields))
return -1; return -ENOMEM;
if (IS_ERR(sc->tp_format)) if (IS_ERR(sc->tp_format))
return -1; return PTR_ERR(sc->tp_format);
sc->args = sc->tp_format->format.fields; sc->args = sc->tp_format->format.fields;
/* /*
...@@ -1789,6 +1789,7 @@ typedef int (*tracepoint_handler)(struct trace *trace, struct perf_evsel *evsel, ...@@ -1789,6 +1789,7 @@ typedef int (*tracepoint_handler)(struct trace *trace, struct perf_evsel *evsel,
static struct syscall *trace__syscall_info(struct trace *trace, static struct syscall *trace__syscall_info(struct trace *trace,
struct perf_evsel *evsel, int id) struct perf_evsel *evsel, int id)
{ {
int err = 0;
if (id < 0) { if (id < 0) {
...@@ -1811,9 +1812,10 @@ static struct syscall *trace__syscall_info(struct trace *trace, ...@@ -1811,9 +1812,10 @@ static struct syscall *trace__syscall_info(struct trace *trace,
} }
if ((id > trace->syscalls.max || trace->syscalls.table[id].name == NULL) && if ((id > trace->syscalls.max || trace->syscalls.table[id].name == NULL) &&
trace__read_syscall_info(trace, id)) (err = trace__read_syscall_info(trace, id)) != 0)
goto out_cant_read; goto out_cant_read;
err = -EINVAL;
if ((id > trace->syscalls.max || trace->syscalls.table[id].name == NULL)) if ((id > trace->syscalls.max || trace->syscalls.table[id].name == NULL))
goto out_cant_read; goto out_cant_read;
...@@ -1821,7 +1823,8 @@ static struct syscall *trace__syscall_info(struct trace *trace, ...@@ -1821,7 +1823,8 @@ static struct syscall *trace__syscall_info(struct trace *trace,
out_cant_read: out_cant_read:
if (verbose > 0) { if (verbose > 0) {
fprintf(trace->output, "Problems reading syscall %d", id); char sbuf[STRERR_BUFSIZE];
fprintf(trace->output, "Problems reading syscall %d: %d (%s)", id, -err, str_error_r(-err, sbuf, sizeof(sbuf)));
if (id <= trace->syscalls.max && trace->syscalls.table[id].name != NULL) if (id <= trace->syscalls.max && trace->syscalls.table[id].name != NULL)
fprintf(trace->output, "(%s)", trace->syscalls.table[id].name); fprintf(trace->output, "(%s)", trace->syscalls.table[id].name);
fputs(" information\n", trace->output); fputs(" information\n", trace->output);
......
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