perf tools: ensure return negitive value when write header error
PATCH 1/1 perf tools: ensure return negitive value when write header error
When 'perf record' write headers, it calls write_xxx in tools/perf/util/header.c, and check return value. It rolls back all working only when return value is negative.
This patch ensures write_cpudesc() and write_total_mem() return negative number when error. Without this patch, headers reported by 'perf report' header is error in some platform. Following output is caputured on ARM, which doesn't contain "Processor" field in /proc/cpuinfo. See "cpudesc", "total memory" and "cmdline" field.
bash-4.2# perf record ls
...
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.001 MB perf.data (~36 samples) ] bash-4.2# perf report --stdio --header
Error:
The perf.data file has no samples!
# ========
# captured on: Fri Sep 12 10:09:10 2014 # hostname : arma15el # os release : 3.17.0+ # perf version : 3.10.53 # arch : armv7l # nrcpus online : 4 # nrcpus avail : 1 # cpudesc : (null) # total memory : 0 kB # cmdline : # event : name = cycles, type = 0, config = 0x0, config1 = 0x0, config2 = 0x0, excl_usr = 0, excl_kern = 0, excl_host = 0, excl_guest = 1, precise_ip = 0 # pmu mappings: not available # ======== #
--- tools/perf/util/header.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
tools/perf/util/header.c +5 -2
@@ -605,8 +605,10 @@ static int write_cpudesc(int fd, struct perf_header *h __maybe_unused,break ; } -if (ret) +if (ret) { + ret =-1 ; goto done; + } s = buf;
@@ -950,7 +952,8 @@ static int write_total_mem(int fd, struct perf_header *h __maybe_unused, n =sscanf (buf,"%*s %" PRIu64, &mem);if (n ==1 ) ret =do_write (fd, &mem,sizeof (mem)); - } + }else + ret =-1 ;free (buf);fclose (fp);return ret;
Signature · 1 line
1.8.4
Quoted 33 lines · Wang Nan
When 'perf record' write headers, it calls
write_xxxintools/perf/util/header.c, and check return value. It rolls back all working only when return value is negative.This patch ensures
write_cpudesc()andwrite_total_mem()return negative number when error. Without this patch, headers reported by 'perf report' header is error in some platform. Following output is caputured on ARM, which doesn't contain "Processor" field in/proc/cpuinfo. See "cpudesc", "total memory" and "cmdline" field.bash-4.2# perf record ls
...
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.001 MB perf.data (~36 samples) ] bash-4.2# perf report --stdio --header
Error:
The perf.data file has no samples!
# ========# captured on: Fri Sep 12 10:09:10 2014 # hostname : arma15el # os release : 3.17.0+ # perf version : 3.10.53 # arch : armv7l # nrcpus online : 4 # nrcpus avail : 1 # cpudesc : (null) # total memory : 0 kB # cmdline : # event : name = cycles, type = 0, config = 0x0, config1 = 0x0, config2 = 0x0, excl_usr = 0, excl_kern = 0, excl_host = 0, excl_guest = 1, precise_ip = 0 # pmu mappings: not available # ======== #
Quoted 1 line
Signed-off-by Wang Nan <[email protected]>
I guess the total_memory, cmdline and pmu mappings are somehow affected by the broken cpudesc. Do they have their own problem on ARM?
Anyway I think it's good to check the result properly, so
Thanks,
Namhyung
Quoted 30 lines
--- tools/perf/util/header.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)tools/perf/util/header.c +5
-2@@ -605,8 +605,10 @@ static int write_cpudesc(int fd, struct perf_header *h __maybe_unused,break ; } -if (ret) +if (ret) { + ret =-1 ; goto done; + } s = buf;@@ -950,7 +952,8 @@ static int write_total_mem(int fd, struct perf_header *h __maybe_unused, n =sscanf (buf,"%*s %" PRIu64, &mem);if (n ==1 ) ret =do_write (fd, &mem,sizeof (mem)); - } + }else + ret =-1 ;free (buf);fclose (fp);return ret;
Quoted 34 lines · Namhyung Kim
Quoted 33 lines · Wang Nan
When 'perf record' write headers, it calls
write_xxxintools/perf/util/header.c, and check return value. It rolls back all working only when return value is negative.This patch ensures
write_cpudesc()andwrite_total_mem()return negative number when error. Without this patch, headers reported by 'perf report' header is error in some platform. Following output is caputured on ARM, which doesn't contain "Processor" field in/proc/cpuinfo. See "cpudesc", "total memory" and "cmdline" field.bash-4.2# perf record ls
...
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.001 MB perf.data (~36 samples) ] bash-4.2# perf report --stdio --header
Error:
The perf.data file has no samples!
# ========# captured on: Fri Sep 12 10:09:10 2014 # hostname : arma15el # os release : 3.17.0+ # perf version : 3.10.53 # arch : armv7l # nrcpus online : 4 # nrcpus avail : 1 # cpudesc : (null) # total memory : 0 kB # cmdline : # event : name = cycles, type = 0, config = 0x0, config1 = 0x0, config2 = 0x0, excl_usr = 0, excl_kern = 0, excl_host = 0, excl_guest = 1, precise_ip = 0 # pmu mappings: not available # ======== #
Quoted 5 lines
Quoted 1 line
Signed-off-by Wang Nan <[email protected]>I guess the
total_memory, cmdline and pmu mappings are somehow affected by the broken cpudesc. Do they have their own problem on ARM?
The buggy output is caused by cpudesc's problem. I didn't trigger their own problem on ARM because 'total memory' and cmdline are always success. I find the error in write_total_mem() by checking code by hand.
Thanks.
Quoted 38 lines
Anyway I think it's good to check the result properly, so
Acked-by Namhyung Kim <[email protected]>Thanks,
NamhyungQuoted 30 lines
--- tools/perf/util/header.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)tools/perf/util/header.c +5
-2@@ -605,8 +605,10 @@ static int write_cpudesc(int fd, struct perf_header *h __maybe_unused,break ; } -if (ret) +if (ret) { + ret =-1 ; goto done; + } s = buf;@@ -950,7 +952,8 @@ static int write_total_mem(int fd, struct perf_header *h __maybe_unused, n =sscanf (buf,"%*s %" PRIu64, &mem);if (n ==1 ) ret =do_write (fd, &mem,sizeof (mem)); - } + }else + ret =-1 ;free (buf);fclose (fp);return ret;
Hi Ingo,
Could you please collect this patch which fixes a perf problem?
Thanks.
Quoted 77 lines · Namhyung Kim
Quoted 33 lines · Wang Nan
When 'perf record' write headers, it calls
write_xxxintools/perf/util/header.c, and check return value. It rolls back all working only when return value is negative.This patch ensures
write_cpudesc()andwrite_total_mem()return negative number when error. Without this patch, headers reported by 'perf report' header is error in some platform. Following output is caputured on ARM, which doesn't contain "Processor" field in/proc/cpuinfo. See "cpudesc", "total memory" and "cmdline" field.bash-4.2# perf record ls
...
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.001 MB perf.data (~36 samples) ] bash-4.2# perf report --stdio --header
Error:
The perf.data file has no samples!
# ========# captured on: Fri Sep 12 10:09:10 2014 # hostname : arma15el # os release : 3.17.0+ # perf version : 3.10.53 # arch : armv7l # nrcpus online : 4 # nrcpus avail : 1 # cpudesc : (null) # total memory : 0 kB # cmdline : # event : name = cycles, type = 0, config = 0x0, config1 = 0x0, config2 = 0x0, excl_usr = 0, excl_kern = 0, excl_host = 0, excl_guest = 1, precise_ip = 0 # pmu mappings: not available # ======== #Quoted 1 line
Signed-off-by Wang Nan <[email protected]>I guess the
total_memory, cmdline and pmu mappings are somehow affected by the broken cpudesc. Do they have their own problem on ARM?Anyway I think it's good to check the result properly, so
Acked-by Namhyung Kim <[email protected]>Thanks,
NamhyungQuoted 30 lines
--- tools/perf/util/header.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)tools/perf/util/header.c +5
-2@@ -605,8 +605,10 @@ static int write_cpudesc(int fd, struct perf_header *h __maybe_unused,break ; } -if (ret) +if (ret) { + ret =-1 ; goto done; + } s = buf;@@ -950,7 +952,8 @@ static int write_total_mem(int fd, struct perf_header *h __maybe_unused, n =sscanf (buf,"%*s %" PRIu64, &mem);if (n ==1 ) ret =do_write (fd, &mem,sizeof (mem)); - } + }else + ret =-1 ;free (buf);fclose (fp);return ret;
Em Wed, Oct 22, 2014 at 04:00:12PM +0900, Namhyung Kim escreveu:
Quoted 34 lines · Wang Nan
Quoted 33 lines
When 'perf record' write headers, it calls
write_xxxintools/perf/util/header.c, and check return value. It rolls back all working only when return value is negative.This patch ensures
write_cpudesc()andwrite_total_mem()return negative number when error. Without this patch, headers reported by 'perf report' header is error in some platform. Following output is caputured on ARM, which doesn't contain "Processor" field in/proc/cpuinfo. See "cpudesc", "total memory" and "cmdline" field.bash-4.2# perf record ls
...
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.001 MB perf.data (~36 samples) ] bash-4.2# perf report --stdio --header
Error:
The perf.data file has no samples!
# ========# captured on: Fri Sep 12 10:09:10 2014 # hostname : arma15el # os release : 3.17.0+ # perf version : 3.10.53 # arch : armv7l # nrcpus online : 4 # nrcpus avail : 1 # cpudesc : (null) # total memory : 0 kB # cmdline : # event : name = cycles, type = 0, config = 0x0, config1 = 0x0, config2 = 0x0, excl_usr = 0, excl_kern = 0, excl_host = 0, excl_guest = 1, precise_ip = 0 # pmu mappings: not available # ======== #
Quoted 8 lines
Quoted 1 line
Signed-off-by Wang Nan <[email protected]>I guess the
total_memory, cmdline and pmu mappings are somehow affected by the broken cpudesc. Do they have their own problem on ARM?Anyway I think it's good to check the result properly, so
Acked-by Namhyung Kim <[email protected]>
Thanks, applied
- Arnaldo
tip-bot for Wang Nan
merge bot[tip:perf/core] perf tools: Ensure return negative value when write header error
In reply to Wang Nanperf tools: Ensure return negative value when write header error
Commit-ID: ed3077585f2f041e0db0fc41060b69673e98963b Gitweb: http://git.kernel.org/tip/ed3077585f2f041e0db0fc41060b69673e98963b Author: Wang Nan <[email protected]> AuthorDate: Thu, 16 Oct 2014 11:08:29 +0800 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 29 Oct 2014 10:32:48 -0200
perf tools: Ensure return negative value when write header error
When 'perf record' write headers, it calls write_xxx in tools/perf/util/header.c, and check return value. It rolls back all working only when return value is negative.
This patch ensures write_cpudesc() and write_total_mem() return negative number when error. Without this patch, headers reported by 'perf report' header is error in some platform. Following output is caputured on ARM, which doesn't contain "Processor" field in /proc/cpuinfo. See "cpudesc", "total memory" and "cmdline" field.
bash-4.2# perf record ls
...
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.001 MB perf.data (~36 samples) ] bash-4.2# perf report --stdio --header
Error:
The perf.data file has no samples!
# ========
# captured on: Fri Sep 12 10:09:10 2014 # hostname : arma15el # os release : 3.17.0+ # perf version : 3.10.53 # arch : armv7l # nrcpus online : 4 # nrcpus avail : 1 # cpudesc : (null) # total memory : 0 kB # cmdline : # event : name = cycles, type = 0, config = 0x0, config1 = 0x0, config2 = 0x0, excl_usr = 0, excl_kern = 0, excl_host = 0, excl_guest = 1, precise_ip = 0 # pmu mappings: not available # ======== #
--- tools/perf/util/header.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
tools/perf/util/header.c +5 -2
@@ -601,8 +601,10 @@ static int __write_cpudesc(int fd, const char *cpuinfo_proc)break ; } -if (ret) +if (ret) { + ret =-1 ; goto done; + } s = buf;
@@ -965,7 +967,8 @@ static int write_total_mem(int fd, struct perf_header *h __maybe_unused, n =sscanf (buf,"%*s %" PRIu64, &mem);if (n ==1 ) ret =do_write (fd, &mem,sizeof (mem)); - } + }else + ret =-1 ;free (buf);fclose (fp);return ret;