Re: [PATCH] perf/x86/uncore: Allow single pmu/box within events group

From	Jiri Olsa <jolsa@redhat.com>
Newsgroups	linux.kernel
Subject	Re: [PATCH] perf/x86/uncore: Allow single pmu/box within events group
Date	2016-11-18 14:50 +0100
Message-ID	<sERId-7NQ-1@gated-at.bofh.it> (permalink)
References	<sEF4l-7Yr-13@gated-at.bofh.it> <sEPwK-6s7-37@gated-at.bofh.it> <sEQCu-75C-39@gated-at.bofh.it> <sEQVQ-7dC-9@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Fri, Nov 18, 2016 at 01:53:54PM +0100, Peter Zijlstra wrote:

SNIP

> ---
>  arch/x86/events/intel/uncore.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c
> index efca2685d876..7b1b34576886 100644
> --- a/arch/x86/events/intel/uncore.c
> +++ b/arch/x86/events/intel/uncore.c
> @@ -319,9 +319,9 @@ static struct intel_uncore_box *uncore_alloc_box(struct intel_uncore_type *type,
>   */
>  static int uncore_pmu_event_init(struct perf_event *event);
>  
> -static bool is_uncore_event(struct perf_event *event)
> +static bool is_box_event(struct intel_uncore_box *box, struct perf_event *event)
>  {
> -	return event->pmu->event_init == uncore_pmu_event_init;
> +	return box->pmu == event->pmu;

this one needs to be:

+       return box->pmu == uncore_event_to_pmu(event);

and it works.. ;-)

Tested-by: Jiri Olsa <jolsa@redhat.com>

thanks,
jirka

>  }
>  
>  static int
> @@ -340,7 +340,7 @@ uncore_collect_events(struct intel_uncore_box *box, struct perf_event *leader,
>  
>  	n = box->n_events;
>  
> -	if (is_uncore_event(leader)) {
> +	if (is_box_event(box, leader)) {
>  		box->event_list[n] = leader;
>  		n++;
>  	}
> @@ -349,7 +349,7 @@ uncore_collect_events(struct intel_uncore_box *box, struct perf_event *leader,
>  		return n;
>  
>  	list_for_each_entry(event, &leader->sibling_list, group_entry) {
> -		if (!is_uncore_event(event) ||
> +		if (!is_box_event(box, event) ||
>  		    event->state <= PERF_EVENT_STATE_OFF)
>  			continue;
>

Thread

[PATCH] perf/x86/uncore: Allow single pmu/box within events group Jiri Olsa <jolsa@redhat.com> - 2016-11-18 01:20 +0100
  Re: [PATCH] perf/x86/uncore: Allow single pmu/box within events group Peter Zijlstra <peterz@infradead.org> - 2016-11-18 12:30 +0100
    Re: [PATCH] perf/x86/uncore: Allow single pmu/box within events group Jiri Olsa <jolsa@redhat.com> - 2016-11-18 13:40 +0100
      Re: [PATCH] perf/x86/uncore: Allow single pmu/box within events group Peter Zijlstra <peterz@infradead.org> - 2016-11-18 14:00 +0100
        Re: [PATCH] perf/x86/uncore: Allow single pmu/box within events group Jiri Olsa <jolsa@redhat.com> - 2016-11-18 14:30 +0100
        Re: [PATCH] perf/x86/uncore: Allow single pmu/box within events group Jiri Olsa <jolsa@redhat.com> - 2016-11-18 14:50 +0100
          Re: [PATCH] perf/x86/uncore: Allow single pmu/box within events group Peter Zijlstra <peterz@infradead.org> - 2016-11-18 15:10 +0100
            Re: [PATCH] perf/x86/uncore: Allow single pmu/box within events group Jiri Olsa <jolsa@redhat.com> - 2016-11-18 15:40 +0100
              Re: [PATCH] perf/x86/uncore: Allow single pmu/box within events group Peter Zijlstra <peterz@infradead.org> - 2016-11-18 15:50 +0100
        [tip:perf/urgent] perf/x86/intel/uncore: Allow only a single  PMU/box within an events group tip-bot for Peter Zijlstra <tipbot@zytor.com> - 2016-11-22 13:40 +0100

csiph-web