* [PATCHv2] perf tools: Add missing 'node' alias to the hw_cache array [not found] ` <20110713204348.GA7827@jolsa.brq.redhat.com> @ 2011-07-13 20:58 ` Jiri Olsa 2011-07-13 21:06 ` Peter Zijlstra 2011-07-21 10:09 ` [tip:perf/core] perf tools: Add missing 'node' alias to the hw_cache[] array tip-bot for Jiri Olsa 0 siblings, 2 replies; 3+ messages in thread From: Jiri Olsa @ 2011-07-13 20:58 UTC (permalink / raw) To: Peter Zijlstra; +Cc: acme, mingo, linux-kernel resent with proper lkml email.. sry --- On Tue, Jul 12, 2011 at 05:30:47PM +0200, Peter Zijlstra wrote: > On Tue, 2011-07-12 at 17:07 +0200, Jiri Olsa wrote: > > Adding "node" as a alias for NODE cache events. > > > > The addition of NODE cache events broke the parse_alias function, > > so any mismatched event caused the segfault, like: > > > > # ./perf stat -e krava ls > > > > The hw_cache array needs to follow PERF_COUNT_HW_CACHE_MAX enum. > > > > Signed-off-by: Jiri Olsa <jolsa@redhat.com> > > --- > > tools/perf/util/parse-events.c | 3 ++- > > 1 files changed, 2 insertions(+), 1 deletions(-) > > > > diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c > > index 41982c3..f599b91 100644 > > --- a/tools/perf/util/parse-events.c > > +++ b/tools/perf/util/parse-events.c > > @@ -89,10 +89,11 @@ static const char *sw_event_names[PERF_COUNT_SW_MAX] = { > > static const char *hw_cache[][MAX_ALIASES] = { > > { "L1-dcache", "l1-d", "l1d", "L1-data", }, > > { "L1-icache", "l1-i", "l1i", "L1-instruction", }, > > - { "LLC", "L2" }, > > + { "LLC", "L2", }, > > { "dTLB", "d-tlb", "Data-TLB", }, > > { "iTLB", "i-tlb", "Instruction-TLB", }, > > { "branch", "branches", "bpu", "btb", "bpc", }, > > + { "node", }, > > }; > > > > static const char *hw_cache_op[][MAX_ALIASES] = { > > Looks like there's more to fix, hw_cache_stat would also need a fixup. The hw_cache_stat is missing the NODE cache operation definition, but the array itself has proper bounds, so should be ok. I checked the original patch and looks like all read/write/prefetch should be enabled.. I added them > But wouldn't it be better to fix the tools not to crash if these _MAX > numbers don't match up? I added proper maximums to hw_cache/hw_cache_op/hw_cache_result arrays definitions, so it will not segfault if any of them is not properly updated in future. attaching new patch thanks, jirka --- Adding "node" as a simple alias for NODE cache events. The addition of NODE cache events broke the parse_alias function, so any mismatched event caused the segfault, like: # ./perf stat -e krava ls The hw_cache/hw_cache_op/hw_cache_result arrays needs to follow PERF_COUNT_HW_CACHE_*MAX enums. Adding those MAXs to be size of those arrays, so possible ommision in future wil not lead to segfault. Adding read/write/prefetch as allowed operations for node cache event. Signed-off-by: Jiri Olsa <jolsa@redhat.com> --- tools/perf/util/parse-events.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 41982c3..c0e21ae 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -86,22 +86,24 @@ static const char *sw_event_names[PERF_COUNT_SW_MAX] = { #define MAX_ALIASES 8 -static const char *hw_cache[][MAX_ALIASES] = { +static const char *hw_cache[PERF_COUNT_HW_CACHE_MAX][MAX_ALIASES] = { { "L1-dcache", "l1-d", "l1d", "L1-data", }, { "L1-icache", "l1-i", "l1i", "L1-instruction", }, - { "LLC", "L2" }, + { "LLC", "L2", }, { "dTLB", "d-tlb", "Data-TLB", }, { "iTLB", "i-tlb", "Instruction-TLB", }, { "branch", "branches", "bpu", "btb", "bpc", }, + { "node", }, }; -static const char *hw_cache_op[][MAX_ALIASES] = { +static const char *hw_cache_op[PERF_COUNT_HW_CACHE_OP_MAX][MAX_ALIASES] = { { "load", "loads", "read", }, { "store", "stores", "write", }, { "prefetch", "prefetches", "speculative-read", "speculative-load", }, }; -static const char *hw_cache_result[][MAX_ALIASES] = { +static const char *hw_cache_result[PERF_COUNT_HW_CACHE_RESULT_MAX] + [MAX_ALIASES] = { { "refs", "Reference", "ops", "access", }, { "misses", "miss", }, }; @@ -124,6 +126,7 @@ static unsigned long hw_cache_stat[C(MAX)] = { [C(DTLB)] = (CACHE_READ | CACHE_WRITE | CACHE_PREFETCH), [C(ITLB)] = (CACHE_READ), [C(BPU)] = (CACHE_READ), + [C(NODE)] = (CACHE_READ | CACHE_WRITE | CACHE_PREFETCH), }; #define for_each_subsystem(sys_dir, sys_dirent, sys_next) \ @@ -393,7 +396,7 @@ parse_generic_hw_event(const char **str, struct perf_event_attr *attr) PERF_COUNT_HW_CACHE_OP_MAX); if (cache_op >= 0) { if (!is_cache_op_valid(cache_type, cache_op)) - return 0; + return EVT_FAILED; continue; } } -- 1.7.4 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCHv2] perf tools: Add missing 'node' alias to the hw_cache array 2011-07-13 20:58 ` [PATCHv2] perf tools: Add missing 'node' alias to the hw_cache array Jiri Olsa @ 2011-07-13 21:06 ` Peter Zijlstra 2011-07-21 10:09 ` [tip:perf/core] perf tools: Add missing 'node' alias to the hw_cache[] array tip-bot for Jiri Olsa 1 sibling, 0 replies; 3+ messages in thread From: Peter Zijlstra @ 2011-07-13 21:06 UTC (permalink / raw) To: Jiri Olsa; +Cc: acme, mingo, linux-kernel On Wed, 2011-07-13 at 22:58 +0200, Jiri Olsa wrote: > Adding "node" as a simple alias for NODE cache events. > > The addition of NODE cache events broke the parse_alias function, > so any mismatched event caused the segfault, like: > > # ./perf stat -e krava ls > > The hw_cache/hw_cache_op/hw_cache_result arrays needs to follow > PERF_COUNT_HW_CACHE_*MAX enums. Adding those MAXs to be size > of those arrays, so possible ommision in future wil not lead to > segfault. > > Adding read/write/prefetch as allowed operations for node cache > event. > > Signed-off-by: Jiri Olsa <jolsa@redhat.com> Thanks! ^ permalink raw reply [flat|nested] 3+ messages in thread
* [tip:perf/core] perf tools: Add missing 'node' alias to the hw_cache[] array 2011-07-13 20:58 ` [PATCHv2] perf tools: Add missing 'node' alias to the hw_cache array Jiri Olsa 2011-07-13 21:06 ` Peter Zijlstra @ 2011-07-21 10:09 ` tip-bot for Jiri Olsa 1 sibling, 0 replies; 3+ messages in thread From: tip-bot for Jiri Olsa @ 2011-07-21 10:09 UTC (permalink / raw) To: linux-tip-commits Cc: linux-kernel, hpa, mingo, a.p.zijlstra, tglx, mingo, jolsa Commit-ID: 0111919da268e1ced315e009ad0d0435a2fb32ac Gitweb: http://git.kernel.org/tip/0111919da268e1ced315e009ad0d0435a2fb32ac Author: Jiri Olsa <jolsa@redhat.com> AuthorDate: Wed, 13 Jul 2011 22:58:18 +0200 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Thu, 21 Jul 2011 09:54:51 +0200 perf tools: Add missing 'node' alias to the hw_cache[] array Add "node" as a simple alias for NODE cache events. The addition of NODE cache events broke the parse_alias function, so any mismatched event caused the segfault, like: # ./perf stat -e krava ls The hw_cache/hw_cache_op/hw_cache_result arrays needs to follow PERF_COUNT_HW_CACHE_*MAX enums. Adding those MAXs to be size of those arrays, so possible ommision in future wil not lead to segfault. Adding read/write/prefetch as allowed operations for node cache event. Signed-off-by: Jiri Olsa <jolsa@redhat.com> Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: acme@redhat.com Link: http://lkml.kernel.org/r/20110713205818.GB7827@jolsa.brq.redhat.com Signed-off-by: Ingo Molnar <mingo@elte.hu> --- tools/perf/util/parse-events.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 41982c3..c0e21ae 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -86,22 +86,24 @@ static const char *sw_event_names[PERF_COUNT_SW_MAX] = { #define MAX_ALIASES 8 -static const char *hw_cache[][MAX_ALIASES] = { +static const char *hw_cache[PERF_COUNT_HW_CACHE_MAX][MAX_ALIASES] = { { "L1-dcache", "l1-d", "l1d", "L1-data", }, { "L1-icache", "l1-i", "l1i", "L1-instruction", }, - { "LLC", "L2" }, + { "LLC", "L2", }, { "dTLB", "d-tlb", "Data-TLB", }, { "iTLB", "i-tlb", "Instruction-TLB", }, { "branch", "branches", "bpu", "btb", "bpc", }, + { "node", }, }; -static const char *hw_cache_op[][MAX_ALIASES] = { +static const char *hw_cache_op[PERF_COUNT_HW_CACHE_OP_MAX][MAX_ALIASES] = { { "load", "loads", "read", }, { "store", "stores", "write", }, { "prefetch", "prefetches", "speculative-read", "speculative-load", }, }; -static const char *hw_cache_result[][MAX_ALIASES] = { +static const char *hw_cache_result[PERF_COUNT_HW_CACHE_RESULT_MAX] + [MAX_ALIASES] = { { "refs", "Reference", "ops", "access", }, { "misses", "miss", }, }; @@ -124,6 +126,7 @@ static unsigned long hw_cache_stat[C(MAX)] = { [C(DTLB)] = (CACHE_READ | CACHE_WRITE | CACHE_PREFETCH), [C(ITLB)] = (CACHE_READ), [C(BPU)] = (CACHE_READ), + [C(NODE)] = (CACHE_READ | CACHE_WRITE | CACHE_PREFETCH), }; #define for_each_subsystem(sys_dir, sys_dirent, sys_next) \ @@ -393,7 +396,7 @@ parse_generic_hw_event(const char **str, struct perf_event_attr *attr) PERF_COUNT_HW_CACHE_OP_MAX); if (cache_op >= 0) { if (!is_cache_op_valid(cache_type, cache_op)) - return 0; + return EVT_FAILED; continue; } } ^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-07-21 10:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1310483256-5772-1-git-send-email-jolsa@redhat.com>
[not found] ` <1310484647.14978.33.camel@twins>
[not found] ` <20110713204348.GA7827@jolsa.brq.redhat.com>
2011-07-13 20:58 ` [PATCHv2] perf tools: Add missing 'node' alias to the hw_cache array Jiri Olsa
2011-07-13 21:06 ` Peter Zijlstra
2011-07-21 10:09 ` [tip:perf/core] perf tools: Add missing 'node' alias to the hw_cache[] array tip-bot for Jiri Olsa
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox