perf tools: Fixup for removing -f option in perf record
Namhyung Kim
maintainerPATCH 1/1 perf tools: Fixup for removing -f option in perf record
From: Namhyung Kim <[email protected]>
The commit bf3da4014a0c ("perf record: Remove -f/--force option") got rid of -f option from perf record. But this option was used internally by various sub-commands so they wouldn't work anymore. Also update the example document not to use -f option.
--- tools/perf/Documentation/examples.txt | 4 ++-- tools/perf/builtin-kmem.c | 2 +- tools/perf/builtin-lock.c | 2 +- tools/perf/builtin-sched.c | 1 - tools/perf/builtin-timechart.c | 4 ++-- 5 files changed, 6 insertions(+), 7 deletions(-)
tools/perf/Documentation/examples.txt +2 -2
@@ -66,7 +66,7 @@ Furthermore, these tracepoints can be used to sample the workload as well. For example the page allocations done by a 'git gc' can be captured the following way: - titan:~/git> perf record -f -e kmem:mm_page_alloc -c 1 ./git gc + titan:~/git> perf record -e kmem:mm_page_alloc -c 1 ./git gc Counting objects: 1148, done. Delta compression using up to 2 threads. Compressing objects: 100% (450/450), done.
@@ -120,7 +120,7 @@ Furthermore, call-graph sampling can be done too, of page allocations - to see precisely what kind of page allocations there are: - titan:~/git> perf record -f -g -e kmem:mm_page_alloc -c 1 ./git gc + titan:~/git> perf record -g -e kmem:mm_page_alloc -c 1 ./git gc Counting objects: 1148, done. Delta compression using up to 2 threads. Compressing objects: 100% (450/450), done.
tools/perf/builtin-kmem.c +1 -1
@@ -708,7 +708,7 @@ static int parse_line_opt(const struct option *opt __maybe_unused,static int __cmd_record (int argc,const char **argv) {const char *const record_args[] = { -"record" ,"-a" ,"-R" ,"-f" ,"-c" ,"1" , +"record" ,"-a" ,"-R" ,"-c" ,"1" ,"-e" ,"kmem:kmalloc" ,"-e" ,"kmem:kmalloc_node" ,"-e" ,"kmem:kfree" ,
tools/perf/builtin-lock.c +1 -1
@@ -878,7 +878,7 @@ static int __cmd_report(void)static int __cmd_record (int argc,const char **argv) {const char *record_args[] = { -"record" ,"-R" ,"-f" ,"-m" ,"1024" ,"-c" ,"1" , +"record" ,"-R" ,"-m" ,"1024" ,"-c" ,"1" , };unsigned int rec_argc, i, j;const char **rec_argv;
tools/perf/builtin-sched.c +0 -1
@@ -1632,7 +1632,6 @@ static int __cmd_record(int argc, const char **argv)"record" ,"-a" ,"-R" , -"-f" ,"-m" ,"1024" ,"-c" ,"1" , "-e", "sched:sched_switch",
tools/perf/builtin-timechart.c +2 -2
@@ -1005,7 +1005,7 @@ static int __cmd_record(int argc, const char **argv) {#ifdef SUPPORT_OLD_POWER_EVENTS const char *const record_old_args[] = { -"record" ,"-a" ,"-R" ,"-f" ,"-c" ,"1" , +"record" ,"-a" ,"-R" ,"-c" ,"1" ,"-e" ,"power:power_start" ,"-e" ,"power:power_end" , "-e", "power:power_frequency",
@@ -1014,7 +1014,7 @@ static int __cmd_record(int argc, const char **argv) };#endif const char *const record_new_args[] = { -"record" ,"-a" ,"-R" ,"-f" ,"-c" ,"1" , +"record" ,"-a" ,"-R" ,"-c" ,"1" ,"-e" ,"power:cpu_frequency" ,"-e" ,"power:cpu_idle" ,"-e" ,"sched:sched_wakeup" ,
Signature · 1 line
1.7.11.7
Peter Zijlstra
maintainerQuoted 6 lines · Namhyung Kim
From: Namhyung Kim <[email protected]>
The commit
bf3da4014a0c("perf record: Remove -f/--force option") got rid of -f option from perf record. But this option was used internally by various sub-commands so they wouldn't work anymore. Also update the example document not to use -f option.
Oh man.. we got rid of -f? Do we now default to over-write existing data file?
Quoted 10 lines · Peter Zijlstra
Quoted 6 lines · Namhyung Kim
From: Namhyung Kim <[email protected]>
The commit
bf3da4014a0c("perf record: Remove -f/--force option") got rid of -f option from perf record. But this option was used internally by various sub-commands so they wouldn't work anymore. Also update the example document not to use -f option.Oh man.. we got rid of -f? Do we now default to over-write existing data file?
I thought -f was the implied default for ages?
Thanks,
Ingo
Peter Zijlstra
maintainerQuoted 11 lines · Ingo Molnar
Quoted 8 lines · Peter Zijlstra
Quoted 6 lines · Namhyung Kim
From: Namhyung Kim <[email protected]>
The commit
bf3da4014a0c("perf record: Remove -f/--force option") got rid of -f option from perf record. But this option was used internally by various sub-commands so they wouldn't work anymore. Also update the example document not to use -f option.
Quoted 4 lines
Quoted 2 lines
Oh man.. we got rid of -f? Do we now default to over-write existing data file?
I thought -f was the implied default for ages?
OK.. I've been dutifully typing it all this while :-)
Quoted 12 lines · Peter Zijlstra
Quoted 11 lines · Ingo Molnar
Quoted 8 lines · Peter Zijlstra
Quoted 6 lines · Namhyung Kim
From: Namhyung Kim <[email protected]>
The commit
bf3da4014a0c("perf record: Remove -f/--force option") got rid of -f option from perf record. But this option was used internally by various sub-commands so they wouldn't work anymore. Also update the example document not to use -f option.
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Oh man.. we got rid of -f? Do we now default to over-write existing data file?
I thought -f was the implied default for ages?
OK.. I've been dutifully typing it all this while :-)
The '-f' option in record command had no affect.. myabe it got depreceated when we started to backup perf.data to perf.data.old..?
The report command bails out on following condition:
if (!force && input_stat.st_uid && (input_stat.st_uid != geteuid())) {jirka
Quoted 6 lines · Jiri Olsa
Quoted 3 lines
Quoted 1 line
I thought -f was the implied default for ages?
OK.. I've been dutifully typing it all this while :-)
The '-f' option in record command had no affect.. myabe it got depreceated when we started to backup perf.data to perf.data.old..?
Way back in 2010, 2.6.34 kernel - 7865e817 commit. I've been typing the -f for while too. Now about the need for the pesky -f on the analysis side....
David
Quoted 11 lines · David Ahern
Quoted 6 lines · Jiri Olsa
Quoted 3 lines
Quoted 1 line
I thought -f was the implied default for ages?
OK.. I've been dutifully typing it all this while :-)
The '-f' option in record command had no affect.. myabe it got depreceated when we started to backup perf.data to perf.data.old..?
Way back in 2010, 2.6.34 kernel -
7865e817commit. I've been typing the -f for while too. Now about the need for the pesky -f on the analysis side....
That's only needed when perf.data is owned by a different user, right?
Thanks,
Ingo
Quoted 8 lines · Ingo Molnar
Quoted 5 lines · David Ahern
Quoted 4 lines · Jiri Olsa
Quoted 3 lines
Quoted 1 line
I thought -f was the implied default for ages?
OK.. I've been dutifully typing it all this while :-)
Quoted 9 lines
Quoted 6 lines
Quoted 2 lines
The '-f' option in record command had no affect.. myabe it got depreceated when we started to backup perf.data to perf.data.old..?
Way back in 2010, 2.6.34 kernel -
7865e817commit. I've been typing the -f for while too. Now about the need for the pesky -f on the analysis side....That's only needed when perf.data is owned by a different user, right?
Yes, why not let file permissions dictate of uid x can read uid y files? Why does perf need to have that restriction? For example, QA collects the data files, developers analyze them.
David
Quoted 16 lines · David Ahern
Quoted 15 lines · Ingo Molnar
Quoted 11 lines · David Ahern
Quoted 6 lines · Jiri Olsa
Quoted 3 lines
Quoted 1 line
I thought -f was the implied default for ages?
OK.. I've been dutifully typing it all this while :-)
The '-f' option in record command had no affect.. myabe it got depreceated when we started to backup perf.data to perf.data.old..?
Way back in 2010, 2.6.34 kernel -
7865e817commit. I've been typing the -f for while too. Now about the need for the pesky -f on the analysis side....
Quoted 6 lines
Quoted 2 lines
That's only needed when perf.data is owned by a different user, right?
Yes, why not let file permissions dictate of uid x can read uid y files? Why does perf need to have that restriction? For example, QA collects the data files, developers analyze them.
So, the thinking behind that is that user should not be able to generate a malicious perf.data file and let root (or another user) run it accidentally.
( That presumes some sort of exploitable parsing bug or other buffer
overflow in perf. )
I don't feel terribly strongly about it though.
Thanks,
Ingo
Hi Arnaldo,
You may want to merge this patch too. :)
Thanks,
Namhyung
2013-06-27 오후 1:25, Namhyung Kim 쓴 글:
Quoted 100 lines
From: Namhyung Kim <[email protected]>
The commit
bf3da4014a0c("perf record: Remove -f/--force option") got rid of -f option from perf record. But this option was used internally by various sub-commands so they wouldn't work anymore. Also update the example document not to use -f option.Cc Jiri Olsa <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/Documentation/examples.txt | 4 ++-- tools/perf/builtin-kmem.c | 2 +- tools/perf/builtin-lock.c | 2 +- tools/perf/builtin-sched.c | 1 - tools/perf/builtin-timechart.c | 4 ++-- 5 files changed, 6 insertions(+), 7 deletions(-)tools/perf/Documentation/examples.txt +2
-2@@ -66,7 +66,7 @@ Furthermore, these tracepoints can be used to sample the workload as well. For example the page allocations done by a 'git gc' can be captured the following way: - titan:~/git> perf record -f -e kmem:mm_page_alloc -c 1 ./git gc + titan:~/git> perf record -e kmem:mm_page_alloc -c 1 ./git gc Counting objects: 1148, done. Delta compression using up to 2 threads. Compressing objects: 100% (450/450), done.@@ -120,7 +120,7 @@ Furthermore, call-graph sampling can be done too, of page allocations - to see precisely what kind of page allocations there are: - titan:~/git> perf record -f -g -e kmem:mm_page_alloc -c 1 ./git gc + titan:~/git> perf record -g -e kmem:mm_page_alloc -c 1 ./git gc Counting objects: 1148, done. Delta compression using up to 2 threads. Compressing objects: 100% (450/450), done.tools/perf/builtin-kmem.c +1
-1@@ -708,7 +708,7 @@ static int parse_line_opt(const struct option *opt __maybe_unused,static int __cmd_record (int argc,const char **argv) {const char *const record_args[] = { -"record" ,"-a" ,"-R" ,"-f" ,"-c" ,"1" , +"record" ,"-a" ,"-R" ,"-c" ,"1" ,"-e" ,"kmem:kmalloc" ,"-e" ,"kmem:kmalloc_node" ,"-e" ,"kmem:kfree" ,tools/perf/builtin-lock.c +1
-1@@ -878,7 +878,7 @@ static int __cmd_report(void)static int __cmd_record (int argc,const char **argv) {const char *record_args[] = { -"record" ,"-R" ,"-f" ,"-m" ,"1024" ,"-c" ,"1" , +"record" ,"-R" ,"-m" ,"1024" ,"-c" ,"1" , };unsigned int rec_argc, i, j;const char **rec_argv;tools/perf/builtin-sched.c +0
-1@@ -1632,7 +1632,6 @@ static int __cmd_record(int argc, const char **argv)"record" ,"-a" ,"-R" , -"-f" ,"-m" ,"1024" ,"-c" ,"1" , "-e", "sched:sched_switch",tools/perf/builtin-timechart.c +2
-2@@ -1005,7 +1005,7 @@ static int __cmd_record(int argc, const char **argv) {#ifdef SUPPORT_OLD_POWER_EVENTS const char *const record_old_args[] = { -"record" ,"-a" ,"-R" ,"-f" ,"-c" ,"1" , +"record" ,"-a" ,"-R" ,"-c" ,"1" ,"-e" ,"power:power_start" ,"-e" ,"power:power_end" , "-e", "power:power_frequency",@@ -1014,7 +1014,7 @@ static int __cmd_record(int argc, const char **argv) };#endif const char *const record_new_args[] = { -"record" ,"-a" ,"-R" ,"-f" ,"-c" ,"1" , +"record" ,"-a" ,"-R" ,"-c" ,"1" ,"-e" ,"power:cpu_frequency" ,"-e" ,"power:cpu_idle" ,"-e" ,"sched:sched_wakeup" ,
Quoted 4 lines · Namhyung Kim
Hi Arnaldo,
You may want to merge this patch too. :)
He did. See 77d03596 and the note:
[ combined patch removing the -f usage in various sub-commands, such
as 'perf sched', etc, by Namhyung Kim ]
David
Hi David,
2013-07-09 오후 11:21, David Ahern 쓴 글:
Quoted 10 lines · Namhyung Kim
Quoted 4 lines
Hi Arnaldo,
You may want to merge this patch too. :)
He did. See
77d03596and the note:[ combined patch removing the -f usage in various sub-commands, such
as 'perf sched', etc, by Namhyung Kim ]
Oops, I didn't notice this.
Thanks,
Namhyung
tip-bot for Jiri Olsa
merge bot[tip:perf/urgent] perf record: Remove -f/--force option
In reply to Namhyung Kimperf record: Remove -f/--force option
Commit-ID: 4a4d371a4dfbd3b84a7eab8d535d4c7c3647b09e Gitweb: http://git.kernel.org/tip/4a4d371a4dfbd3b84a7eab8d535d4c7c3647b09e Author: Jiri Olsa <[email protected]> AuthorDate: Wed, 5 Jun 2013 13:37:21 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 8 Jul 2013 17:37:25 -0300
perf record: Remove -f/--force option
It no longer have any affect on the processing and is marked as obsolete anyway.
--- tools/perf/Documentation/examples.txt | 4 ++-- tools/perf/Documentation/perf-record.txt | 4 ---- tools/perf/builtin-kmem.c | 2 +- tools/perf/builtin-lock.c | 2 +- tools/perf/builtin-record.c | 3 --- tools/perf/builtin-sched.c | 1 - tools/perf/builtin-timechart.c | 4 ++-- 7 files changed, 6 insertions(+), 14 deletions(-)
tools/perf/Documentation/examples.txt +2 -2
@@ -66,7 +66,7 @@ Furthermore, these tracepoints can be used to sample the workload as well. For example the page allocations done by a 'git gc' can be captured the following way: - titan:~/git> perf record -f -e kmem:mm_page_alloc -c 1 ./git gc + titan:~/git> perf record -e kmem:mm_page_alloc -c 1 ./git gc Counting objects: 1148, done. Delta compression using up to 2 threads. Compressing objects: 100% (450/450), done.
@@ -120,7 +120,7 @@ Furthermore, call-graph sampling can be done too, of page allocations - to see precisely what kind of page allocations there are: - titan:~/git> perf record -f -g -e kmem:mm_page_alloc -c 1 ./git gc + titan:~/git> perf record -g -e kmem:mm_page_alloc -c 1 ./git gc Counting objects: 1148, done. Delta compression using up to 2 threads. Compressing objects: 100% (450/450), done.
tools/perf/Documentation/perf-record.txt +0 -4
@@ -70,10 +70,6 @@ OPTIONS --no-delay:: Collect data without buffering. --f:: ---force:: - Overwrite existing data file. (deprecated) - -c:: --count=:: Event period to sample.
tools/perf/builtin-kmem.c +1 -1
@@ -708,7 +708,7 @@ static int parse_line_opt(const struct option *opt __maybe_unused,static int __cmd_record (int argc,const char **argv) {const char *const record_args[] = { -"record" ,"-a" ,"-R" ,"-f" ,"-c" ,"1" , +"record" ,"-a" ,"-R" ,"-c" ,"1" ,"-e" ,"kmem:kmalloc" ,"-e" ,"kmem:kmalloc_node" ,"-e" ,"kmem:kfree" ,
tools/perf/builtin-lock.c +1 -1
@@ -878,7 +878,7 @@ static int __cmd_report(void)static int __cmd_record (int argc,const char **argv) {const char *record_args[] = { -"record" ,"-R" ,"-f" ,"-m" ,"1024" ,"-c" ,"1" , +"record" ,"-R" ,"-m" ,"1024" ,"-c" ,"1" , };unsigned int rec_argc, i, j;const char **rec_argv;
tools/perf/builtin-record.c +0 -3
@@ -74,7 +74,6 @@ struct perf_record {int realtime_prio;bool no_buildid;bool no_buildid_cache; -bool force;long samples;off_t post_processing_offset; };
@@ -856,8 +855,6 @@ const struct option record_options[] = { "system-wide collection from all CPUs"),OPT_STRING ('C' ,"cpu" , &record.opts.target.cpu_list,"cpu" ,"list of cpus to monitor" ), -OPT_BOOLEAN ('f' ,"force" , &record.force, -"overwrite existing data file (deprecated)" ),OPT_U64 ('c' ,"count" , &record.opts.user_interval,"event period to sample" ),OPT_STRING ('o' ,"output" , &record.output_name,"file" , "output file name"),
tools/perf/builtin-sched.c +0 -1
@@ -1632,7 +1632,6 @@ static int __cmd_record(int argc, const char **argv)"record" ,"-a" ,"-R" , -"-f" ,"-m" ,"1024" ,"-c" ,"1" , "-e", "sched:sched_switch",
tools/perf/builtin-timechart.c +2 -2
@@ -1005,7 +1005,7 @@ static int __cmd_record(int argc, const char **argv) {#ifdef SUPPORT_OLD_POWER_EVENTS const char *const record_old_args[] = { -"record" ,"-a" ,"-R" ,"-f" ,"-c" ,"1" , +"record" ,"-a" ,"-R" ,"-c" ,"1" ,"-e" ,"power:power_start" ,"-e" ,"power:power_end" , "-e", "power:power_frequency",
@@ -1014,7 +1014,7 @@ static int __cmd_record(int argc, const char **argv) };#endif const char *const record_new_args[] = { -"record" ,"-a" ,"-R" ,"-f" ,"-c" ,"1" , +"record" ,"-a" ,"-R" ,"-c" ,"1" ,"-e" ,"power:cpu_frequency" ,"-e" ,"power:cpu_idle" ,"-e" ,"sched:sched_wakeup" ,