perf record: Make per-cpu mmaps the default.
Adrian Hunter
reviewercover perf record: Make per-cpu mmaps the default.
Hi
Here are patches to use per-cpu mmaps
by default as requested by Ingo and Peter.
Adrian Hunter (4):
perf record: Make per-cpu mmaps the default.
perf tools: Allow '--inherit' as the negation of '--no-inherit' perf tools: Add option macro OPT_BOOLEAN_SET
perf record: Default -t option to no inheritance
tools/perf/Documentation/perf-record.txt | 12 +++++++----- tools/perf/builtin-record.c | 13 +++++++++---- tools/perf/perf.h | 1 + tools/perf/tests/attr/test-record-no-inherit | 2 +- tools/perf/util/evlist.c | 6 ++++-- tools/perf/util/evsel.c | 5 +++-- tools/perf/util/parse-options.c | 21 +++++++++++++++++++++ tools/perf/util/parse-options.h | 8 ++++++++ tools/perf/util/target.c | 11 ++++++++++- tools/perf/util/target.h | 4 +++- 10 files changed, 67 insertions(+), 16 deletions(-)
Regards
Adrian Hunter
Adrian Hunter
reviewerPATCH 4/4 perf record: Default -t option to no inheritance
The change to per-cpu mmaps causes the -p, -t and -u options now to have inheritance enabled by default. Change that back to no inheritance but for the -t option only.
--- tools/perf/Documentation/perf-record.txt | 2 ++ tools/perf/builtin-record.c | 8 ++++++-- tools/perf/perf.h | 1 + 3 files changed, 9 insertions(+), 2 deletions(-)
tools/perf/Documentation/perf-record.txt +2 -0
@@ -57,6 +57,8 @@ OPTIONS -t:: --tid=:: Record events on existing thread ID (comma separated list). + This option also disables inheritance by default. Enable it by adding + --inherit. -u:: --uid=::
tools/perf/builtin-record.c +6 -2
@@ -843,8 +843,9 @@ const struct option record_options[] = {OPT_U64 ('c' ,"count" , &record.opts.user_interval,"event period to sample" ),OPT_STRING ('o' ,"output" , &record.file.path,"file" ,"output file name" ), -OPT_BOOLEAN ('i' ,"no-inherit" , &record.opts.no_inherit, -"child tasks do not inherit counters" ), +OPT_BOOLEAN_SET ('i' ,"no-inherit" , &record.opts.no_inherit, + &record.opts.no_inherit_set, +"child tasks do not inherit counters" ),OPT_UINTEGER ('F' ,"freq" , &record.opts.user_freq,"profile at this frequency" ), OPT_CALLBACK('m', "mmap-pages", &record.opts.mmap_pages, "pages", "number of mmap data pages",
@@ -939,6 +940,9 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) goto out_symbol_exit; } +if (rec->opts.target.tid && !rec->opts.no_inherit_set) + rec->opts.no_inherit = true; + err =target__validate (&rec->opts.target);if (err) {target__strerror (&rec->opts.target, err, errbuf,BUFSIZ );
tools/perf/perf.h +1 -0
@@ -254,6 +254,7 @@ struct perf_record_opts {bool inherit_stat;bool no_delay;bool no_inherit; +bool no_inherit_set;bool no_samples;bool raw_samples;bool sample_address;
Signature · 1 line
1.7.11.7
Adrian Hunter
reviewerPATCH 3/4 perf tools: Add option macro OPT_BOOLEAN_SET
In reply to Adrian HunterOPT_BOOLEAN_SET records whether a boolean option was set by the user. That information can be used to change the default value for the option after the options have been parsed.
--- tools/perf/util/parse-options.c | 2 ++ tools/perf/util/parse-options.h | 8 ++++++++ 2 files changed, 10 insertions(+)
tools/perf/util/parse-options.c +2 -0
@@ -78,6 +78,8 @@ static int get_value(struct parse_opt_ctx_t *p,case OPTION_BOOLEAN : *(bool *)opt->value = unset ? false : true; +if (opt->set) + *(bool *)opt->set = true;return 0 ;case OPTION_INCR :
tools/perf/util/parse-options.h +8 -0
@@ -82,6 +82,9 @@ typedef int parse_opt_cb(const struct option *, const char *arg, int unset);* OPTION_{BIT,SET_UINT,SET_PTR} store the {mask,integer,pointer} to put in * the value when met. * CALLBACKS can use it like they want. +* +* `set`:: +* whether an option was set by the user */ struct option {enum parse_opt_type type;
@@ -94,6 +97,7 @@ struct option {int flags;parse_opt_cb *callback;intptr_t defval; +bool *set; };#define check_vtype (v, type) ( BUILD_BUG_ON_ZERO(!__builtin_types_compatible_p(typeof(v), type)) + v )
@@ -103,6 +107,10 @@ struct option {#define OPT_GROUP (h) { .type = OPTION_GROUP, .help = (h) }#define OPT_BIT (s, l, v, h, b) { .type = OPTION_BIT, .short_name = (s), .long_name = (l), .value = check_vtype(v, int *), .help = (h), .defval = (b) }#define OPT_BOOLEAN (s, l, v, h) { .type = OPTION_BOOLEAN, .short_name = (s), .long_name = (l), .value = check_vtype(v, bool *), .help = (h) } +#define OPT_BOOLEAN_SET (s, l, v, os, h) \ + { .type = OPTION_BOOLEAN, .short_name = (s), .long_name = (l), \ + .value = check_vtype(v, bool *), .help = (h), \ + .set = check_vtype(os, bool *)}#define OPT_INCR (s, l, v, h) { .type = OPTION_INCR, .short_name = (s), .long_name = (l), .value = check_vtype(v, int *), .help = (h) }#define OPT_SET_UINT (s, l, v, h, i) { .type = OPTION_SET_UINT, .short_name = (s), .long_name = (l), .value = check_vtype(v, unsigned int *), .help = (h), .defval = (i) }#define OPT_SET_PTR (s, l, v, h, p) { .type = OPTION_SET_PTR, .short_name = (s), .long_name = (l), .value = (v), .help = (h), .defval = (p) }
Signature · 1 line
1.7.11.7
Adrian Hunter
reviewerPATCH 2/4 perf tools: Allow '--inherit' as the negation of '--no-inherit'
In reply to Adrian HunterLong options can be negated by prefixing them with 'no-'. However options that already start with 'no-', such as '--no-inherit' result in ugly double 'no's. Avoid that by accepting that the removal of 'no-' also negates the long option.
--- tools/perf/util/parse-options.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
tools/perf/util/parse-options.c +19 -0
@@ -224,6 +224,24 @@ static int parse_long_opt(struct parse_opt_ctx_t *p, const char *arg,return 0 ; }if (!rest) { +if (!prefixcmp (options->long_name,"no-" )) { +/* +* The long name itself starts with "no-", so +* accept the option without "no-" so that users +* do not have to enter "no-no-" to get the +* negation. +*/ + rest =skip_prefix (arg, options->long_name +3 ); +if (rest) { + flags |=OPT_UNSET ; + goto match; + } +/* Abbreviated case */ +if (!prefixcmp (options->long_name +3 , arg)) { + flags |=OPT_UNSET ; + goto is_abbreviated; + } + }/* abbreviated? */ if (!strncmp (options->long_name, arg, arg_end - arg)) { is_abbreviated:
@@ -259,6 +277,7 @@ is_abbreviated:if (!rest)continue ; } +match:if (*rest) {if (*rest !='=' )continue ;
Signature · 1 line
1.7.11.7
Adrian Hunter
reviewerPATCH 1/4 perf record: Make per-cpu mmaps the default.
In reply to Adrian HunterThis affects the -p, -t and -u options that
previously defaulted to per-thread mmaps.
A side-effect is that inheritance is
automatically enabled by default. A later
patch will disable it by default for the -t
option.
Consequently add an option to select
per-thread mmaps to support the old
behaviour.
Note that per-thread can be used with a
workload-only (i.e. none of -p, -t, -u,
-a or -C is selected) to get a per-thread
mmap with no inheritance.
--- tools/perf/Documentation/perf-record.txt | 10 +++++----- tools/perf/builtin-record.c | 5 +++-- tools/perf/tests/attr/test-record-no-inherit | 2 +- tools/perf/util/evlist.c | 6 ++++-- tools/perf/util/evsel.c | 5 +++-- tools/perf/util/target.c | 11 ++++++++++- tools/perf/util/target.h | 4 +++- 7 files changed, 29 insertions(+), 14 deletions(-)
tools/perf/Documentation/perf-record.txt +5 -5
@@ -201,11 +201,11 @@ abort events and some memory events in precise mode on modern Intel CPUs. --transaction:: Record transaction flags for transaction related events. ---force-per-cpu:: -Force the use of per-cpu mmaps. By default, when tasks are specified (i.e. -p, --t or -u options) per-thread mmaps are created. This option overrides that and -forces per-cpu mmaps. A side-effect of that is that inheritance is -automatically enabled. Add the -i option also to disable inheritance. +--per-thread:: +Use per-thread mmaps. By default per-cpu mmaps are created. This option +overrides that and uses per-thread mmaps. A side-effect of that is that +inheritance is automatically disabled. --per-thread is ignored with a warning +if combined with -a or -C options. SEE ALSO --------
tools/perf/builtin-record.c +3 -2
@@ -800,6 +800,7 @@ static struct perf_record record = { .freq = 4000, .target = { .uses_mmap = true, + .default_per_cpu = true, }, }, };
@@ -888,8 +889,8 @@ const struct option record_options[] = { "sample by weight (on special events only)"),OPT_BOOLEAN (0 ,"transaction" , &record.opts.sample_transaction,"sample transaction flags (special events only)" ), -OPT_BOOLEAN (0 ,"force-per-cpu" , &record.opts.target.force_per_cpu, -"force the use of per-cpu mmaps" ), +OPT_BOOLEAN (0 ,"per-thread" , &record.opts.target.per_thread, +"use per-thread mmaps" ), OPT_END() };
tools/perf/tests/attr/test-record-no-inherit +1 -1
@@ -3,5 +3,5 @@ command = record args = -i kill >/dev/null 2>&1 [event:base-record] -sample_type=259 +sample_type=263 inherit=0
tools/perf/util/evlist.c +4 -2
@@ -819,8 +819,10 @@ int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target)if (evlist->threads ==NULL )return -1 ; -if (target->force_per_cpu) - evlist->cpus =cpu_map__new (target->cpu_list); +if (target->default_per_cpu) + evlist->cpus = target->per_thread ? +cpu_map__dummy_new () : +cpu_map__new (target->cpu_list);else if (target__has_task (target)) evlist->cpus =cpu_map__dummy_new ();else if (!target__has_cpu (target) && !target->uses_mmap)
tools/perf/util/evsel.c +3 -2
@@ -572,6 +572,7 @@ void perf_evsel__config(struct perf_evsel *evsel,struct perf_evsel *leader = evsel->leader;struct perf_event_attr *attr = &evsel->attr;int track = !evsel->idx;/* only the first counter needs these */ +bool per_cpu = opts->target.default_per_cpu && !opts->target.per_thread; attr->sample_id_all = perf_missing_features.sample_id_all ?0 :1 ; attr->inherit = !opts->no_inherit;
@@ -645,7 +646,7 @@ void perf_evsel__config(struct perf_evsel *evsel, } } -if (target__has_cpu (&opts->target) || opts->target.force_per_cpu) +if (target__has_cpu (&opts->target))perf_evsel__set_sample_bit (evsel,CPU );if (opts->period)
@@ -653,7 +654,7 @@ void perf_evsel__config(struct perf_evsel *evsel,if (!perf_missing_features.sample_id_all && (opts->sample_time || !opts->no_inherit || -target__has_cpu (&opts->target) || opts->target.force_per_cpu)) +target__has_cpu (&opts->target) || per_cpu))perf_evsel__set_sample_bit (evsel,TIME );if (opts->raw_samples) {
tools/perf/util/target.c +10 -1
@@ -55,6 +55,13 @@ enum target_errno target__validate(struct target *target) ret =TARGET_ERRNO__UID_OVERRIDE_SYSTEM ; } +/* THREAD and SYSTEM/CPU are mutually exclusive */ +if (target->per_thread && (target->system_wide || target->cpu_list)) { + target->per_thread = false; +if (ret ==TARGET_ERRNO__SUCCESS ) + ret =TARGET_ERRNO__SYSTEM_OVERRIDE_THREAD ; + } +return ret; }
@@ -100,6 +107,7 @@ static const char *target__error_str[] = {"UID switch overriding CPU" ,"PID/TID switch overriding SYSTEM" ,"UID switch overriding SYSTEM" , +"SYSTEM/CPU switch overriding PER-THREAD" ,"Invalid User: %s" , "Problems obtaining information for user %s", };
@@ -131,7 +139,8 @@ int target__strerror(struct target *target, int errnum, msg = target__error_str[idx];switch (errnum) { - case TARGET_ERRNO__PID_OVERRIDE_CPU ... TARGET_ERRNO__UID_OVERRIDE_SYSTEM: + case TARGET_ERRNO__PID_OVERRIDE_CPU ... +TARGET_ERRNO__SYSTEM_OVERRIDE_THREAD :snprintf (buf, buflen,"%s" , msg);break ;
tools/perf/util/target.h +3 -1
@@ -12,7 +12,8 @@ struct target {uid_t uid;bool system_wide;bool uses_mmap; -bool force_per_cpu; +bool default_per_cpu; +bool per_thread; };enum target_errno {
@@ -33,6 +34,7 @@ enum target_errno {TARGET_ERRNO__UID_OVERRIDE_CPU ,TARGET_ERRNO__PID_OVERRIDE_SYSTEM ,TARGET_ERRNO__UID_OVERRIDE_SYSTEM , +TARGET_ERRNO__SYSTEM_OVERRIDE_THREAD ,/* for target__parse_uid() */ TARGET_ERRNO__INVALID_UID,
Signature · 1 line
1.7.11.7
Re: [PATCH 2/4] perf tools: Allow '--inherit' as the negation of '--no-inherit'
In reply to Adrian HunterQuoted 6 lines · Adrian Hunter
Long options can be negated by prefixing them with 'no-'. However options that already start with 'no-', such as '--no-inherit' result in ugly double 'no's. Avoid that by accepting that the removal of 'no-' also negates the long option.
Why not cleanup the options for the commands and move all of the no-xxxx to just xxxx? Anyone using no-xxxx would still just work by the existing code.
David
Adrian Hunter
reviewerRe: [PATCH 2/4] perf tools: Allow '--inherit' as the negation of '--no-inherit'
Quoted 10 lines · David Ahern
Quoted 6 lines · Adrian Hunter
Long options can be negated by prefixing them with 'no-'. However options that already start with 'no-', such as '--no-inherit' result in ugly double 'no's. Avoid that by accepting that the removal of 'no-' also negates the long option.
Why not cleanup the options for the commands and move all of the no-xxxx to just xxxx? Anyone using no-xxxx would still just work by the existing code.
Interesting idea but the short and long options are a combination, and short options don't work the same way e.g. -i and --no-inherit go together.
Re: [PATCH 2/4] perf tools: Allow '--inherit' as the negation of '--no-inherit'
Quoted 7 lines · Adrian Hunter
Quoted 2 lines · David Ahern
Why not cleanup the options for the commands and move all of the no-xxxx to just xxxx? Anyone using no-xxxx would still just work by the existing code.
Interesting idea but the short and long options are a combination, and short options don't work the same way e.g. -i and --no-inherit go together.
If inherit is on by default and -i / --inherit is the option then -i is a no-op and --no-inherit disables it. That's the same effect has having inherit on by default and an option to disable it called --no-inherit.
David
Adrian Hunter
reviewerRe: [PATCH 2/4] perf tools: Allow '--inherit' as the negation of '--no-inherit'
Quoted 5 lines · David Ahern
Quoted 4 lines · Adrian Hunter
Quoted 2 lines · David Ahern
Why not cleanup the options for the commands and move all of the no-xxxx to just xxxx? Anyone using no-xxxx would still just work by the existing code.
Quoted 7 lines
Quoted 3 lines
Interesting idea but the short and long options are a combination, and short options don't work the same way e.g. -i and --no-inherit go together.
If inherit is on by default and -i / --inherit is the option then -i is a no-op and --no-inherit disables it. That's the same effect has having inherit on by default and an option to disable it called --no-inherit.
Well, if you are going to change the meaning of -i and deny the users a short option to disable inheritance, then it is no longer a cleanup - it is a functional change.
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf tools: Add option macro OPT_BOOLEAN_SET
In reply to Adrian Hunterperf tools: Add option macro OPT_BOOLEAN_SET
Commit-ID: 167faf32b07fc47637048fbcbdfcf4a89481686d Gitweb: http://git.kernel.org/tip/167faf32b07fc47637048fbcbdfcf4a89481686d Author: Adrian Hunter <[email protected]> AuthorDate: Mon, 18 Nov 2013 11:55:56 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 27 Nov 2013 14:58:36 -0300
perf tools: Add option macro OPT_BOOLEAN_SET
OPT_BOOLEAN_SET records whether a boolean option was set by the user.
That information can be used to change the default value for the option after the options have been parsed.
--- tools/perf/util/parse-options.c | 2 ++ tools/perf/util/parse-options.h | 8 ++++++++ 2 files changed, 10 insertions(+)
tools/perf/util/parse-options.c +2 -0
@@ -78,6 +78,8 @@ static int get_value(struct parse_opt_ctx_t *p,case OPTION_BOOLEAN : *(bool *)opt->value = unset ? false : true; +if (opt->set) + *(bool *)opt->set = true;return 0 ;case OPTION_INCR :
tools/perf/util/parse-options.h +8 -0
@@ -82,6 +82,9 @@ typedef int parse_opt_cb(const struct option *, const char *arg, int unset);* OPTION_{BIT,SET_UINT,SET_PTR} store the {mask,integer,pointer} to put in * the value when met. * CALLBACKS can use it like they want. +* +* `set`:: +* whether an option was set by the user */ struct option {enum parse_opt_type type;
@@ -94,6 +97,7 @@ struct option {int flags;parse_opt_cb *callback;intptr_t defval; +bool *set; };#define check_vtype (v, type) ( BUILD_BUG_ON_ZERO(!__builtin_types_compatible_p(typeof(v), type)) + v )
@@ -103,6 +107,10 @@ struct option {#define OPT_GROUP (h) { .type = OPTION_GROUP, .help = (h) }#define OPT_BIT (s, l, v, h, b) { .type = OPTION_BIT, .short_name = (s), .long_name = (l), .value = check_vtype(v, int *), .help = (h), .defval = (b) }#define OPT_BOOLEAN (s, l, v, h) { .type = OPTION_BOOLEAN, .short_name = (s), .long_name = (l), .value = check_vtype(v, bool *), .help = (h) } +#define OPT_BOOLEAN_SET (s, l, v, os, h) \ + { .type = OPTION_BOOLEAN, .short_name = (s), .long_name = (l), \ + .value = check_vtype(v, bool *), .help = (h), \ + .set = check_vtype(os, bool *)}#define OPT_INCR (s, l, v, h) { .type = OPTION_INCR, .short_name = (s), .long_name = (l), .value = check_vtype(v, int *), .help = (h) }#define OPT_SET_UINT (s, l, v, h, i) { .type = OPTION_SET_UINT, .short_name = (s), .long_name = (l), .value = check_vtype(v, unsigned int *), .help = (h), .defval = (i) }#define OPT_SET_PTR (s, l, v, h, p) { .type = OPTION_SET_PTR, .short_name = (s), .long_name = (l), .value = (v), .help = (h), .defval = (p) }
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf record: Default -t option to no inheritance
In reply to Adrian Hunterperf record: Default -t option to no inheritance
Commit-ID: 69e7e5b02bc6a9e5cf4a54911b27ca133cc1f99f Gitweb: http://git.kernel.org/tip/69e7e5b02bc6a9e5cf4a54911b27ca133cc1f99f Author: Adrian Hunter <[email protected]> AuthorDate: Mon, 18 Nov 2013 11:55:57 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 27 Nov 2013 14:58:36 -0300
perf record: Default -t option to no inheritance
The change to per-cpu mmaps causes the -p, -t and -u options now to have inheritance enabled by default. Change that back to no inheritance but for the -t option only.
--- tools/perf/Documentation/perf-record.txt | 2 ++ tools/perf/builtin-record.c | 8 ++++++-- tools/perf/perf.h | 1 + 3 files changed, 9 insertions(+), 2 deletions(-)
tools/perf/Documentation/perf-record.txt +2 -0
@@ -57,6 +57,8 @@ OPTIONS -t:: --tid=:: Record events on existing thread ID (comma separated list). + This option also disables inheritance by default. Enable it by adding + --inherit. -u:: --uid=::
tools/perf/builtin-record.c +6 -2
@@ -843,8 +843,9 @@ const struct option record_options[] = {OPT_U64 ('c' ,"count" , &record.opts.user_interval,"event period to sample" ),OPT_STRING ('o' ,"output" , &record.file.path,"file" ,"output file name" ), -OPT_BOOLEAN ('i' ,"no-inherit" , &record.opts.no_inherit, -"child tasks do not inherit counters" ), +OPT_BOOLEAN_SET ('i' ,"no-inherit" , &record.opts.no_inherit, + &record.opts.no_inherit_set, +"child tasks do not inherit counters" ),OPT_UINTEGER ('F' ,"freq" , &record.opts.user_freq,"profile at this frequency" ), OPT_CALLBACK('m', "mmap-pages", &record.opts.mmap_pages, "pages", "number of mmap data pages",
@@ -939,6 +940,9 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) goto out_symbol_exit; } +if (rec->opts.target.tid && !rec->opts.no_inherit_set) + rec->opts.no_inherit = true; + err =target__validate (&rec->opts.target);if (err) {target__strerror (&rec->opts.target, err, errbuf,BUFSIZ );
tools/perf/perf.h +1 -0
@@ -254,6 +254,7 @@ struct perf_record_opts {bool inherit_stat;bool no_delay;bool no_inherit; +bool no_inherit_set;bool no_samples;bool raw_samples;bool sample_address;
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf tools: Allow '--inherit' as the negation of '--no-inherit'
In reply to Adrian Hunterperf tools: Allow '--inherit' as the negation of '--no-inherit'
Commit-ID: 4bc437964ef540462bd15af4a713da62961809aa Gitweb: http://git.kernel.org/tip/4bc437964ef540462bd15af4a713da62961809aa Author: Adrian Hunter <[email protected]> AuthorDate: Mon, 18 Nov 2013 11:55:55 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 27 Nov 2013 14:58:36 -0300
perf tools: Allow '--inherit' as the negation of '--no-inherit'
Long options can be negated by prefixing them with 'no-'. However options that already start with 'no-', such as '--no-inherit' result in ugly double 'no's.
Avoid that by accepting that the removal of 'no-' also negates the long option.
--- tools/perf/util/parse-options.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
tools/perf/util/parse-options.c +19 -0
@@ -224,6 +224,24 @@ static int parse_long_opt(struct parse_opt_ctx_t *p, const char *arg,return 0 ; }if (!rest) { +if (!prefixcmp (options->long_name,"no-" )) { +/* +* The long name itself starts with "no-", so +* accept the option without "no-" so that users +* do not have to enter "no-no-" to get the +* negation. +*/ + rest =skip_prefix (arg, options->long_name +3 ); +if (rest) { + flags |=OPT_UNSET ; + goto match; + } +/* Abbreviated case */ +if (!prefixcmp (options->long_name +3 , arg)) { + flags |=OPT_UNSET ; + goto is_abbreviated; + } + }/* abbreviated? */ if (!strncmp (options->long_name, arg, arg_end - arg)) { is_abbreviated:
@@ -259,6 +277,7 @@ is_abbreviated:if (!rest)continue ; } +match:if (*rest) {if (*rest !='=' )continue ;