linux-kernel - [tip:perf/urgent] perf data: Don't store auxtrace index for directory data file

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

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-cd3dd8dd8ff62374d90cb3f2e54b8c94106c7810@git.kernel.org>
Date:   Fri, 22 Mar 2019 15:03:54 -0700
From:   tip-bot for Jiri Olsa <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     alexander.shishkin@...ux.intel.com, tglx@...utronix.de,
        hpa@...or.com, mingo@...nel.org, jolsa@...nel.org,
        eranian@...gle.com, alexey.budankov@...ux.intel.com,
        adrian.hunter@...el.com, linux-kernel@...r.kernel.org,
        peterz@...radead.org, acme@...hat.com, ak@...ux.intel.com,
        namhyung@...nel.org
Subject: [tip:perf/urgent] perf data: Don't store auxtrace index for
 directory data file

Commit-ID:  cd3dd8dd8ff62374d90cb3f2e54b8c94106c7810
Gitweb:     https://git.kernel.org/tip/cd3dd8dd8ff62374d90cb3f2e54b8c94106c7810
Author:     Jiri Olsa <jolsa@...nel.org>
AuthorDate: Fri, 8 Mar 2019 14:47:36 +0100
Committer:  Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Mon, 11 Mar 2019 11:56:03 -0300

perf data: Don't store auxtrace index for directory data file

We can't store the auxtrace index when we store into multiple files,
because we keep only offset for it, not the file.

The auxtrace data will be processed correctly in the 'pipe' mode.

Signed-off-by: Jiri Olsa <jolsa@...nel.org>
Cc: Adrian Hunter <adrian.hunter@...el.com>
Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
Cc: Alexey Budankov <alexey.budankov@...ux.intel.com>
Cc: Andi Kleen <ak@...ux.intel.com>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Stephane Eranian <eranian@...gle.com>
Link: http://lkml.kernel.org/r/20190308134745.5057-3-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
 tools/perf/builtin-record.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index f3f7f3100336..e983c8d71a79 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -392,7 +392,7 @@ static int record__process_auxtrace(struct perf_tool *tool,
 	size_t padding;
 	u8 pad[8] = {0};
 
-	if (!perf_data__is_pipe(data)) {
+	if (!perf_data__is_pipe(data) && !perf_data__is_dir(data)) {
 		off_t file_offset;
 		int fd = perf_data__fd(data);
 		int err;