[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20100330171100.GC5211@lenovo>
Date: Tue, 30 Mar 2010 21:11:00 +0400
From: Cyrill Gorcunov <gorcunov@...il.com>
To: Peter Zijlstra <peterz@...radead.org>
Cc: Robert Richter <robert.richter@....com>,
Stephane Eranian <eranian@...gle.com>,
Ingo Molnar <mingo@...e.hu>,
LKML <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 0/3] perf/core, x86: unify perfctr bitmasks
On Tue, Mar 30, 2010 at 06:55:13PM +0200, Peter Zijlstra wrote:
> On Tue, 2010-03-30 at 17:59 +0200, Robert Richter wrote:
> > > + if (attr->type == PERF_TYPE_RAW)
> > > + return x86_pmu.raw_event(event);
> >
> > We could go on with this and move this into *_hw_config(), but so far
> > this change is fine to me. This would then remove .raw_event() at all.
> >
>
> Right, I did have a brief look at that, you mentioned this before to
> Cyrill IIRC, but the issue is that... ~brainwave~ how about the below..
>
Yeah, Robert sais me about eliminating raw_event, just remember :)
[...]
> -static int p4_hw_config(struct perf_event_attr *attr, struct hw_perf_event *hwc)
> +static int p4_hw_config(struct perf_event *event)
> {
> int cpu = raw_smp_processor_id();
> u32 escr, cccr;
> @@ -444,11 +431,29 @@ static int p4_hw_config(struct perf_even
> */
>
> cccr = p4_default_cccr_conf(cpu);
> - escr = p4_default_escr_conf(cpu, attr->exclude_kernel, attr->exclude_user);
> - hwc->config = p4_config_pack_escr(escr) | p4_config_pack_cccr(cccr);
> + escr = p4_default_escr_conf(cpu, event->attr.exclude_kernel,
> + event->attr.exclude_user);
> + event->hw.config = p4_config_pack_escr(escr) |
> + p4_config_pack_cccr(cccr);
>
> if (p4_ht_active() && p4_ht_thread(cpu))
> - hwc->config = p4_set_ht_bit(hwc->config);
> + event->hw.config = p4_set_ht_bit(event->hw.config);
> +
> + if (event->attr.type != PERF_TYPE_RAW)
> + return 0;
> +
> + /*
> + * We don't control raw events so it's up to the caller
> + * to pass sane values (and we don't count the thread number
> + * on HT machine but allow HT-compatible specifics to be
> + * passed on)
> + *
> + * XXX: HT wide things should check perf_paranoid_cpu() &&
> + * CAP_SYS_ADMIN
> + */
> + event->hw.config |= event->attr.config &
> + (p4_config_pack_escr(P4_ESCR_MASK_HT) |
> + p4_config_pack_cccr(P4_CCCR_MASK_HT));
>
> return 0;
> }
[...]
I'll update P4 snippet.
-- Cyrill
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists