perf: add a dummy software event to keep tracking
Adrian Hunter
reviewerv2 cover perf: add a dummy software event to keep tracking
Hi
This is (version 2 of) an alternative to the 'keep tracking' flag patch which is here:
http://marc.info/?l=linux-kernel&m=137242545521246&w=2
perf tools is updated and a test added to demonstrate the new event.
Changes in V2:
perf: add a dummy software event to keep tracking
Add Peter's Ack
perf tools: add support for PERF_COUNT_SW_DUMMY
Fix missing "dummy" in perf_evsel__sw_names
perf tools: add 'keep tracking' test
Let the test pass and print "not supported" if there is no "dummy" event
Adrian Hunter (3):
perf: add a dummy software event to keep tracking perf tools: add support for PERF_COUNT_SW_DUMMY perf tools: add 'keep tracking' test
include/uapi/linux/perf_event.h | 1 + tools/perf/Makefile | 1 + tools/perf/tests/builtin-test.c | 4 ++ tools/perf/tests/keep-tracking.c | 150 +++++++++++++++++++++++++++++++++++++++ tools/perf/tests/tests.h | 1 + tools/perf/util/evlist.c | 42 ++++++++++- tools/perf/util/evlist.h | 5 ++ tools/perf/util/parse-events.c | 4 ++ tools/perf/util/parse-events.l | 1 + tools/perf/util/python.c | 1 + 10 files changed, 208 insertions(+), 2 deletions(-) create mode 100644 tools/perf/tests/keep-tracking.c
Regards
Adrian
Adrian Hunter
reviewerPATCH v2 1/3 perf: add a dummy software event to keep tracking
When an event is disabled the "tracking" events selected by the 'mmap', 'comm' and 'task' bits of struct perf_event_attr, are also disabled. However, the information those events provide is necessary to resolve symbols for when the main event is re-enabled.
The "tracking" events can be kept enabled by putting them on another event, but that requires an event that otherwise does nothing. A new software event PERF_COUNT_SW_DUMMY is added for that purpose.
--- include/uapi/linux/perf_event.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/perf_event.h +1 -0
@@ -109,6 +109,7 @@ enum perf_sw_ids {PERF_COUNT_SW_PAGE_FAULTS_MAJ =6 ,PERF_COUNT_SW_ALIGNMENT_FAULTS =7 ,PERF_COUNT_SW_EMULATION_FAULTS =8 , +PERF_COUNT_SW_DUMMY =9 , PERF_COUNT_SW_MAX, /* non-ABI */ };
Signature · 1 line
1.7.11.7
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf: Add a dummy software event to keep tracking
perf: Add a dummy software event to keep tracking
Commit-ID: fa0097ee690693006ab1aea6c01ad3c851b65c77 Gitweb: http://git.kernel.org/tip/fa0097ee690693006ab1aea6c01ad3c851b65c77 Author: Adrian Hunter <[email protected]> AuthorDate: Sat, 31 Aug 2013 21:50:51 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 2 Sep 2013 14:58:19 -0300
perf: Add a dummy software event to keep tracking
When an event is disabled the "tracking" events selected by the 'mmap', 'comm' and 'task' bits of struct perf_event_attr, are also disabled. However, the information those events provide is necessary to resolve symbols for when the main event is re-enabled.
The "tracking" events can be kept enabled by putting them on another event, but that requires an event that otherwise does nothing. A new software event PERF_COUNT_SW_DUMMY is added for that purpose.
--- include/uapi/linux/perf_event.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/perf_event.h +1 -0
@@ -109,6 +109,7 @@ enum perf_sw_ids {PERF_COUNT_SW_PAGE_FAULTS_MAJ =6 ,PERF_COUNT_SW_ALIGNMENT_FAULTS =7 ,PERF_COUNT_SW_EMULATION_FAULTS =8 , +PERF_COUNT_SW_DUMMY =9 , PERF_COUNT_SW_MAX, /* non-ABI */ };
Adrian Hunter
reviewerPATCH v2 2/3 perf tools: add support for PERF_COUNT_SW_DUMMY
In reply to Adrian HunterAdd support for the new dummy software eventPERF_COUNT_SW_DUMMY.
--- tools/perf/util/evsel.c | 1 + tools/perf/util/parse-events.c | 4 ++++ tools/perf/util/parse-events.l | 1 + tools/perf/util/python.c | 1 + 4 files changed, 7 insertions(+)
tools/perf/util/evsel.c +1 -0
@@ -323,6 +323,7 @@ const char *perf_evsel__sw_names[PERF_COUNT_SW_MAX] = {"major-faults" ,"alignment-faults" ,"emulation-faults" , + "dummy", };static const char *__perf_evsel__sw_name (u64 config)
tools/perf/util/parse-events.c +4 -0
@@ -108,6 +108,10 @@ static struct event_symbol event_symbols_sw[PERF_COUNT_SW_MAX] = { .symbol = "emulation-faults", .alias = "", }, + [PERF_COUNT_SW_DUMMY] = { + .symbol = "dummy", + .alias = "", + }, };#define __PERF_EVENT_FIELD (config, name) \
tools/perf/util/parse-events.l +1 -0
@@ -145,6 +145,7 @@ context-switches|cs { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW cpu-migrations|migrations { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_CPU_MIGRATIONS); } alignment-faults { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_ALIGNMENT_FAULTS); } emulation-faults { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_EMULATION_FAULTS); } +dummy { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_DUMMY); } L1-dcache|l1-d|l1d|L1-data | L1-icache|l1-i|l1i|L1-instruction |
tools/perf/util/python.c +1 -0
@@ -987,6 +987,7 @@ static struct { { "COUNT_SW_PAGE_FAULTS_MAJ", PERF_COUNT_SW_PAGE_FAULTS_MAJ }, { "COUNT_SW_ALIGNMENT_FAULTS", PERF_COUNT_SW_ALIGNMENT_FAULTS }, { "COUNT_SW_EMULATION_FAULTS", PERF_COUNT_SW_EMULATION_FAULTS }, + { "COUNT_SW_DUMMY", PERF_COUNT_SW_DUMMY }, { "SAMPLE_IP", PERF_SAMPLE_IP }, { "SAMPLE_TID", PERF_SAMPLE_TID },
Signature · 1 line
1.7.11.7
Re: [PATCH V2 2/3] perf tools: add support for PERF_COUNT_SW_DUMMY
Quoted 4 lines · Adrian Hunter
Add support for the new dummy software event
PERF_COUNT_SW_DUMMY.Signed-off-by Adrian Hunter <[email protected]>
Tested/Acked-by: Jiri Olsa <[email protected]>
jirka
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf tools: Add support for PERF_COUNT_SW_DUMMY
In reply to Adrian Hunterperf tools: Add support for PERF_COUNT_SW_DUMMY
Commit-ID: d22d1a2a2c224b3b378d873589ced27add7ebde4 Gitweb: http://git.kernel.org/tip/d22d1a2a2c224b3b378d873589ced27add7ebde4 Author: Adrian Hunter <[email protected]> AuthorDate: Sat, 31 Aug 2013 21:50:52 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 2 Sep 2013 14:58:20 -0300
perf tools: Add support for PERF_COUNT_SW_DUMMY
Add support for the new dummy software event PERF_COUNT_SW_DUMMY.
--- tools/perf/util/evsel.c | 1 + tools/perf/util/parse-events.c | 4 ++++ tools/perf/util/parse-events.l | 1 + tools/perf/util/python.c | 1 + 4 files changed, 7 insertions(+)
tools/perf/util/evsel.c +1 -0
@@ -323,6 +323,7 @@ const char *perf_evsel__sw_names[PERF_COUNT_SW_MAX] = {"major-faults" ,"alignment-faults" ,"emulation-faults" , + "dummy", };static const char *__perf_evsel__sw_name (u64 config)
tools/perf/util/parse-events.c +4 -0
@@ -108,6 +108,10 @@ static struct event_symbol event_symbols_sw[PERF_COUNT_SW_MAX] = { .symbol = "emulation-faults", .alias = "", }, + [PERF_COUNT_SW_DUMMY] = { + .symbol = "dummy", + .alias = "", + }, };#define __PERF_EVENT_FIELD (config, name) \
tools/perf/util/parse-events.l +1 -0
@@ -145,6 +145,7 @@ context-switches|cs { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW cpu-migrations|migrations { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_CPU_MIGRATIONS); } alignment-faults { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_ALIGNMENT_FAULTS); } emulation-faults { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_EMULATION_FAULTS); } +dummy { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_DUMMY); } L1-dcache|l1-d|l1d|L1-data | L1-icache|l1-i|l1i|L1-instruction |
tools/perf/util/python.c +1 -0
@@ -987,6 +987,7 @@ static struct { { "COUNT_SW_PAGE_FAULTS_MAJ", PERF_COUNT_SW_PAGE_FAULTS_MAJ }, { "COUNT_SW_ALIGNMENT_FAULTS", PERF_COUNT_SW_ALIGNMENT_FAULTS }, { "COUNT_SW_EMULATION_FAULTS", PERF_COUNT_SW_EMULATION_FAULTS }, + { "COUNT_SW_DUMMY", PERF_COUNT_SW_DUMMY }, { "SAMPLE_IP", PERF_SAMPLE_IP }, { "SAMPLE_TID", PERF_SAMPLE_TID },
Adrian Hunter
reviewerPATCH v2 3/3 perf tools: add 'keep tracking' test
In reply to Adrian HunterAdd a test for the newly added PERF_COUNT_SW_DUMMY event. The test checks that tracking events continue when an event is disabled but a dummy software event is not disabled.
--- tools/perf/Makefile | 1 + tools/perf/tests/builtin-test.c | 4 + tools/perf/tests/keep-tracking.c | 154 +++++++++++++++++++++++++++++++++++++++ tools/perf/tests/tests.h | 1 + tools/perf/util/evlist.c | 42 ++++++++++- tools/perf/util/evlist.h | 5 ++ 6 files changed, 205 insertions(+), 2 deletions(-) create mode 100644 tools/perf/tests/keep-tracking.c
tools/perf/Makefile +1 -0
@@ -465,6 +465,7 @@ endif # NO_LIBELF ifndef NO_LIBUNWIND LIB_OBJS += $(OUTPUT)util/unwind.o endif +LIB_OBJS += $(OUTPUT)tests/keep-tracking.o ifndef NO_LIBAUDIT BUILTIN_OBJS += $(OUTPUT)builtin-trace.o
tools/perf/tests/builtin-test.c +4 -0
@@ -108,6 +108,10 @@ static struct test { .func = test__sample_parsing, }, { + .desc = "Test using a dummy software event to keep tracking", + .func = test__keep_tracking, + }, + { .func = NULL, }, };
tools/perf/tests/keep-tracking.c new file +154 -0
154 lines not on this page · raw message
tools/perf/tests/tests.h +1 -0
@@ -38,5 +38,6 @@ int test__sw_clock_freq(void);int test__perf_time_to_tsc (void );int test__code_reading (void );int test__sample_parsing (void ); +int test__keep_tracking (void );#endif /* TESTS_H */
tools/perf/util/evlist.c +40 -2
60 lines not on this page · raw message
tools/perf/util/evlist.h +5 -0
@@ -110,6 +110,11 @@ void perf_evlist__munmap(struct perf_evlist *evlist);void perf_evlist__disable (struct perf_evlist *evlist);void perf_evlist__enable (struct perf_evlist *evlist); +int perf_evlist__disable_event (struct perf_evlist *evlist, +struct perf_evsel *evsel); +int perf_evlist__enable_event (struct perf_evlist *evlist, +struct perf_evsel *evsel); +void perf_evlist__set_selected (struct perf_evlist *evlist,struct perf_evsel *evsel);
Signature · 1 line
1.7.11.7
Re: [PATCH V2 3/3] perf tools: add 'keep tracking' test
Quoted 6 lines · Adrian Hunter
Add a test for the newly added
PERF_COUNT_SW_DUMMYevent. The test checks that tracking events continue when an event is disabled but a dummy software event is not disabled.Signed-off-by Adrian Hunter <[email protected]>
Tested/Acked-by: Jiri Olsa <[email protected]>
jirka
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf tests: Add 'keep tracking' test
In reply to Adrian Hunterperf tests: Add 'keep tracking' test
Commit-ID: 395c307089c9f5f0d82c63c11c79227b57bb7ac5 Gitweb: http://git.kernel.org/tip/395c307089c9f5f0d82c63c11c79227b57bb7ac5 Author: Adrian Hunter <[email protected]> AuthorDate: Sat, 31 Aug 2013 21:50:53 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 2 Sep 2013 14:58:20 -0300
perf tests: Add 'keep tracking' test
Add a test for the newly added PERF_COUNT_SW_DUMMY event. The test checks that tracking events continue when an event is disabled but a dummy software event is not disabled.
--- tools/perf/Makefile | 1 + tools/perf/tests/builtin-test.c | 4 + tools/perf/tests/keep-tracking.c | 154 +++++++++++++++++++++++++++++++++++++++ tools/perf/tests/tests.h | 1 + tools/perf/util/evlist.c | 42 ++++++++++- tools/perf/util/evlist.h | 5 ++ 6 files changed, 205 insertions(+), 2 deletions(-)
tools/perf/Makefile +1 -0
@@ -465,6 +465,7 @@ endif # NO_LIBELF ifndef NO_LIBUNWIND LIB_OBJS += $(OUTPUT)util/unwind.o endif +LIB_OBJS += $(OUTPUT)tests/keep-tracking.o ifndef NO_LIBAUDIT BUILTIN_OBJS += $(OUTPUT)builtin-trace.o
tools/perf/tests/builtin-test.c +4 -0
@@ -108,6 +108,10 @@ static struct test { .func = test__sample_parsing, }, { + .desc = "Test using a dummy software event to keep tracking", + .func = test__keep_tracking, + }, + { .func = NULL, }, };
tools/perf/tests/keep-tracking.c new file +154 -0
154 lines not on this page · raw message
tools/perf/tests/tests.h +1 -0
@@ -38,5 +38,6 @@ int test__sw_clock_freq(void);int test__perf_time_to_tsc (void );int test__code_reading (void );int test__sample_parsing (void ); +int test__keep_tracking (void );#endif /* TESTS_H */
tools/perf/util/evlist.c +40 -2
60 lines not on this page · raw message
tools/perf/util/evlist.h +5 -0
@@ -110,6 +110,11 @@ void perf_evlist__munmap(struct perf_evlist *evlist);void perf_evlist__disable (struct perf_evlist *evlist);void perf_evlist__enable (struct perf_evlist *evlist); +int perf_evlist__disable_event (struct perf_evlist *evlist, +struct perf_evsel *evsel); +int perf_evlist__enable_event (struct perf_evlist *evlist, +struct perf_evsel *evsel); +void perf_evlist__set_selected (struct perf_evlist *evlist,struct perf_evsel *evsel);