| Message ID | 1515617211-32024-1-git-send-email-mathieu.poirier@linaro.org |
|---|---|
| State | Accepted |
| Commit | 2178790baa8639a1f516f91685ae64cc8d09fee7 |
| Headers | show |
| Series | perf evsel: Fix incorrect handling of type _TERM_DRV_CFG | expand |
On Wed, Jan 10, 2018 at 01:46:51PM -0700, Mathieu Poirier wrote: > Commit ("d0565132605f perf evsel: Enable type checking for > perf_evsel_config_term types") assumes PERF_EVSEL__CONFIG_TERM_DRV_CFG > isn't used and as such adds a BUG_ON(). > > Since the enumeration type is used in macro ADD_CONFIG_TERM() the change > break CoreSight trace acquisition. > > This patch restores the original code. > > Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> Acked-by: Jiri Olsa <jolsa@kernel.org> thanks, jirka > --- > tools/perf/util/evsel.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c > index a4d256ea0dc4..b22071a20cd1 100644 > --- a/tools/perf/util/evsel.c > +++ b/tools/perf/util/evsel.c > @@ -781,7 +781,7 @@ static void apply_config_terms(struct perf_evsel *evsel, > attr->write_backward = term->val.overwrite ? 1 : 0; > break; > case PERF_EVSEL__CONFIG_TERM_DRV_CFG: > - BUG_ON(1); > + break; > default: > break; > } > -- > 2.7.4 >
Em Thu, Jan 11, 2018 at 03:51:19PM +0100, Jiri Olsa escreveu: > On Wed, Jan 10, 2018 at 01:46:51PM -0700, Mathieu Poirier wrote: > > Commit ("d0565132605f perf evsel: Enable type checking for > > perf_evsel_config_term types") assumes PERF_EVSEL__CONFIG_TERM_DRV_CFG > > isn't used and as such adds a BUG_ON(). > > > > Since the enumeration type is used in macro ADD_CONFIG_TERM() the change > > break CoreSight trace acquisition. > > > > This patch restores the original code. > > > > Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> > > Acked-by: Jiri Olsa <jolsa@kernel.org> Thanks, applied, and this affects only perf/core, - Arnaldo
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index a4d256ea0dc4..b22071a20cd1 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -781,7 +781,7 @@ static void apply_config_terms(struct perf_evsel *evsel, attr->write_backward = term->val.overwrite ? 1 : 0; break; case PERF_EVSEL__CONFIG_TERM_DRV_CFG: - BUG_ON(1); + break; default: break; }
Commit ("d0565132605f perf evsel: Enable type checking for perf_evsel_config_term types") assumes PERF_EVSEL__CONFIG_TERM_DRV_CFG isn't used and as such adds a BUG_ON(). Since the enumeration type is used in macro ADD_CONFIG_TERM() the change break CoreSight trace acquisition. This patch restores the original code. Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> --- tools/perf/util/evsel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4