perf tools: Fix gaps propagating maps
Adrian Hunter
reviewerv3 cover perf tools: Fix gaps propagating maps
Hi
Here is V3 of "Fix gaps propagating maps" that fixes some problems revealed by to d988d5ee6478 ("perf evlist: Open event on evsel cpus and threads")
Changes in V3:
perf tools: Remove redundant validation from perf_evlist__propagate_maps
perf_evlist__set_maps also doesn't need to return an error anymore
perf tools: Add evlist->has_user_cpus
Adjusted due to perf_evlist__set_maps change
perf tools: Make perf_evlist__create_maps() use perf_evlist__set_maps()
Adjusted due to perf_evlist__set_maps change
perf tools: Fix perf_evlist__create_syswide_maps() not propagating maps
Adjusted due to perf_evlist__set_maps change
perf tools: Fix task exit test setting maps
Adjusted due to perf_evlist__set_maps change
perf tools: Fix software clock events test setting maps
Adjusted due to perf_evlist__set_maps change
Changes in V2:
Split into multiple patches
Add evsel->own_cpus to identify evsels with their own cpu map And consequently don't need to unpropagate
perf tools: Fix perf_evlist__splice_list_tail not setting evlist
New patch
perf tools: Fix task exit test setting maps
New patch
perf tools: Fix software clock events test setting maps
New patch
Adrian Hunter (14):
perf tools: Simplify perf_evlist__propagate_maps logic
perf tools: Simplify perf_evlist__set_maps logic
perf tools: Remove redundant validation from perf_evlist__propagate_maps perf tools: Add evlist->has_user_cpus
perf tools: Fix perf_evlist__splice_list_tail not setting evlist perf tools: Fix missing thread_map__put in perf_evlist__propagate_maps perf tools: Add evsel->own_cpus
perf tools: Make perf_evlist__set_maps() more resilient perf tools: Make perf_evlist__create_maps() use perf_evlist__set_maps() perf tools: Factor out a function to propagate maps for a single evsel perf tools: Fix perf_evlist__add() not propagating maps perf tools: Fix perf_evlist__create_syswide_maps() not propagating maps perf tools: Fix task exit test setting maps
perf tools: Fix software clock events test setting maps
tools/perf/tests/sw-clock.c | 18 ++++-- tools/perf/tests/task-exit.c | 18 ++++-- tools/perf/util/evlist.c | 138 +++++++++++++++++++++++------------------ tools/perf/util/evlist.h | 9 ++- tools/perf/util/evsel.c | 1 + tools/perf/util/evsel.h | 1 + tools/perf/util/parse-events.c | 7 +-- 7 files changed, 113 insertions(+), 79 deletions(-)
Regards
Adrian
Adrian Hunter
reviewerPATCH v3 1/14 perf tools: Simplify perf_evlist__propagate_maps logic
If evsel->cpus is to be reassigned then the current value must be "put", which works even if it is NULL. Simplify the current logic by moving the "put" next to the assignment.
--- tools/perf/util/evlist.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
tools/perf/util/evlist.c +2 -3
@@ -1113,11 +1113,10 @@ static int perf_evlist__propagate_maps(struct perf_evlist *evlist,* We already have cpus for evsel (via PMU sysfs) so * keep it, if there's no target cpu list defined. */ -if (evsel->cpus && has_user_cpus) +if (!evsel->cpus || has_user_cpus) {cpu_map__put (evsel->cpus); - -if (!evsel->cpus || has_user_cpus) evsel->cpus =cpu_map__get (evlist->cpus); + } evsel->threads =thread_map__get (evlist->threads);
Signature · 1 line
1.9.1
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf evlist: Simplify propagate_maps() logic
perf evlist: Simplify propagate_maps() logic
Commit-ID: a69b09e2342a9c144b0291b9aeb849ab7d5843bf Gitweb: http://git.kernel.org/tip/a69b09e2342a9c144b0291b9aeb849ab7d5843bf Author: Adrian Hunter <[email protected]> AuthorDate: Tue, 8 Sep 2015 10:58:49 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 15 Sep 2015 10:08:22 -0300
perf evlist: Simplify propagate_maps() logic
If evsel->cpus is to be reassigned then the current value must be "put", which works even if it is NULL. Simplify the current logic by moving the "put" next to the assignment.
--- tools/perf/util/evlist.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
tools/perf/util/evlist.c +2 -3
@@ -1113,11 +1113,10 @@ static int perf_evlist__propagate_maps(struct perf_evlist *evlist,* We already have cpus for evsel (via PMU sysfs) so * keep it, if there's no target cpu list defined. */ -if (evsel->cpus && has_user_cpus) +if (!evsel->cpus || has_user_cpus) {cpu_map__put (evsel->cpus); - -if (!evsel->cpus || has_user_cpus) evsel->cpus =cpu_map__get (evlist->cpus); + } evsel->threads =thread_map__get (evlist->threads);
Adrian Hunter
reviewerPATCH v3 2/14 perf tools: Simplify perf_evlist__set_maps logic
In reply to Adrian HunterDon't need to check for NULL when "putting" evlist->maps and evlist->threads because the "put" functions already do that.
--- tools/perf/util/evlist.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
tools/perf/util/evlist.c +2 -6
@@ -1156,14 +1156,10 @@ int perf_evlist__set_maps(struct perf_evlist *evlist,struct cpu_map *cpus, struct thread_map *threads) { -if (evlist->cpus) -cpu_map__put (evlist->cpus); - + cpu_map__put(evlist->cpus); evlist->cpus = cpus; -if (evlist->threads) -thread_map__put (evlist->threads); - +thread_map__put (evlist->threads); evlist->threads = threads;return perf_evlist__propagate_maps (evlist, false);
Signature · 1 line
1.9.1
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf evlist: Simplify set_maps() logic
perf evlist: Simplify set_maps() logic
Commit-ID: 725e06b2e2754fbff61521fa76fee51cee5bcb5f Gitweb: http://git.kernel.org/tip/725e06b2e2754fbff61521fa76fee51cee5bcb5f Author: Adrian Hunter <[email protected]> AuthorDate: Tue, 8 Sep 2015 10:58:50 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 15 Sep 2015 10:15:39 -0300
perf evlist: Simplify set_maps() logic
Don't need to check for NULL when "putting" evlist->maps and evlist->threads because the "put" functions already do that.
--- tools/perf/util/evlist.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
tools/perf/util/evlist.c +2 -6
@@ -1156,14 +1156,10 @@ int perf_evlist__set_maps(struct perf_evlist *evlist,struct cpu_map *cpus, struct thread_map *threads) { -if (evlist->cpus) -cpu_map__put (evlist->cpus); - + cpu_map__put(evlist->cpus); evlist->cpus = cpus; -if (evlist->threads) -thread_map__put (evlist->threads); - +thread_map__put (evlist->threads); evlist->threads = threads;return perf_evlist__propagate_maps (evlist, false);
Adrian Hunter
reviewerPATCH v3 3/14 perf tools: Remove redundant validation from perf_evlist__propagate_maps
In reply to Adrian HunterThe validation checks that the values that were just assigned, got assigned i.e. the error can't ever happen. Subsequent patches will call this code in places where errors are not being returned. Changing those code paths to return this non-existent error is counter-productive, so just remove it.
That in turn results in perf_evlist__set_maps not needing to return an error, but callers aren't checking it either, so remove that too.
--- tools/perf/util/evlist.c | 21 ++++++++------------- tools/perf/util/evlist.h | 5 ++--- 2 files changed, 10 insertions(+), 16 deletions(-)
tools/perf/util/evlist.c +8 -13
@@ -1103,8 +1103,8 @@ int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages,return perf_evlist__mmap_ex (evlist, pages, overwrite,0 , false); } -static int perf_evlist__propagate_maps (struct perf_evlist *evlist, -bool has_user_cpus) +static void perf_evlist__propagate_maps (struct perf_evlist *evlist, +bool has_user_cpus) {struct perf_evsel *evsel;
@@ -1119,13 +1119,7 @@ static int perf_evlist__propagate_maps(struct perf_evlist *evlist, } evsel->threads =thread_map__get (evlist->threads); - -if ((evlist->cpus && !evsel->cpus) || - (evlist->threads && !evsel->threads)) -return -ENOMEM ; } - -return 0 ; }int perf_evlist__create_maps (struct perf_evlist *evlist,struct target *target)
@@ -1144,7 +1138,9 @@ int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target)if (evlist->cpus ==NULL ) goto out_delete_threads; -return perf_evlist__propagate_maps (evlist, !!target->cpu_list); +perf_evlist__propagate_maps (evlist, !!target->cpu_list); + +return 0 ; out_delete_threads:thread_map__put (evlist->threads);
@@ -1152,9 +1148,8 @@ out_delete_threads:return -1 ; } -int perf_evlist__set_maps (struct perf_evlist *evlist, -struct cpu_map *cpus, -struct thread_map *threads) +void perf_evlist__set_maps (struct perf_evlist *evlist,struct cpu_map *cpus, +struct thread_map *threads) {cpu_map__put (evlist->cpus); evlist->cpus = cpus;
@@ -1162,7 +1157,7 @@ int perf_evlist__set_maps(struct perf_evlist *evlist,thread_map__put (evlist->threads); evlist->threads = threads; -return perf_evlist__propagate_maps (evlist, false); +perf_evlist__propagate_maps (evlist, false); }int perf_evlist__apply_filters (struct perf_evlist *evlist,struct perf_evsel **err_evsel)
tools/perf/util/evlist.h +2 -3
@@ -155,9 +155,8 @@ int perf_evlist__enable_event_idx(struct perf_evlist *evlist,void perf_evlist__set_selected (struct perf_evlist *evlist,struct perf_evsel *evsel); -int perf_evlist__set_maps (struct perf_evlist *evlist, -struct cpu_map *cpus, -struct thread_map *threads); +void perf_evlist__set_maps (struct perf_evlist *evlist,struct cpu_map *cpus, +struct thread_map *threads);int perf_evlist__create_maps (struct perf_evlist *evlist,struct target *target);int perf_evlist__apply_filters (struct perf_evlist *evlist,struct perf_evsel **err_evsel);
Signature · 1 line
1.9.1
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf evlist: Remove redundant validation from propagate_maps()
perf evlist: Remove redundant validation from propagate_maps()
Commit-ID: d5bc056e73841d4bc941474a342ef9b6a207ac84 Gitweb: http://git.kernel.org/tip/d5bc056e73841d4bc941474a342ef9b6a207ac84 Author: Adrian Hunter <[email protected]> AuthorDate: Tue, 8 Sep 2015 10:58:51 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 15 Sep 2015 10:16:48 -0300
perf evlist: Remove redundant validation from propagate_maps()
The validation checks that the values that were just assigned, got assigned i.e. the error can't ever happen. Subsequent patches will call this code in places where errors are not being returned. Changing those code paths to return this non-existent error is counter-productive, so just remove it.
That in turn results in perf_evlist__set_maps not needing to return an error, but callers aren't checking it either, so remove that too.
--- tools/perf/util/evlist.c | 21 ++++++++------------- tools/perf/util/evlist.h | 5 ++--- 2 files changed, 10 insertions(+), 16 deletions(-)
tools/perf/util/evlist.c +8 -13
@@ -1103,8 +1103,8 @@ int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages,return perf_evlist__mmap_ex (evlist, pages, overwrite,0 , false); } -static int perf_evlist__propagate_maps (struct perf_evlist *evlist, -bool has_user_cpus) +static void perf_evlist__propagate_maps (struct perf_evlist *evlist, +bool has_user_cpus) {struct perf_evsel *evsel;
@@ -1119,13 +1119,7 @@ static int perf_evlist__propagate_maps(struct perf_evlist *evlist, } evsel->threads =thread_map__get (evlist->threads); - -if ((evlist->cpus && !evsel->cpus) || - (evlist->threads && !evsel->threads)) -return -ENOMEM ; } - -return 0 ; }int perf_evlist__create_maps (struct perf_evlist *evlist,struct target *target)
@@ -1144,7 +1138,9 @@ int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target)if (evlist->cpus ==NULL ) goto out_delete_threads; -return perf_evlist__propagate_maps (evlist, !!target->cpu_list); +perf_evlist__propagate_maps (evlist, !!target->cpu_list); + +return 0 ; out_delete_threads:thread_map__put (evlist->threads);
@@ -1152,9 +1148,8 @@ out_delete_threads:return -1 ; } -int perf_evlist__set_maps (struct perf_evlist *evlist, -struct cpu_map *cpus, -struct thread_map *threads) +void perf_evlist__set_maps (struct perf_evlist *evlist,struct cpu_map *cpus, +struct thread_map *threads) {cpu_map__put (evlist->cpus); evlist->cpus = cpus;
@@ -1162,7 +1157,7 @@ int perf_evlist__set_maps(struct perf_evlist *evlist,thread_map__put (evlist->threads); evlist->threads = threads; -return perf_evlist__propagate_maps (evlist, false); +perf_evlist__propagate_maps (evlist, false); }int perf_evlist__apply_filters (struct perf_evlist *evlist,struct perf_evsel **err_evsel)
tools/perf/util/evlist.h +2 -3
@@ -155,9 +155,8 @@ int perf_evlist__enable_event_idx(struct perf_evlist *evlist,void perf_evlist__set_selected (struct perf_evlist *evlist,struct perf_evsel *evsel); -int perf_evlist__set_maps (struct perf_evlist *evlist, -struct cpu_map *cpus, -struct thread_map *threads); +void perf_evlist__set_maps (struct perf_evlist *evlist,struct cpu_map *cpus, +struct thread_map *threads);int perf_evlist__create_maps (struct perf_evlist *evlist,struct target *target);int perf_evlist__apply_filters (struct perf_evlist *evlist,struct perf_evsel **err_evsel);
Adrian Hunter
reviewerPATCH v3 4/14 perf tools: Add evlist->has_user_cpus
In reply to Adrian HunterSubsequent patches will need to call perf_evlist__propagate_maps without reference to a "target". Add evlist->has_user_cpus to record whether the user has specified which cpus to target (and therefore whether that list of cpus should override the default settings for a selected event i.e. the cpu maps should be propagated)
--- tools/perf/util/evlist.c | 11 ++++++----- tools/perf/util/evlist.h | 1 + 2 files changed, 7 insertions(+), 5 deletions(-)
tools/perf/util/evlist.c +6 -5
@@ -1103,8 +1103,7 @@ int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages,return perf_evlist__mmap_ex (evlist, pages, overwrite,0 , false); } -static void perf_evlist__propagate_maps (struct perf_evlist *evlist, -bool has_user_cpus) +static void perf_evlist__propagate_maps (struct perf_evlist *evlist) {struct perf_evsel *evsel;
@@ -1113,7 +1112,7 @@ static void perf_evlist__propagate_maps(struct perf_evlist *evlist,* We already have cpus for evsel (via PMU sysfs) so * keep it, if there's no target cpu list defined. */ -if (!evsel->cpus || has_user_cpus) { +if (!evsel->cpus || evlist->has_user_cpus) {cpu_map__put (evsel->cpus); evsel->cpus =cpu_map__get (evlist->cpus); }
@@ -1138,7 +1137,9 @@ int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target)if (evlist->cpus ==NULL ) goto out_delete_threads; -perf_evlist__propagate_maps (evlist, !!target->cpu_list); + evlist->has_user_cpus = !!target->cpu_list; + +perf_evlist__propagate_maps (evlist);return 0 ;
@@ -1157,7 +1158,7 @@ void perf_evlist__set_maps(struct perf_evlist *evlist, struct cpu_map *cpus,thread_map__put (evlist->threads); evlist->threads = threads; -perf_evlist__propagate_maps (evlist, false); +perf_evlist__propagate_maps (evlist); }int perf_evlist__apply_filters (struct perf_evlist *evlist,struct perf_evsel **err_evsel)
tools/perf/util/evlist.h +1 -0
@@ -42,6 +42,7 @@ struct perf_evlist {int nr_mmaps;bool overwrite;bool enabled; +bool has_user_cpus;size_t mmap_len;int id_pos;int is_pos;
Signature · 1 line
1.9.1
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf evlist: Add has_user_cpus member
perf evlist: Add has_user_cpus member
Commit-ID: ec9a77a7e3346a05b1287597982d0dd09dd1c3bd Gitweb: http://git.kernel.org/tip/ec9a77a7e3346a05b1287597982d0dd09dd1c3bd Author: Adrian Hunter <[email protected]> AuthorDate: Tue, 8 Sep 2015 10:58:52 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 15 Sep 2015 10:20:50 -0300
perf evlist: Add has_user_cpus member
Subsequent patches will need to call perf_evlist__propagate_maps without reference to a "target". Add evlist->has_user_cpus to record whether the user has specified which cpus to target (and therefore whether that list of cpus should override the default settings for a selected event i.e. the cpu maps should be propagated)
--- tools/perf/util/evlist.c | 11 ++++++----- tools/perf/util/evlist.h | 1 + 2 files changed, 7 insertions(+), 5 deletions(-)
tools/perf/util/evlist.c +6 -5
@@ -1103,8 +1103,7 @@ int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages,return perf_evlist__mmap_ex (evlist, pages, overwrite,0 , false); } -static void perf_evlist__propagate_maps (struct perf_evlist *evlist, -bool has_user_cpus) +static void perf_evlist__propagate_maps (struct perf_evlist *evlist) {struct perf_evsel *evsel;
@@ -1113,7 +1112,7 @@ static void perf_evlist__propagate_maps(struct perf_evlist *evlist,* We already have cpus for evsel (via PMU sysfs) so * keep it, if there's no target cpu list defined. */ -if (!evsel->cpus || has_user_cpus) { +if (!evsel->cpus || evlist->has_user_cpus) {cpu_map__put (evsel->cpus); evsel->cpus =cpu_map__get (evlist->cpus); }
@@ -1138,7 +1137,9 @@ int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target)if (evlist->cpus ==NULL ) goto out_delete_threads; -perf_evlist__propagate_maps (evlist, !!target->cpu_list); + evlist->has_user_cpus = !!target->cpu_list; + +perf_evlist__propagate_maps (evlist);return 0 ;
@@ -1157,7 +1158,7 @@ void perf_evlist__set_maps(struct perf_evlist *evlist, struct cpu_map *cpus,thread_map__put (evlist->threads); evlist->threads = threads; -perf_evlist__propagate_maps (evlist, false); +perf_evlist__propagate_maps (evlist); }int perf_evlist__apply_filters (struct perf_evlist *evlist,struct perf_evsel **err_evsel)
tools/perf/util/evlist.h +1 -0
@@ -42,6 +42,7 @@ struct perf_evlist {int nr_mmaps;bool overwrite;bool enabled; +bool has_user_cpus;size_t mmap_len;int id_pos;int is_pos;
Adrian Hunter
reviewerPATCH v3 5/14 perf tools: Fix perf_evlist__splice_list_tail not setting evlist
In reply to Adrian HunterCommit d49e46950772 ("perf evsel: Add a backpointer to the evlist a evsel is in") updated perf_evlist__add() but not perf_evlist__splice_list_tail().
This illustrates that it is better if perf_evlist__splice_list_tail() calls perf_evlist__add() instead of duplicating the logic, so do that. This will also simplify a subsequent fix for propagating maps.
--- tools/perf/util/evlist.c | 15 +++++++-------- tools/perf/util/evlist.h | 3 +-- tools/perf/util/parse-events.c | 3 +-- 3 files changed, 9 insertions(+), 12 deletions(-)
tools/perf/util/evlist.c +7 -8
@@ -136,15 +136,14 @@ void perf_evlist__add(struct perf_evlist *evlist, struct perf_evsel *entry) }void perf_evlist__splice_list_tail (struct perf_evlist *evlist, -struct list_head *list, -int nr_entries) +struct list_head *list) { -bool set_id_pos = !evlist->nr_entries; +struct perf_evsel *evsel, *temp; -list_splice_tail (list, &evlist->entries); - evlist->nr_entries += nr_entries; -if (set_id_pos) -perf_evlist__set_id_pos (evlist); +__evlist__for_each_safe (list, temp, evsel) { +list_del_init (&evsel->node); +perf_evlist__add (evlist, evsel); + } }void __perf_evlist__set_leader (struct list_head *list)
@@ -210,7 +209,7 @@ static int perf_evlist__add_attrs(struct perf_evlist *evlist,list_add_tail (&evsel->node, &head); } -perf_evlist__splice_list_tail (evlist, &head, nr_attrs); +perf_evlist__splice_list_tail (evlist, &head);return 0 ;
tools/perf/util/evlist.h +1 -2
@@ -179,8 +179,7 @@ bool perf_evlist__valid_sample_id_all(struct perf_evlist *evlist);bool perf_evlist__valid_read_format (struct perf_evlist *evlist);void perf_evlist__splice_list_tail (struct perf_evlist *evlist, -struct list_head *list, -int nr_entries); +struct list_head *list);static inline struct perf_evsel *perf_evlist__first (struct perf_evlist *evlist) {
tools/perf/util/parse-events.c +1 -2
@@ -1140,10 +1140,9 @@ int parse_events(struct perf_evlist *evlist, const char *str, ret =parse_events__scanner (str, &data,PE_START_EVENTS );perf_pmu__parse_cleanup ();if (!ret) { -int entries = data.idx - evlist->nr_entries;struct perf_evsel *last; -perf_evlist__splice_list_tail (evlist, &data.list, entries); +perf_evlist__splice_list_tail (evlist, &data.list); evlist->nr_groups += data.nr_groups; last =perf_evlist__last (evlist); last->cmdline_group_boundary = true;
Signature · 1 line
1.9.1
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf evlist: Fix splice_list_tail() not setting evlist
perf evlist: Fix splice_list_tail() not setting evlist
Commit-ID: f114d6eff76d20b521d8716e969e71b1f56f82b5 Gitweb: http://git.kernel.org/tip/f114d6eff76d20b521d8716e969e71b1f56f82b5 Author: Adrian Hunter <[email protected]> AuthorDate: Tue, 8 Sep 2015 10:58:53 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 15 Sep 2015 10:23:17 -0300
perf evlist: Fix splice_list_tail() not setting evlist
Commit d49e46950772 ("perf evsel: Add a backpointer to the evlist a evsel is in") updated perf_evlist__add() but not perf_evlist__splice_list_tail().
This illustrates that it is better if perf_evlist__splice_list_tail() calls perf_evlist__add() instead of duplicating the logic, so do that. This will also simplify a subsequent fix for propagating maps.
--- tools/perf/util/evlist.c | 15 +++++++-------- tools/perf/util/evlist.h | 3 +-- tools/perf/util/parse-events.c | 3 +-- 3 files changed, 9 insertions(+), 12 deletions(-)
tools/perf/util/evlist.c +7 -8
@@ -136,15 +136,14 @@ void perf_evlist__add(struct perf_evlist *evlist, struct perf_evsel *entry) }void perf_evlist__splice_list_tail (struct perf_evlist *evlist, -struct list_head *list, -int nr_entries) +struct list_head *list) { -bool set_id_pos = !evlist->nr_entries; +struct perf_evsel *evsel, *temp; -list_splice_tail (list, &evlist->entries); - evlist->nr_entries += nr_entries; -if (set_id_pos) -perf_evlist__set_id_pos (evlist); +__evlist__for_each_safe (list, temp, evsel) { +list_del_init (&evsel->node); +perf_evlist__add (evlist, evsel); + } }void __perf_evlist__set_leader (struct list_head *list)
@@ -210,7 +209,7 @@ static int perf_evlist__add_attrs(struct perf_evlist *evlist,list_add_tail (&evsel->node, &head); } -perf_evlist__splice_list_tail (evlist, &head, nr_attrs); +perf_evlist__splice_list_tail (evlist, &head);return 0 ;
tools/perf/util/evlist.h +1 -2
@@ -179,8 +179,7 @@ bool perf_evlist__valid_sample_id_all(struct perf_evlist *evlist);bool perf_evlist__valid_read_format (struct perf_evlist *evlist);void perf_evlist__splice_list_tail (struct perf_evlist *evlist, -struct list_head *list, -int nr_entries); +struct list_head *list);static inline struct perf_evsel *perf_evlist__first (struct perf_evlist *evlist) {
tools/perf/util/parse-events.c +1 -2
@@ -1140,10 +1140,9 @@ int parse_events(struct perf_evlist *evlist, const char *str, ret =parse_events__scanner (str, &data,PE_START_EVENTS );perf_pmu__parse_cleanup ();if (!ret) { -int entries = data.idx - evlist->nr_entries;struct perf_evsel *last; -perf_evlist__splice_list_tail (evlist, &data.list, entries); +perf_evlist__splice_list_tail (evlist, &data.list); evlist->nr_groups += data.nr_groups; last =perf_evlist__last (evlist); last->cmdline_group_boundary = true;
Adrian Hunter
reviewerPATCH v3 6/14 perf tools: Fix missing thread_map__put in perf_evlist__propagate_maps
In reply to Adrian Hunterperf_evlist__propagate_maps() incorrectly assumes evsel->threads is NULL before reassigning it, but it won't be NULL when perf_evlist__set_maps() is used to set different (or NULL) maps. Thus thread_map__put must be used, which works even if evsel->threads is NULL.
--- tools/perf/util/evlist.c | 1 + 1 file changed, 1 insertion(+)
tools/perf/util/evlist.c +1 -0
@@ -1116,6 +1116,7 @@ static void perf_evlist__propagate_maps(struct perf_evlist *evlist) evsel->cpus =cpu_map__get (evlist->cpus); } +thread_map__put (evsel->threads); evsel->threads =thread_map__get (evlist->threads); } }
Signature · 1 line
1.9.1
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf evlist: Fix missing thread_map__put in propagate_maps()
perf evlist: Fix missing thread_map__put in propagate_maps()
Commit-ID: b278c364b35ae940b05f6a9edf8061fc886cd09e Gitweb: http://git.kernel.org/tip/b278c364b35ae940b05f6a9edf8061fc886cd09e Author: Adrian Hunter <[email protected]> AuthorDate: Tue, 8 Sep 2015 10:58:54 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 15 Sep 2015 10:24:30 -0300
perf evlist: Fix missing thread_map__put in propagate_maps()
perf_evlist__propagate_maps() incorrectly assumes evsel->threads is NULL before reassigning it, but it won't be NULL when perf_evlist__set_maps() is used to set different (or NULL) maps. Thus thread_map__put must be used, which works even if evsel->threads is NULL.
--- tools/perf/util/evlist.c | 1 + 1 file changed, 1 insertion(+)
tools/perf/util/evlist.c +1 -0
@@ -1116,6 +1116,7 @@ static void perf_evlist__propagate_maps(struct perf_evlist *evlist) evsel->cpus =cpu_map__get (evlist->cpus); } +thread_map__put (evsel->threads); evsel->threads =thread_map__get (evlist->threads); } }
Adrian Hunter
reviewerPATCH v3 7/14 perf tools: Add evsel->own_cpus
In reply to Adrian Hunterperf_evlist__propagate_maps() cannot easily tell if an evsel has its own cpu map. To make that simpler, keep a copy of the PMU cpu map and adjust the propagation logic accordingly.
--- tools/perf/util/evlist.c | 5 ++++- tools/perf/util/evsel.c | 1 + tools/perf/util/evsel.h | 1 + tools/perf/util/parse-events.c | 4 ++-- 4 files changed, 8 insertions(+), 3 deletions(-)
tools/perf/util/evlist.c +4 -1
@@ -1111,9 +1111,12 @@ static void perf_evlist__propagate_maps(struct perf_evlist *evlist)* We already have cpus for evsel (via PMU sysfs) so * keep it, if there's no target cpu list defined. */ -if (!evsel->cpus || evlist->has_user_cpus) { +if (!evsel->own_cpus || evlist->has_user_cpus) {cpu_map__put (evsel->cpus); evsel->cpus =cpu_map__get (evlist->cpus); + }else if (evsel->cpus != evsel->own_cpus) { +cpu_map__put (evsel->cpus); + evsel->cpus =cpu_map__get (evsel->own_cpus); }thread_map__put (evsel->threads);
tools/perf/util/evsel.c +1 -0
@@ -1033,6 +1033,7 @@ void perf_evsel__exit(struct perf_evsel *evsel)perf_evsel__free_config_terms (evsel);close_cgroup (evsel->cgrp);cpu_map__put (evsel->cpus); +cpu_map__put (evsel->own_cpus);thread_map__put (evsel->threads);zfree (&evsel->group_name);zfree (&evsel->name);
tools/perf/util/evsel.h +1 -0
@@ -98,6 +98,7 @@ struct perf_evsel {struct cgroup_sel *cgrp;void *handler;struct cpu_map *cpus; +struct cpu_map *own_cpus;struct thread_map *threads;unsigned int sample_size;int id_pos;
tools/perf/util/parse-events.c +2 -2
@@ -287,8 +287,8 @@ __add_event(struct list_head *list, int *idx,if (!evsel)return NULL ; -if (cpus) - evsel->cpus =cpu_map__get (cpus); + evsel->cpus =cpu_map__get (cpus); + evsel->own_cpus =cpu_map__get (cpus);if (name) evsel->name =strdup (name);
Signature · 1 line
1.9.1
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf evsel: Add own_cpus member
perf evsel: Add own_cpus member
Commit-ID: fce4d296b405b03fba033a55017348bf55b10db6 Gitweb: http://git.kernel.org/tip/fce4d296b405b03fba033a55017348bf55b10db6 Author: Adrian Hunter <[email protected]> AuthorDate: Tue, 8 Sep 2015 10:58:55 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 15 Sep 2015 10:41:13 -0300
perf evsel: Add own_cpus member
perf_evlist__propagate_maps() cannot easily tell if an evsel has its own cpu map. To make that simpler, keep a copy of the PMU cpu map and adjust the propagation logic accordingly.
--- tools/perf/util/evlist.c | 5 ++++- tools/perf/util/evsel.c | 1 + tools/perf/util/evsel.h | 1 + tools/perf/util/parse-events.c | 4 ++-- 4 files changed, 8 insertions(+), 3 deletions(-)
tools/perf/util/evlist.c +4 -1
@@ -1111,9 +1111,12 @@ static void perf_evlist__propagate_maps(struct perf_evlist *evlist)* We already have cpus for evsel (via PMU sysfs) so * keep it, if there's no target cpu list defined. */ -if (!evsel->cpus || evlist->has_user_cpus) { +if (!evsel->own_cpus || evlist->has_user_cpus) {cpu_map__put (evsel->cpus); evsel->cpus =cpu_map__get (evlist->cpus); + }else if (evsel->cpus != evsel->own_cpus) { +cpu_map__put (evsel->cpus); + evsel->cpus =cpu_map__get (evsel->own_cpus); }thread_map__put (evsel->threads);
tools/perf/util/evsel.c +1 -0
@@ -1033,6 +1033,7 @@ void perf_evsel__exit(struct perf_evsel *evsel)perf_evsel__free_config_terms (evsel);close_cgroup (evsel->cgrp);cpu_map__put (evsel->cpus); +cpu_map__put (evsel->own_cpus);thread_map__put (evsel->threads);zfree (&evsel->group_name);zfree (&evsel->name);
tools/perf/util/evsel.h +1 -0
@@ -98,6 +98,7 @@ struct perf_evsel {struct cgroup_sel *cgrp;void *handler;struct cpu_map *cpus; +struct cpu_map *own_cpus;struct thread_map *threads;unsigned int sample_size;int id_pos;
tools/perf/util/parse-events.c +2 -2
@@ -287,8 +287,8 @@ __add_event(struct list_head *list, int *idx,if (!evsel)return NULL ; -if (cpus) - evsel->cpus =cpu_map__get (cpus); + evsel->cpus =cpu_map__get (cpus); + evsel->own_cpus =cpu_map__get (cpus);if (name) evsel->name =strdup (name);
Adrian Hunter
reviewerPATCH v3 8/14 perf tools: Make perf_evlist__set_maps() more resilient
In reply to Adrian HunterMake perf_evlist__set_maps() more resilient by allowing for the possibility that one or another of the maps isn't being changed and therefore should not be "put".
--- tools/perf/util/evlist.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
tools/perf/util/evlist.c +15 -4
@@ -1155,11 +1155,22 @@ out_delete_threads:void perf_evlist__set_maps (struct perf_evlist *evlist,struct cpu_map *cpus,struct thread_map *threads) { -cpu_map__put (evlist->cpus); - evlist->cpus = cpus; +/* +* Allow for the possibility that one or another of the maps isn't being +* changed i.e. don't put it. Note we are assuming the maps that are +* being applied are brand new and evlist is taking ownership of the +* original reference count of 1. If that is not the case it is up to +* the caller to increase the reference count. +*/ +if (cpus != evlist->cpus) { +cpu_map__put (evlist->cpus); + evlist->cpus = cpus; + } -thread_map__put (evlist->threads); - evlist->threads = threads; +if (threads != evlist->threads) { +thread_map__put (evlist->threads); + evlist->threads = threads; + }perf_evlist__propagate_maps (evlist); }
Signature · 1 line
1.9.1
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf evlist: Make set_maps() more resilient
perf evlist: Make set_maps() more resilient
Commit-ID: 934e0f2053ce299893ca48a411bf7fdc8ac6254f Gitweb: http://git.kernel.org/tip/934e0f2053ce299893ca48a411bf7fdc8ac6254f Author: Adrian Hunter <[email protected]> AuthorDate: Tue, 8 Sep 2015 10:58:56 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 15 Sep 2015 10:44:22 -0300
perf evlist: Make set_maps() more resilient
Make perf_evlist__set_maps() more resilient by allowing for the possibility that one or another of the maps isn't being changed and therefore should not be "put".
--- tools/perf/util/evlist.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
tools/perf/util/evlist.c +15 -4
@@ -1155,11 +1155,22 @@ out_delete_threads:void perf_evlist__set_maps (struct perf_evlist *evlist,struct cpu_map *cpus,struct thread_map *threads) { -cpu_map__put (evlist->cpus); - evlist->cpus = cpus; +/* +* Allow for the possibility that one or another of the maps isn't being +* changed i.e. don't put it. Note we are assuming the maps that are +* being applied are brand new and evlist is taking ownership of the +* original reference count of 1. If that is not the case it is up to +* the caller to increase the reference count. +*/ +if (cpus != evlist->cpus) { +cpu_map__put (evlist->cpus); + evlist->cpus = cpus; + } -thread_map__put (evlist->threads); - evlist->threads = threads; +if (threads != evlist->threads) { +thread_map__put (evlist->threads); + evlist->threads = threads; + }perf_evlist__propagate_maps (evlist); }
Adrian Hunter
reviewerPATCH v3 9/14 perf tools: Make perf_evlist__create_maps() use perf_evlist__set_maps()
In reply to Adrian HunterSince there is a function to set maps, perf_evlist__create_maps() should use it.
--- tools/perf/util/evlist.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
tools/perf/util/evlist.c +10 -9
@@ -1126,29 +1126,30 @@ static void perf_evlist__propagate_maps(struct perf_evlist *evlist)int perf_evlist__create_maps (struct perf_evlist *evlist,struct target *target) { - evlist->threads =thread_map__new_str (target->pid, target->tid, - target->uid); +struct cpu_map *cpus; +struct thread_map *threads; -if (evlist->threads ==NULL ) + threads =thread_map__new_str (target->pid, target->tid, target->uid); + +if (!threads)return -1 ;if (target__uses_dummy_map (target)) - evlist->cpus =cpu_map__dummy_new (); + cpus =cpu_map__dummy_new ();else - evlist->cpus =cpu_map__new (target->cpu_list); + cpus =cpu_map__new (target->cpu_list); -if (evlist->cpus ==NULL ) +if (!cpus) goto out_delete_threads; evlist->has_user_cpus = !!target->cpu_list; -perf_evlist__propagate_maps (evlist); +perf_evlist__set_maps (evlist, cpus, threads);return 0 ; out_delete_threads: -thread_map__put (evlist->threads); - evlist->threads =NULL ; +thread_map__put (threads);return -1 ; }
Signature · 1 line
1.9.1
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf evlist: Make create_maps() use set_maps()
perf evlist: Make create_maps() use set_maps()
Commit-ID: 74bfd2b25de354feb4484c553dce4fe8d9c3b60b Gitweb: http://git.kernel.org/tip/74bfd2b25de354feb4484c553dce4fe8d9c3b60b Author: Adrian Hunter <[email protected]> AuthorDate: Tue, 8 Sep 2015 10:58:57 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 15 Sep 2015 10:45:47 -0300
perf evlist: Make create_maps() use set_maps()
Since there is a function to set maps, perf_evlist__create_maps() should use it.
--- tools/perf/util/evlist.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
tools/perf/util/evlist.c +10 -9
@@ -1126,29 +1126,30 @@ static void perf_evlist__propagate_maps(struct perf_evlist *evlist)int perf_evlist__create_maps (struct perf_evlist *evlist,struct target *target) { - evlist->threads =thread_map__new_str (target->pid, target->tid, - target->uid); +struct cpu_map *cpus; +struct thread_map *threads; -if (evlist->threads ==NULL ) + threads =thread_map__new_str (target->pid, target->tid, target->uid); + +if (!threads)return -1 ;if (target__uses_dummy_map (target)) - evlist->cpus =cpu_map__dummy_new (); + cpus =cpu_map__dummy_new ();else - evlist->cpus =cpu_map__new (target->cpu_list); + cpus =cpu_map__new (target->cpu_list); -if (evlist->cpus ==NULL ) +if (!cpus) goto out_delete_threads; evlist->has_user_cpus = !!target->cpu_list; -perf_evlist__propagate_maps (evlist); +perf_evlist__set_maps (evlist, cpus, threads);return 0 ; out_delete_threads: -thread_map__put (evlist->threads); - evlist->threads =NULL ; +thread_map__put (threads);return -1 ; }
Adrian Hunter
reviewerPATCH v3 10/14 perf tools: Factor out a function to propagate maps for a single evsel
In reply to Adrian HunterSubsequent fixes will need a function that just propagates maps for a single evsel so factor it out.
--- tools/perf/util/evlist.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-)
tools/perf/util/evlist.c +21 -16
@@ -1102,26 +1102,31 @@ int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages,return perf_evlist__mmap_ex (evlist, pages, overwrite,0 , false); } +static void __perf_evlist__propagate_maps (struct perf_evlist *evlist, +struct perf_evsel *evsel) +{ +/* +* We already have cpus for evsel (via PMU sysfs) so +* keep it, if there's no target cpu list defined. +*/ +if (!evsel->own_cpus || evlist->has_user_cpus) { +cpu_map__put (evsel->cpus); + evsel->cpus =cpu_map__get (evlist->cpus); + }else if (evsel->cpus != evsel->own_cpus) { +cpu_map__put (evsel->cpus); + evsel->cpus =cpu_map__get (evsel->own_cpus); + } + +thread_map__put (evsel->threads); + evsel->threads =thread_map__get (evlist->threads); +} +static void perf_evlist__propagate_maps (struct perf_evlist *evlist) {struct perf_evsel *evsel; -evlist__for_each (evlist, evsel) { -/* -* We already have cpus for evsel (via PMU sysfs) so -* keep it, if there's no target cpu list defined. -*/ -if (!evsel->own_cpus || evlist->has_user_cpus) { -cpu_map__put (evsel->cpus); - evsel->cpus =cpu_map__get (evlist->cpus); - }else if (evsel->cpus != evsel->own_cpus) { -cpu_map__put (evsel->cpus); - evsel->cpus =cpu_map__get (evsel->own_cpus); - } - -thread_map__put (evsel->threads); - evsel->threads =thread_map__get (evlist->threads); - } +evlist__for_each (evlist, evsel) +__perf_evlist__propagate_maps (evlist, evsel); }int perf_evlist__create_maps (struct perf_evlist *evlist,struct target *target)
Signature · 1 line
1.9.1
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf evlist: Factor out a function to propagate maps for a single evsel
perf evlist: Factor out a function to propagate maps for a single evsel
Commit-ID: adc0c3e87b0e1baeccabe09b6dba738f17d0e91d Gitweb: http://git.kernel.org/tip/adc0c3e87b0e1baeccabe09b6dba738f17d0e91d Author: Adrian Hunter <[email protected]> AuthorDate: Tue, 8 Sep 2015 10:58:58 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 15 Sep 2015 10:54:04 -0300
perf evlist: Factor out a function to propagate maps for a single evsel
Subsequent fixes will need a function that just propagates maps for a single evsel so factor it out.
--- tools/perf/util/evlist.c | 49 ++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-)
tools/perf/util/evlist.c +27 -22
@@ -124,6 +124,33 @@ void perf_evlist__delete(struct perf_evlist *evlist)free (evlist); } +static void __perf_evlist__propagate_maps (struct perf_evlist *evlist, +struct perf_evsel *evsel) +{ +/* +* We already have cpus for evsel (via PMU sysfs) so +* keep it, if there's no target cpu list defined. +*/ +if (!evsel->own_cpus || evlist->has_user_cpus) { +cpu_map__put (evsel->cpus); + evsel->cpus =cpu_map__get (evlist->cpus); + }else if (evsel->cpus != evsel->own_cpus) { +cpu_map__put (evsel->cpus); + evsel->cpus =cpu_map__get (evsel->own_cpus); + } + +thread_map__put (evsel->threads); + evsel->threads =thread_map__get (evlist->threads); +} + +static void perf_evlist__propagate_maps (struct perf_evlist *evlist) +{ +struct perf_evsel *evsel; + +evlist__for_each (evlist, evsel) +__perf_evlist__propagate_maps (evlist, evsel); +} +void perf_evlist__add (struct perf_evlist *evlist,struct perf_evsel *entry) { entry->evlist = evlist;
@@ -1102,28 +1129,6 @@ int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages,return perf_evlist__mmap_ex (evlist, pages, overwrite,0 , false); } -static void perf_evlist__propagate_maps (struct perf_evlist *evlist) -{ -struct perf_evsel *evsel; - -evlist__for_each (evlist, evsel) { -/* -* We already have cpus for evsel (via PMU sysfs) so -* keep it, if there's no target cpu list defined. -*/ -if (!evsel->own_cpus || evlist->has_user_cpus) { -cpu_map__put (evsel->cpus); - evsel->cpus =cpu_map__get (evlist->cpus); - }else if (evsel->cpus != evsel->own_cpus) { -cpu_map__put (evsel->cpus); - evsel->cpus =cpu_map__get (evsel->own_cpus); - } - -thread_map__put (evsel->threads); - evsel->threads =thread_map__get (evlist->threads); - } -} -int perf_evlist__create_maps (struct perf_evlist *evlist,struct target *target) {struct cpu_map *cpus;
Adrian Hunter
reviewerPATCH v3 11/14 perf tools: Fix perf_evlist__add() not propagating maps
In reply to Adrian HunterIf evsels are added after maps are created, then they won't have any maps propagated to them. Fix that.
--- tools/perf/util/evlist.c | 56 +++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 27 deletions(-)
tools/perf/util/evlist.c +29 -27
@@ -124,6 +124,33 @@ void perf_evlist__delete(struct perf_evlist *evlist)free (evlist); } +static void __perf_evlist__propagate_maps (struct perf_evlist *evlist, +struct perf_evsel *evsel) +{ +/* +* We already have cpus for evsel (via PMU sysfs) so +* keep it, if there's no target cpu list defined. +*/ +if (!evsel->own_cpus || evlist->has_user_cpus) { +cpu_map__put (evsel->cpus); + evsel->cpus =cpu_map__get (evlist->cpus); + }else if (evsel->cpus != evsel->own_cpus) { +cpu_map__put (evsel->cpus); + evsel->cpus =cpu_map__get (evsel->own_cpus); + } + +thread_map__put (evsel->threads); + evsel->threads =thread_map__get (evlist->threads); +} + +static void perf_evlist__propagate_maps (struct perf_evlist *evlist) +{ +struct perf_evsel *evsel; + +evlist__for_each (evlist, evsel) +__perf_evlist__propagate_maps (evlist, evsel); +} +void perf_evlist__add (struct perf_evlist *evlist,struct perf_evsel *entry) { entry->evlist = evlist;
@@ -133,6 +160,8 @@ void perf_evlist__add(struct perf_evlist *evlist, struct perf_evsel *entry)if (!evlist->nr_entries++)perf_evlist__set_id_pos (evlist); + +__perf_evlist__propagate_maps (evlist, entry); } void perf_evlist__splice_list_tail(struct perf_evlist *evlist,
@@ -1102,33 +1131,6 @@ int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages,return perf_evlist__mmap_ex (evlist, pages, overwrite,0 , false); } -static void __perf_evlist__propagate_maps (struct perf_evlist *evlist, -struct perf_evsel *evsel) -{ -/* -* We already have cpus for evsel (via PMU sysfs) so -* keep it, if there's no target cpu list defined. -*/ -if (!evsel->own_cpus || evlist->has_user_cpus) { -cpu_map__put (evsel->cpus); - evsel->cpus =cpu_map__get (evlist->cpus); - }else if (evsel->cpus != evsel->own_cpus) { -cpu_map__put (evsel->cpus); - evsel->cpus =cpu_map__get (evsel->own_cpus); - } - -thread_map__put (evsel->threads); - evsel->threads =thread_map__get (evlist->threads); -} - -static void perf_evlist__propagate_maps (struct perf_evlist *evlist) -{ -struct perf_evsel *evsel; - -evlist__for_each (evlist, evsel) -__perf_evlist__propagate_maps (evlist, evsel); -} -int perf_evlist__create_maps (struct perf_evlist *evlist,struct target *target) {struct cpu_map *cpus;
Signature · 1 line
1.9.1
Re: [PATCH V3 11/14] perf tools: Fix perf_evlist__add() not propagating maps
Em Tue, Sep 08, 2015 at 10:58:59AM +0300, Adrian Hunter escreveu:
Quoted 2 lines
If evsels are added after maps are created, then they won't have any maps propagated to them. Fix that.
Next time please consider, when introducing this a new function A() that will be needed by a function B() in a subsequent patch to introduce A() before B() if A() is static, i.e. to avoid making the patch making B() use A() be larger than necessary by having to move A() to before B().
When reviewing I went, "oh, but this function was introduced already in the previous patch?!" only to figure out that it was unchanged, just being moved.
I did it this time, please see the two attached patches.
Thanks,
- Arnaldo
Quoted 89 lines
Signed-off-by Adrian Hunter <[email protected]>--- tools/perf/util/evlist.c | 56 +++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 27 deletions(-)tools/perf/util/evlist.c +29
-27@@ -124,6 +124,33 @@ void perf_evlist__delete(struct perf_evlist *evlist)free (evlist); } +static void __perf_evlist__propagate_maps (struct perf_evlist *evlist, +struct perf_evsel *evsel) +{ +/* +* We already have cpus for evsel (via PMU sysfs) so +* keep it, if there's no target cpu list defined. +*/ +if (!evsel->own_cpus || evlist->has_user_cpus) { +cpu_map__put (evsel->cpus); + evsel->cpus =cpu_map__get (evlist->cpus); + }else if (evsel->cpus != evsel->own_cpus) { +cpu_map__put (evsel->cpus); + evsel->cpus =cpu_map__get (evsel->own_cpus); + } + +thread_map__put (evsel->threads); + evsel->threads =thread_map__get (evlist->threads); +} + +static void perf_evlist__propagate_maps (struct perf_evlist *evlist) +{ +struct perf_evsel *evsel; + +evlist__for_each (evlist, evsel) +__perf_evlist__propagate_maps (evlist, evsel); +} +void perf_evlist__add (struct perf_evlist *evlist,struct perf_evsel *entry) { entry->evlist = evlist;@@ -133,6 +160,8 @@ void perf_evlist__add(struct perf_evlist *evlist, struct perf_evsel *entry)if (!evlist->nr_entries++)perf_evlist__set_id_pos (evlist); + +__perf_evlist__propagate_maps (evlist, entry); } void perf_evlist__splice_list_tail(struct perf_evlist *evlist,@@ -1102,33 +1131,6 @@ int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages,return perf_evlist__mmap_ex (evlist, pages, overwrite,0 , false); } -static void __perf_evlist__propagate_maps (struct perf_evlist *evlist, -struct perf_evsel *evsel) -{ -/* -* We already have cpus for evsel (via PMU sysfs) so -* keep it, if there's no target cpu list defined. -*/ -if (!evsel->own_cpus || evlist->has_user_cpus) { -cpu_map__put (evsel->cpus); - evsel->cpus =cpu_map__get (evlist->cpus); - }else if (evsel->cpus != evsel->own_cpus) { -cpu_map__put (evsel->cpus); - evsel->cpus =cpu_map__get (evsel->own_cpus); - } - -thread_map__put (evsel->threads); - evsel->threads =thread_map__get (evlist->threads); -} - -static void perf_evlist__propagate_maps (struct perf_evlist *evlist) -{ -struct perf_evsel *evsel; - -evlist__for_each (evlist, evsel) -__perf_evlist__propagate_maps (evlist, evsel); -} -int perf_evlist__create_maps (struct perf_evlist *evlist,struct target *target) {struct cpu_map *cpus;Signature · 2 lines
1.9.1 From adc0c3e87b0e1baeccabe09b6dba738f17d0e91d Mon Sep 17 00:00:00 2001
From: Adrian Hunter <[email protected]>
Date: Tue, 8 Sep 2015 10:58:58 +0300
Subject: [PATCH 1/2] perf evlist: Factor out a function to propagate maps for
a single evsel
Subsequent fixes will need a function that just propagates maps for a single evsel so factor it out.
--- tools/perf/util/evlist.c | 49 ++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-)
tools/perf/util/evlist.c +27 -22
@@ -124,6 +124,33 @@ void perf_evlist__delete(struct perf_evlist *evlist)free (evlist); } +static void __perf_evlist__propagate_maps (struct perf_evlist *evlist, +struct perf_evsel *evsel) +{ +/* +* We already have cpus for evsel (via PMU sysfs) so +* keep it, if there's no target cpu list defined. +*/ +if (!evsel->own_cpus || evlist->has_user_cpus) { +cpu_map__put (evsel->cpus); + evsel->cpus =cpu_map__get (evlist->cpus); + }else if (evsel->cpus != evsel->own_cpus) { +cpu_map__put (evsel->cpus); + evsel->cpus =cpu_map__get (evsel->own_cpus); + } + +thread_map__put (evsel->threads); + evsel->threads =thread_map__get (evlist->threads); +} + +static void perf_evlist__propagate_maps (struct perf_evlist *evlist) +{ +struct perf_evsel *evsel; + +evlist__for_each (evlist, evsel) +__perf_evlist__propagate_maps (evlist, evsel); +} +void perf_evlist__add (struct perf_evlist *evlist,struct perf_evsel *entry) { entry->evlist = evlist;
@@ -1102,28 +1129,6 @@ int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages,return perf_evlist__mmap_ex (evlist, pages, overwrite,0 , false); } -static void perf_evlist__propagate_maps (struct perf_evlist *evlist) -{ -struct perf_evsel *evsel; - -evlist__for_each (evlist, evsel) { -/* -* We already have cpus for evsel (via PMU sysfs) so -* keep it, if there's no target cpu list defined. -*/ -if (!evsel->own_cpus || evlist->has_user_cpus) { -cpu_map__put (evsel->cpus); - evsel->cpus =cpu_map__get (evlist->cpus); - }else if (evsel->cpus != evsel->own_cpus) { -cpu_map__put (evsel->cpus); - evsel->cpus =cpu_map__get (evsel->own_cpus); - } - -thread_map__put (evsel->threads); - evsel->threads =thread_map__get (evlist->threads); - } -} -int perf_evlist__create_maps (struct perf_evlist *evlist,struct target *target) {struct cpu_map *cpus;
Signature · 1 line
2.1.0
Quoted 1 line
From
44c42d71c659527c81bf169808959c9339116d85Mon Sep 17 00:00:00 2001
From: Adrian Hunter <[email protected]>
Date: Tue, 8 Sep 2015 10:58:59 +0300
Subject: [PATCH 2/2] perf evlist: Fix add() not propagating maps
If evsels are added after maps are created, then they won't have any maps propagated to them. Fix that.
[ Moved the moving of propagate_maps() to the patch before, so that this
one does _just_ the one lile fix calling in add()]
--- tools/perf/util/evlist.c | 2 ++ 1 file changed, 2 insertions(+)
tools/perf/util/evlist.c +2 -0
@@ -160,6 +160,8 @@ void perf_evlist__add(struct perf_evlist *evlist, struct perf_evsel *entry)if (!evlist->nr_entries++)perf_evlist__set_id_pos (evlist); + +__perf_evlist__propagate_maps (evlist, entry); } void perf_evlist__splice_list_tail(struct perf_evlist *evlist,
Signature · 1 line
2.1.0
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf evlist: Fix add() not propagating maps
In reply to Adrian Hunterperf evlist: Fix add() not propagating maps
Commit-ID: 44c42d71c659527c81bf169808959c9339116d85 Gitweb: http://git.kernel.org/tip/44c42d71c659527c81bf169808959c9339116d85 Author: Adrian Hunter <[email protected]> AuthorDate: Tue, 8 Sep 2015 10:58:59 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 15 Sep 2015 11:01:25 -0300
perf evlist: Fix add() not propagating maps
If evsels are added after maps are created, then they won't have any maps propagated to them. Fix that.
[ Moved the moving of propagate_maps() to the patch before, so that this
one does _just_ the one lile fix calling in add()]
--- tools/perf/util/evlist.c | 2 ++ 1 file changed, 2 insertions(+)
tools/perf/util/evlist.c +2 -0
@@ -160,6 +160,8 @@ void perf_evlist__add(struct perf_evlist *evlist, struct perf_evsel *entry)if (!evlist->nr_entries++)perf_evlist__set_id_pos (evlist); + +__perf_evlist__propagate_maps (evlist, entry); } void perf_evlist__splice_list_tail(struct perf_evlist *evlist,
Adrian Hunter
reviewerPATCH v3 12/14 perf tools: Fix perf_evlist__create_syswide_maps() not propagating maps
In reply to Adrian HunterFix it by making it call perf_evlist__set_maps() instead of setting the maps itself.
--- tools/perf/util/evlist.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
tools/perf/util/evlist.c +10 -9
@@ -1400,6 +1400,8 @@ void perf_evlist__close(struct perf_evlist *evlist)static int perf_evlist__create_syswide_maps (struct perf_evlist *evlist) { +struct cpu_map *cpus; +struct thread_map *threads;int err = -ENOMEM ;/*
@@ -1411,20 +1413,19 @@ static int perf_evlist__create_syswide_maps(struct perf_evlist *evlist)* error, and we may not want to do that fallback to a * default cpu identity map :-\ */ - evlist->cpus =cpu_map__new (NULL ); -if (evlist->cpus ==NULL ) + cpus =cpu_map__new (NULL ); +if (!cpus) goto out; - evlist->threads =thread_map__new_dummy (); -if (evlist->threads ==NULL ) - goto out_free_cpus; + threads =thread_map__new_dummy (); +if (!threads) + goto out_put; - err =0 ; +perf_evlist__set_maps (evlist, cpus, threads); out:return err; -out_free_cpus: -cpu_map__put (evlist->cpus); - evlist->cpus =NULL ; +out_put: +cpu_map__put (cpus); goto out; }
Signature · 1 line
1.9.1
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf evlist: Fix create_syswide_maps() not propagating maps
perf evlist: Fix create_syswide_maps() not propagating maps
Commit-ID: 8c0498b6891d7ca5c379c6283de7fc7fe8eebe5c Gitweb: http://git.kernel.org/tip/8c0498b6891d7ca5c379c6283de7fc7fe8eebe5c Author: Adrian Hunter <[email protected]> AuthorDate: Tue, 8 Sep 2015 10:59:00 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 15 Sep 2015 11:03:22 -0300
perf evlist: Fix create_syswide_maps() not propagating maps
Fix it by making it call perf_evlist__set_maps() instead of setting the maps itself.
--- tools/perf/util/evlist.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
tools/perf/util/evlist.c +10 -9
@@ -1400,6 +1400,8 @@ void perf_evlist__close(struct perf_evlist *evlist)static int perf_evlist__create_syswide_maps (struct perf_evlist *evlist) { +struct cpu_map *cpus; +struct thread_map *threads;int err = -ENOMEM ;/*
@@ -1411,20 +1413,19 @@ static int perf_evlist__create_syswide_maps(struct perf_evlist *evlist)* error, and we may not want to do that fallback to a * default cpu identity map :-\ */ - evlist->cpus =cpu_map__new (NULL ); -if (evlist->cpus ==NULL ) + cpus =cpu_map__new (NULL ); +if (!cpus) goto out; - evlist->threads =thread_map__new_dummy (); -if (evlist->threads ==NULL ) - goto out_free_cpus; + threads =thread_map__new_dummy (); +if (!threads) + goto out_put; - err =0 ; +perf_evlist__set_maps (evlist, cpus, threads); out:return err; -out_free_cpus: -cpu_map__put (evlist->cpus); - evlist->cpus =NULL ; +out_put: +cpu_map__put (cpus); goto out; }
Adrian Hunter
reviewerPATCH v3 13/14 perf tools: Fix task exit test setting maps
In reply to Adrian HunterThe test titled "Test number of exit event of a simple workload" was setting cpu/thread maps directly. Make it use the proper function perf_evlist__set_maps() especially now that it also propagates the maps.
--- tools/perf/tests/task-exit.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
tools/perf/tests/task-exit.c +14 -4
@@ -43,6 +43,8 @@ int test__task_exit(void) };const char *argv[] = {"true" ,NULL };char sbuf[STRERR_BUFSIZE ]; +struct cpu_map *cpus; +struct thread_map *threads;signal (SIGCHLD , sig_handler);
@@ -58,14 +60,19 @@ int test__task_exit(void)* perf_evlist__prepare_workload we'll fill in the only thread * we're monitoring, the one forked there. */ - evlist->cpus =cpu_map__dummy_new (); - evlist->threads =thread_map__new_by_tid (-1 ); -if (!evlist->cpus || !evlist->threads) { + cpus =cpu_map__dummy_new (); + threads =thread_map__new_by_tid (-1 ); +if (!cpus || !threads) { err = -ENOMEM ;pr_debug ("Not enough memory to create thread/cpu maps\n" ); - goto out_delete_evlist; + goto out_free_maps; } +perf_evlist__set_maps (evlist, cpus, threads); + + cpus =NULL ; + threads =NULL ; + err =perf_evlist__prepare_workload (evlist, &target, argv, false, workload_exec_failed_signal);if (err <0 ) {
@@ -114,6 +121,9 @@ retry: err =-1 ; } +out_free_maps: +cpu_map__put (cpus); +thread_map__put (threads); out_delete_evlist:perf_evlist__delete (evlist);return err;
Signature · 1 line
1.9.1
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf tests: Fix task exit test setting maps
perf tests: Fix task exit test setting maps
Commit-ID: 2998272275fc31fc3d478ef9c95e7eaef67dafa3 Gitweb: http://git.kernel.org/tip/2998272275fc31fc3d478ef9c95e7eaef67dafa3 Author: Adrian Hunter <[email protected]> AuthorDate: Tue, 8 Sep 2015 10:59:01 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 15 Sep 2015 11:03:58 -0300
perf tests: Fix task exit test setting maps
The test titled "Test number of exit event of a simple workload" was setting cpu/thread maps directly. Make it use the proper function perf_evlist__set_maps() especially now that it also propagates the maps.
--- tools/perf/tests/task-exit.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
tools/perf/tests/task-exit.c +14 -4
@@ -43,6 +43,8 @@ int test__task_exit(void) };const char *argv[] = {"true" ,NULL };char sbuf[STRERR_BUFSIZE ]; +struct cpu_map *cpus; +struct thread_map *threads;signal (SIGCHLD , sig_handler);
@@ -58,14 +60,19 @@ int test__task_exit(void)* perf_evlist__prepare_workload we'll fill in the only thread * we're monitoring, the one forked there. */ - evlist->cpus =cpu_map__dummy_new (); - evlist->threads =thread_map__new_by_tid (-1 ); -if (!evlist->cpus || !evlist->threads) { + cpus =cpu_map__dummy_new (); + threads =thread_map__new_by_tid (-1 ); +if (!cpus || !threads) { err = -ENOMEM ;pr_debug ("Not enough memory to create thread/cpu maps\n" ); - goto out_delete_evlist; + goto out_free_maps; } +perf_evlist__set_maps (evlist, cpus, threads); + + cpus =NULL ; + threads =NULL ; + err =perf_evlist__prepare_workload (evlist, &target, argv, false, workload_exec_failed_signal);if (err <0 ) {
@@ -114,6 +121,9 @@ retry: err =-1 ; } +out_free_maps: +cpu_map__put (cpus); +thread_map__put (threads); out_delete_evlist:perf_evlist__delete (evlist);return err;
Adrian Hunter
reviewerPATCH v3 14/14 perf tools: Fix software clock events test setting maps
In reply to Adrian HunterThe test titled "Test software clock events have valid period values" was setting cpu/thread maps directly. Make it use the proper function perf_evlist__set_maps() especially now that it also propagates the maps.
--- tools/perf/tests/sw-clock.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
tools/perf/tests/sw-clock.c +14 -4
@@ -34,6 +34,8 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id) .disabled = 1, .freq = 1, }; +struct cpu_map *cpus; +struct thread_map *threads; attr.sample_freq =500 ;
@@ -50,14 +52,19 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id) }perf_evlist__add (evlist, evsel); - evlist->cpus =cpu_map__dummy_new (); - evlist->threads =thread_map__new_by_tid (getpid ()); -if (!evlist->cpus || !evlist->threads) { + cpus =cpu_map__dummy_new (); + threads =thread_map__new_by_tid (getpid ()); +if (!cpus || !threads) { err = -ENOMEM ;pr_debug ("Not enough memory to create thread/cpu maps\n" ); - goto out_delete_evlist; + goto out_free_maps; } +perf_evlist__set_maps (evlist, cpus, threads); + + cpus =NULL ; + threads =NULL ; +if (perf_evlist__open (evlist)) {const char *knob ="/proc/sys/kernel/perf_event_max_sample_rate" ;
@@ -107,6 +114,9 @@ next_event: err =-1 ; } +out_free_maps: +cpu_map__put (cpus); +thread_map__put (threads); out_delete_evlist:perf_evlist__delete (evlist);return err;
Signature · 1 line
1.9.1
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf tests: Fix software clock events test setting maps
perf tests: Fix software clock events test setting maps
Commit-ID: c5e6bd2ed3e81df443e4ae11e95ed71ff77bf9e5 Gitweb: http://git.kernel.org/tip/c5e6bd2ed3e81df443e4ae11e95ed71ff77bf9e5 Author: Adrian Hunter <[email protected]> AuthorDate: Tue, 8 Sep 2015 10:59:02 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 15 Sep 2015 11:04:49 -0300
perf tests: Fix software clock events test setting maps
The test titled "Test software clock events have valid period values" was setting cpu/thread maps directly. Make it use the proper function perf_evlist__set_maps() especially now that it also propagates the maps.
--- tools/perf/tests/sw-clock.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
tools/perf/tests/sw-clock.c +14 -4
@@ -34,6 +34,8 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id) .disabled = 1, .freq = 1, }; +struct cpu_map *cpus; +struct thread_map *threads; attr.sample_freq =500 ;
@@ -50,14 +52,19 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id) }perf_evlist__add (evlist, evsel); - evlist->cpus =cpu_map__dummy_new (); - evlist->threads =thread_map__new_by_tid (getpid ()); -if (!evlist->cpus || !evlist->threads) { + cpus =cpu_map__dummy_new (); + threads =thread_map__new_by_tid (getpid ()); +if (!cpus || !threads) { err = -ENOMEM ;pr_debug ("Not enough memory to create thread/cpu maps\n" ); - goto out_delete_evlist; + goto out_free_maps; } +perf_evlist__set_maps (evlist, cpus, threads); + + cpus =NULL ; + threads =NULL ; +if (perf_evlist__open (evlist)) {const char *knob ="/proc/sys/kernel/perf_event_max_sample_rate" ;
@@ -107,6 +114,9 @@ next_event: err =-1 ; } +out_free_maps: +cpu_map__put (cpus); +thread_map__put (threads); out_delete_evlist:perf_evlist__delete (evlist);return err;
Quoted 16 lines · Adrian Hunter
Hi
Here is V3 of "Fix gaps propagating maps" that fixes some problems revealed by to
d988d5ee6478("perf evlist: Open event on evsel cpus and threads")Changes in V3:
perf tools: Remove redundant validation from
perf_evlist__propagate_maps
perf_evlist__set_mapsalso doesn't need to return an error anymoreperf tools: Add
evlist->has_user_cpus
Adjusted due toperf_evlist__set_mapschangeperf tools: Make
perf_evlist__create_maps()useperf_evlist__set_maps()
Adjusted due toperf_evlist__set_mapschange
Quoted 8 lines
perf tools: Fix
perf_evlist__create_syswide_maps()not propagating maps
Adjusted due toperf_evlist__set_mapschangeperf tools: Fix task exit test setting maps
Adjusted due toperf_evlist__set_mapschangeperf tools: Fix software clock events test setting maps
Adjusted due toperf_evlist__set_mapschange
thanks,
jirka
Adrian Hunter
reviewerQuoted 20 lines · Jiri Olsa
Quoted 19 lines · Adrian Hunter
Hi
Here is V3 of "Fix gaps propagating maps" that fixes some problems revealed by to
d988d5ee6478("perf evlist: Open event on evsel cpus and threads")Changes in V3:
perf tools: Remove redundant validation from
perf_evlist__propagate_maps
perf_evlist__set_mapsalso doesn't need to return an error anymoreperf tools: Add
evlist->has_user_cpus
Adjusted due toperf_evlist__set_mapschangeperf tools: Make
perf_evlist__create_maps()useperf_evlist__set_maps()
Adjusted due toperf_evlist__set_mapschangeperf tools: Fix
perf_evlist__create_syswide_maps()not propagating maps
Adjusted due toperf_evlist__set_mapschange
Quoted 7 lines
Quoted 5 lines
perf tools: Fix task exit test setting maps
Adjusted due toperf_evlist__set_mapschangeperf tools: Fix software clock events test setting maps
Adjusted due toperf_evlist__set_mapschangeAcked-by Jiri Olsa <[email protected]>
Hi Arnaldo
Please don't forget these. Intel PT is broken on 4.3 without them i.e.
$ tools/perf/perf --version perf version 4.3.rc1.gd25ed $ tools/perf/perf record -e intel_pt//u uname Error: The sys_perf_event_open() syscall returned with 22 (Invalid argument) for event (sched:sched_switch).
Regards
Adrian
Em Tue, Sep 15, 2015 at 09:52:56AM +0300, Adrian Hunter escreveu:
Quoted 31 lines · Jiri Olsa
Quoted 20 lines · Adrian Hunter
Quoted 19 lines
Hi
Here is V3 of "Fix gaps propagating maps" that fixes some problems revealed by to
d988d5ee6478("perf evlist: Open event on evsel cpus and threads")Changes in V3:
perf tools: Remove redundant validation from
perf_evlist__propagate_maps
perf_evlist__set_mapsalso doesn't need to return an error anymoreperf tools: Add
evlist->has_user_cpus
Adjusted due toperf_evlist__set_mapschangeperf tools: Make
perf_evlist__create_maps()useperf_evlist__set_maps()
Adjusted due toperf_evlist__set_mapschangeperf tools: Fix
perf_evlist__create_syswide_maps()not propagating maps
Adjusted due toperf_evlist__set_mapschangeQuoted 7 lines
Quoted 5 lines
perf tools: Fix task exit test setting maps
Adjusted due toperf_evlist__set_mapschangeperf tools: Fix software clock events test setting maps
Adjusted due toperf_evlist__set_mapschangeAcked-by Jiri Olsa <[email protected]>Hi Arnaldo
Quoted 8 lines
Please don't forget these. Intel PT is broken on 4.3 without them i.e.
$ tools/perf/perf --version perf version 4.3.rc1.gd25ed $ tools/perf/perf record -e intel_pt//u uname Error: The sys_perf_event_open() syscall returned with 22 (Invalid argument) for event (sched:sched_switch).
Ok, so this needs to go to perf/urgent, checking them now.
- Arnaldo
Em Tue, Sep 15, 2015 at 09:52:56AM +0300, Adrian Hunter escreveu:
Quoted 31 lines · Jiri Olsa
Quoted 20 lines · Adrian Hunter
Quoted 19 lines
Hi
Here is V3 of "Fix gaps propagating maps" that fixes some problems revealed by to
d988d5ee6478("perf evlist: Open event on evsel cpus and threads")Changes in V3:
perf tools: Remove redundant validation from
perf_evlist__propagate_maps
perf_evlist__set_mapsalso doesn't need to return an error anymoreperf tools: Add
evlist->has_user_cpus
Adjusted due toperf_evlist__set_mapschangeperf tools: Make
perf_evlist__create_maps()useperf_evlist__set_maps()
Adjusted due toperf_evlist__set_mapschangeperf tools: Fix
perf_evlist__create_syswide_maps()not propagating maps
Adjusted due toperf_evlist__set_mapschangeQuoted 7 lines
Quoted 5 lines
perf tools: Fix task exit test setting maps
Adjusted due toperf_evlist__set_mapschangeperf tools: Fix software clock events test setting maps
Adjusted due toperf_evlist__set_mapschangeAcked-by Jiri Olsa <[email protected]>Hi Arnaldo
Quoted 8 lines
Please don't forget these. Intel PT is broken on 4.3 without them i.e.
$ tools/perf/perf --version perf version 4.3.rc1.gd25ed $ tools/perf/perf record -e intel_pt//u uname Error: The sys_perf_event_open() syscall returned with 22 (Invalid argument) for event (sched:sched_switch).
Ok, applied the series, with just one change, which was patch-cosmetic, see the other message I'll send.
- Arnaldo