All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] perf evsel: Fix incorrect handling of type _TERM_DRV_CFG
@ 2018-01-10 20:46 Mathieu Poirier
  2018-01-11 14:51 ` Jiri Olsa
  2018-01-17 16:25 ` [tip:perf/core] " tip-bot for Mathieu Poirier
  0 siblings, 2 replies; 4+ messages in thread
From: Mathieu Poirier @ 2018-01-10 20:46 UTC (permalink / raw)
  To: acme, ak; +Cc: peterz, mingo, alexander.shishkin, jolsa, namhyung, linux-kernel

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(-)

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

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] perf evsel: Fix incorrect handling of type _TERM_DRV_CFG
  2018-01-10 20:46 [PATCH] perf evsel: Fix incorrect handling of type _TERM_DRV_CFG Mathieu Poirier
@ 2018-01-11 14:51 ` Jiri Olsa
  2018-01-11 14:58   ` Arnaldo Carvalho de Melo
  2018-01-17 16:25 ` [tip:perf/core] " tip-bot for Mathieu Poirier
  1 sibling, 1 reply; 4+ messages in thread
From: Jiri Olsa @ 2018-01-11 14:51 UTC (permalink / raw)
  To: Mathieu Poirier
  Cc: acme, ak, peterz, mingo, alexander.shishkin, namhyung,
	linux-kernel

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
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] perf evsel: Fix incorrect handling of type _TERM_DRV_CFG
  2018-01-11 14:51 ` Jiri Olsa
@ 2018-01-11 14:58   ` Arnaldo Carvalho de Melo
  0 siblings, 0 replies; 4+ messages in thread
From: Arnaldo Carvalho de Melo @ 2018-01-11 14:58 UTC (permalink / raw)
  To: Jiri Olsa
  Cc: Mathieu Poirier, ak, peterz, mingo, alexander.shishkin, namhyung,
	linux-kernel

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

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [tip:perf/core] perf evsel: Fix incorrect handling of type _TERM_DRV_CFG
  2018-01-10 20:46 [PATCH] perf evsel: Fix incorrect handling of type _TERM_DRV_CFG Mathieu Poirier
  2018-01-11 14:51 ` Jiri Olsa
@ 2018-01-17 16:25 ` tip-bot for Mathieu Poirier
  1 sibling, 0 replies; 4+ messages in thread
From: tip-bot for Mathieu Poirier @ 2018-01-17 16:25 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: acme, tglx, alexander.shishkin, jolsa, peterz, mingo, hpa, ak,
	mathieu.poirier, namhyung, linux-kernel

Commit-ID:  2178790baa8639a1f516f91685ae64cc8d09fee7
Gitweb:     https://git.kernel.org/tip/2178790baa8639a1f516f91685ae64cc8d09fee7
Author:     Mathieu Poirier <mathieu.poirier@linaro.org>
AuthorDate: Wed, 10 Jan 2018 13:46:51 -0700
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Thu, 11 Jan 2018 11:56:07 -0300

perf evsel: Fix incorrect handling of type _TERM_DRV_CFG

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>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Fixes: d0565132605f ("perf evsel: Enable type checking for perf_evsel_config_term types")
Link: http://lkml.kernel.org/r/1515617211-32024-1-git-send-email-mathieu.poirier@linaro.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 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 d934f04e3..4eea3b4 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;
 		}

^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-01-17 16:29 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-10 20:46 [PATCH] perf evsel: Fix incorrect handling of type _TERM_DRV_CFG Mathieu Poirier
2018-01-11 14:51 ` Jiri Olsa
2018-01-11 14:58   ` Arnaldo Carvalho de Melo
2018-01-17 16:25 ` [tip:perf/core] " tip-bot for Mathieu Poirier

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.