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: Mon, 07 Oct 2019 14:49:15 -0000 From: "tip-bot2 for Steve MacLean" <tip-bot2@...utronix.de> To: linux-tip-commits@...r.kernel.org Cc: stable@...r.kernel.org, #@...-bot2.tec.linutronix.de, v4.6+@...-bot2.tec.linutronix.de, Steve MacLean <Steve.MacLean@...rosoft.com>, Jiri Olsa <jolsa@...nel.org>, Alexander Shishkin <alexander.shishkin@...ux.intel.com>, Andi Kleen <ak@...ux.intel.com>, Brian Robbins <brianrob@...rosoft.com>, Davidlohr Bueso <dave@...olabs.net>, "Eric Saint-Etienne" <eric.saint.etienne@...cle.com>, John Keeping <john@...anate.com>, John Salem <josalem@...rosoft.com>, Leo Yan <leo.yan@...aro.org>, Mark Rutland <mark.rutland@....com>, Namhyung Kim <namhyung@...nel.org>, Peter Zijlstra <peterz@...radead.org>, Song Liu <songliubraving@...com>, Stephane Eranian <eranian@...gle.com>, Tom McDonald <thomas.mcdonald@...rosoft.com>, Arnaldo Carvalho de Melo <acme@...hat.com>, Ingo Molnar <mingo@...nel.org>, Borislav Petkov <bp@...en8.de>, linux-kernel@...r.kernel.org Subject: [tip: perf/urgent] perf inject jit: Fix JIT_CODE_MOVE filename The following commit has been merged into the perf/urgent branch of tip: Commit-ID: b59711e9b0d22fd47abfa00602fd8c365cdd3ab7 Gitweb: https://git.kernel.org/tip/b59711e9b0d22fd47abfa00602fd8c365cdd3ab7 Author: Steve MacLean <Steve.MacLean@...rosoft.com> AuthorDate: Sat, 28 Sep 2019 01:41:18 Committer: Arnaldo Carvalho de Melo <acme@...hat.com> CommitterDate: Mon, 30 Sep 2019 17:29:49 -03:00 perf inject jit: Fix JIT_CODE_MOVE filename During perf inject --jit, JIT_CODE_MOVE records were injecting MMAP records with an incorrect filename. Specifically it was missing the ".so" suffix. Further the JIT_CODE_LOAD record were silently truncating the jr->load.code_index field to 32 bits before generating the filename. Make both records emit the same filename based on the full 64 bit code_index field. Fixes: 9b07e27f88b9 ("perf inject: Add jitdump mmap injection support") Cc: stable@...r.kernel.org # v4.6+ Signed-off-by: Steve MacLean <Steve.MacLean@...rosoft.com> Acked-by: Jiri Olsa <jolsa@...nel.org> Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com> Cc: Andi Kleen <ak@...ux.intel.com> Cc: Brian Robbins <brianrob@...rosoft.com> Cc: Davidlohr Bueso <dave@...olabs.net> Cc: Eric Saint-Etienne <eric.saint.etienne@...cle.com> Cc: John Keeping <john@...anate.com> Cc: John Salem <josalem@...rosoft.com> Cc: Leo Yan <leo.yan@...aro.org> Cc: Mark Rutland <mark.rutland@....com> Cc: Namhyung Kim <namhyung@...nel.org> Cc: Peter Zijlstra <peterz@...radead.org> Cc: Song Liu <songliubraving@...com> Cc: Stephane Eranian <eranian@...gle.com> Cc: Tom McDonald <thomas.mcdonald@...rosoft.com> Link: http://lore.kernel.org/lkml/BN8PR21MB1362FF8F127B31DBF4121528F7800@BN8PR21MB1362.namprd21.prod.outlook.com Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com> --- tools/perf/util/jitdump.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/jitdump.c b/tools/perf/util/jitdump.c index 1bdf4c6..e3ccb0c 100644 --- a/tools/perf/util/jitdump.c +++ b/tools/perf/util/jitdump.c @@ -395,7 +395,7 @@ static int jit_repipe_code_load(struct jit_buf_desc *jd, union jr_entry *jr) size_t size; u16 idr_size; const char *sym; - uint32_t count; + uint64_t count; int ret, csize, usize; pid_t pid, tid; struct { @@ -418,7 +418,7 @@ static int jit_repipe_code_load(struct jit_buf_desc *jd, union jr_entry *jr) return -1; filename = event->mmap2.filename; - size = snprintf(filename, PATH_MAX, "%s/jitted-%d-%u.so", + size = snprintf(filename, PATH_MAX, "%s/jitted-%d-%" PRIu64 ".so", jd->dir, pid, count); @@ -529,7 +529,7 @@ static int jit_repipe_code_move(struct jit_buf_desc *jd, union jr_entry *jr) return -1; filename = event->mmap2.filename; - size = snprintf(filename, PATH_MAX, "%s/jitted-%d-%"PRIu64, + size = snprintf(filename, PATH_MAX, "%s/jitted-%d-%" PRIu64 ".so", jd->dir, pid, jr->move.code_index);
Powered by blists - more mailing lists