lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 18 Dec 2018 06:11:07 -0800 From: tip-bot for Arnaldo Carvalho de Melo <tipbot@...or.com> To: linux-tip-commits@...r.kernel.org Cc: linux-kernel@...r.kernel.org, namhyung@...nel.org, hpa@...or.com, dsahern@...il.com, wangnan0@...wei.com, treeze.taeung@...il.com, jolsa@...nel.org, mingo@...nel.org, tglx@...utronix.de, adrian.hunter@...el.com, acme@...hat.com Subject: [tip:perf/core] perf trace: We need to consider "nr" if "__syscall_nr" is not there Commit-ID: 42da438c1bc4ad9b904401aff03678ddbf1329b0 Gitweb: https://git.kernel.org/tip/42da438c1bc4ad9b904401aff03678ddbf1329b0 Author: Arnaldo Carvalho de Melo <acme@...hat.com> AuthorDate: Wed, 5 Dec 2018 13:08:11 -0300 Committer: Arnaldo Carvalho de Melo <acme@...hat.com> CommitDate: Mon, 17 Dec 2018 14:57:02 -0300 perf trace: We need to consider "nr" if "__syscall_nr" is not there To cope with older kernels that don't have this patch backported: 026842d148b9 ("tracing/syscalls: Rename "/format" tracepoint field name "nr" to "__syscall_nr:") This makes 'perf trace' work again in RHEL7 kernels. Cc: Taeung Song <treeze.taeung@...il.com> Cc: Adrian Hunter <adrian.hunter@...el.com> Cc: David Ahern <dsahern@...il.com> Cc: Jiri Olsa <jolsa@...nel.org> Cc: Namhyung Kim <namhyung@...nel.org> Cc: Wang Nan <wangnan0@...wei.com> Link: https://lkml.kernel.org/n/tip-6h1syw2isegnhb1bjmtr9x9k@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com> --- tools/perf/builtin-trace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 2a347ed7bdf4..98aff12af9e6 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -258,7 +258,8 @@ static int perf_evsel__init_syscall_tp(struct perf_evsel *evsel) struct syscall_tp *sc = evsel->priv = malloc(sizeof(struct syscall_tp)); if (evsel->priv != NULL) { - if (perf_evsel__init_tp_uint_field(evsel, &sc->id, "__syscall_nr")) + if (perf_evsel__init_tp_uint_field(evsel, &sc->id, "__syscall_nr") && + perf_evsel__init_tp_uint_field(evsel, &sc->id, "nr")) goto out_delete; return 0; }
Powered by blists - more mailing lists