Messages in this thread | | | Date | Fri, 22 May 2015 15:40:56 +0200 | From | Peter Zijlstra <> | Subject | Re: [PATCH v2 01/11] perf,x86: Fix event/group validation |
| |
On Fri, May 22, 2015 at 03:29:06PM +0200, Peter Zijlstra wrote: > @@ -788,9 +788,9 @@ int x86_schedule_events(struct cpu_hw_ev > x86_pmu.start_scheduling(cpuc); > > for (i = 0, wmin = X86_PMC_IDX_MAX, wmax = 0; i < n; i++) { > + cpuc->event_constraint[i] = NULL;
^^^ that is new, which is esp. important in light of the intel_get_event_constraints() hunk below, which would happily continue life with a garbage constraint.
> c = x86_pmu.get_event_constraints(cpuc, i, cpuc->event_list[i]); > + cpuc->event_constraint[i] = c; > > wmin = min(wmin, c->weight); > wmax = max(wmax, c->weight);
> +++ b/arch/x86/kernel/cpu/perf_event_intel.c > @@ -2106,7 +2106,7 @@ static struct event_constraint * > intel_get_event_constraints(struct cpu_hw_events *cpuc, int idx, > struct perf_event *event) > { > - struct event_constraint *c1 = event->hw.constraint; > + struct event_constraint *c1 = cpuc->event_constraint[idx]; > struct event_constraint *c2; > > /*
| |