Commit 79cba822 authored by Stephane Eranian's avatar Stephane Eranian Committed by Ingo Molnar

perf/x86: Add 'index' param to get_event_constraint() callback

This patch adds an index parameter to the get_event_constraint()
x86_pmu callback. It is expected to represent the index of the
event in the cpuc->event_list[] array. When the callback is used
for fake_cpuc (evnet validation), then the index must be -1. The
motivation for passing the index is to use it to index into another
cpuc array.
Signed-off-by: default avatarStephane Eranian <eranian@google.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: bp@alien8.de
Cc: jolsa@redhat.com
Cc: kan.liang@intel.com
Cc: maria.n.dimakopoulou@gmail.com
Link: http://lkml.kernel.org/r/1416251225-17721-5-git-send-email-eranian@google.comSigned-off-by: Ingo Molnar's avatarIngo Molnar <mingo@kernel.org>
parent c5362c0c
...@@ -789,7 +789,7 @@ int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign) ...@@ -789,7 +789,7 @@ int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign)
for (i = 0, wmin = X86_PMC_IDX_MAX, wmax = 0; i < n; i++) { for (i = 0, wmin = X86_PMC_IDX_MAX, wmax = 0; i < n; i++) {
hwc = &cpuc->event_list[i]->hw; hwc = &cpuc->event_list[i]->hw;
c = x86_pmu.get_event_constraints(cpuc, cpuc->event_list[i]); c = x86_pmu.get_event_constraints(cpuc, i, cpuc->event_list[i]);
hwc->constraint = c; hwc->constraint = c;
wmin = min(wmin, c->weight); wmin = min(wmin, c->weight);
...@@ -1777,7 +1777,7 @@ static int validate_event(struct perf_event *event) ...@@ -1777,7 +1777,7 @@ static int validate_event(struct perf_event *event)
if (IS_ERR(fake_cpuc)) if (IS_ERR(fake_cpuc))
return PTR_ERR(fake_cpuc); return PTR_ERR(fake_cpuc);
c = x86_pmu.get_event_constraints(fake_cpuc, event); c = x86_pmu.get_event_constraints(fake_cpuc, -1, event);
if (!c || !c->weight) if (!c || !c->weight)
ret = -EINVAL; ret = -EINVAL;
......
...@@ -456,6 +456,7 @@ struct x86_pmu { ...@@ -456,6 +456,7 @@ struct x86_pmu {
u64 max_period; u64 max_period;
struct event_constraint * struct event_constraint *
(*get_event_constraints)(struct cpu_hw_events *cpuc, (*get_event_constraints)(struct cpu_hw_events *cpuc,
int idx,
struct perf_event *event); struct perf_event *event);
void (*put_event_constraints)(struct cpu_hw_events *cpuc, void (*put_event_constraints)(struct cpu_hw_events *cpuc,
...@@ -751,7 +752,8 @@ static inline bool intel_pmu_has_bts(struct perf_event *event) ...@@ -751,7 +752,8 @@ static inline bool intel_pmu_has_bts(struct perf_event *event)
int intel_pmu_save_and_restart(struct perf_event *event); int intel_pmu_save_and_restart(struct perf_event *event);
struct event_constraint * struct event_constraint *
x86_get_event_constraints(struct cpu_hw_events *cpuc, struct perf_event *event); x86_get_event_constraints(struct cpu_hw_events *cpuc, int idx,
struct perf_event *event);
struct intel_shared_regs *allocate_shared_regs(int cpu); struct intel_shared_regs *allocate_shared_regs(int cpu);
......
...@@ -430,7 +430,8 @@ static void amd_pmu_cpu_dead(int cpu) ...@@ -430,7 +430,8 @@ static void amd_pmu_cpu_dead(int cpu)
} }
static struct event_constraint * static struct event_constraint *
amd_get_event_constraints(struct cpu_hw_events *cpuc, struct perf_event *event) amd_get_event_constraints(struct cpu_hw_events *cpuc, int idx,
struct perf_event *event)
{ {
/* /*
* if not NB event or no NB, then no constraints * if not NB event or no NB, then no constraints
...@@ -538,7 +539,8 @@ static struct event_constraint amd_f15_PMC50 = EVENT_CONSTRAINT(0, 0x3F, 0); ...@@ -538,7 +539,8 @@ static struct event_constraint amd_f15_PMC50 = EVENT_CONSTRAINT(0, 0x3F, 0);
static struct event_constraint amd_f15_PMC53 = EVENT_CONSTRAINT(0, 0x38, 0); static struct event_constraint amd_f15_PMC53 = EVENT_CONSTRAINT(0, 0x38, 0);
static struct event_constraint * static struct event_constraint *
amd_get_event_constraints_f15h(struct cpu_hw_events *cpuc, struct perf_event *event) amd_get_event_constraints_f15h(struct cpu_hw_events *cpuc, int idx,
struct perf_event *event)
{ {
struct hw_perf_event *hwc = &event->hw; struct hw_perf_event *hwc = &event->hw;
unsigned int event_code = amd_get_event_code(hwc); unsigned int event_code = amd_get_event_code(hwc);
......
...@@ -1827,7 +1827,8 @@ intel_shared_regs_constraints(struct cpu_hw_events *cpuc, ...@@ -1827,7 +1827,8 @@ intel_shared_regs_constraints(struct cpu_hw_events *cpuc,
} }
struct event_constraint * struct event_constraint *
x86_get_event_constraints(struct cpu_hw_events *cpuc, struct perf_event *event) x86_get_event_constraints(struct cpu_hw_events *cpuc, int idx,
struct perf_event *event)
{ {
struct event_constraint *c; struct event_constraint *c;
...@@ -1844,7 +1845,8 @@ x86_get_event_constraints(struct cpu_hw_events *cpuc, struct perf_event *event) ...@@ -1844,7 +1845,8 @@ x86_get_event_constraints(struct cpu_hw_events *cpuc, struct perf_event *event)
} }
static struct event_constraint * static struct event_constraint *
intel_get_event_constraints(struct cpu_hw_events *cpuc, struct perf_event *event) intel_get_event_constraints(struct cpu_hw_events *cpuc, int idx,
struct perf_event *event)
{ {
struct event_constraint *c; struct event_constraint *c;
...@@ -1860,7 +1862,7 @@ intel_get_event_constraints(struct cpu_hw_events *cpuc, struct perf_event *event ...@@ -1860,7 +1862,7 @@ intel_get_event_constraints(struct cpu_hw_events *cpuc, struct perf_event *event
if (c) if (c)
return c; return c;
return x86_get_event_constraints(cpuc, event); return x86_get_event_constraints(cpuc, idx, event);
} }
static void static void
...@@ -2105,9 +2107,12 @@ static struct event_constraint counter2_constraint = ...@@ -2105,9 +2107,12 @@ static struct event_constraint counter2_constraint =
EVENT_CONSTRAINT(0, 0x4, 0); EVENT_CONSTRAINT(0, 0x4, 0);
static struct event_constraint * static struct event_constraint *
hsw_get_event_constraints(struct cpu_hw_events *cpuc, struct perf_event *event) hsw_get_event_constraints(struct cpu_hw_events *cpuc, int idx,
struct perf_event *event)
{ {
struct event_constraint *c = intel_get_event_constraints(cpuc, event); struct event_constraint *c;
c = intel_get_event_constraints(cpuc, idx, event);
/* Handle special quirk on in_tx_checkpointed only in counter 2 */ /* Handle special quirk on in_tx_checkpointed only in counter 2 */
if (event->hw.config & HSW_IN_TX_CHECKPOINTED) { if (event->hw.config & HSW_IN_TX_CHECKPOINTED) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment