Commit 092bd3cd authored by Hendrik Brueckner's avatar Hendrik Brueckner Committed by Arnaldo Carvalho de Melo
Browse files

perf trace: Obtain errno strings by using arch_syscalls__strerrno() 



Replace the errno_to_name() from the audit-libs with the newly
introduced arch_syscalls__strerrno() function.

With this change:

1.  With replacing errno_to_name() from audit-libs, perf trace
    does no longer require audit-lib interfaces.

2. In addition to 1, the audit-libs dependency can be removed
   for architectures that support syscall tables in perf.
   This is achieved in a follow-up commit.

3. With the architecture specific errno number/name mapping,
   perf trace reports can work across architectures.

Signed-off-by: default avatarHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Reviewed-by: default avatarThomas Richter <tmricht@linux.vnet.ibm.com>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: linux-s390@vger.kernel.org
LPU-Reference: 1516352177-11106-5-git-send-email-brueckner@linux.vnet.ibm.com
Link: https://lkml.kernel.org/n/tip-xjvoqzhwmu4wn4kl9ng11rvs@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 0337cf74

tools/perf/builtin-trace.c

+11 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "builtin.h"

#include "util/color.h"

#include "util/debug.h"

#include "util/env.h"

#include "util/event.h"

#include "util/evlist.h"

#include <subcmd/exec-cmd.h>
@@ -45,14 +46,12 @@ 


#include <errno.h>

#include <inttypes.h>

#include <libaudit.h> /* FIXME: Still needed for audit_errno_to_name */

#include <poll.h>

#include <signal.h>

#include <stdlib.h>

#include <string.h>

#include <linux/err.h>

#include <linux/filter.h>

#include <linux/audit.h>

#include <linux/kernel.h>

#include <linux/random.h>

#include <linux/stringify.h>
@@ -545,6 +544,7 @@ static size_t syscall_arg__scnprintf_getrandom_flags(char *bf, size_t size, 
	  { .scnprintf	= SCA_STRARRAY, \

	    .parm	= &strarray__##array, }



#include "trace/beauty/arch_errno_names.c"

#include "trace/beauty/eventfd.c"

#include "trace/beauty/flock.c"

#include "trace/beauty/futex_op.c"
@@ -1660,6 +1660,14 @@ static int trace__fprintf_callchain(struct trace *trace, struct perf_sample *sam 
	return sample__fprintf_callchain(sample, 38, print_opts, &callchain_cursor, trace->output);

}



static const char *errno_to_name(struct perf_evsel *evsel, int err)

{

	struct perf_env *env = perf_evsel__env(evsel);

	const char *arch_name = perf_env__arch(env);



	return arch_syscalls__strerrno(arch_name, err);

}



static int trace__sys_exit(struct trace *trace, struct perf_evsel *evsel,

			   union perf_event *event __maybe_unused,

			   struct perf_sample *sample)
@@ -1730,7 +1738,7 @@ signed_print: 
errno_print: {

		char bf[STRERR_BUFSIZE];

		const char *emsg = str_error_r(-ret, bf, sizeof(bf)),

			   *e = audit_errno_to_name(-ret);

			   *e = errno_to_name(evsel, -ret);



		fprintf(trace->output, ") = -1 %s %s", e, emsg);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE