From: Stephane Eranian <eranian@google.com>
To: linux-kernel@vger.kernel.org
Cc: peterz@infradead.org, mingo@elte.hu, ak@linux.intel.com,
jolsa@redhat.com, zheng.z.yan@intel.com,
maria.n.dimakopoulou@gmail.com
Subject: [PATCH 3/9] perf/x86: add 3 new scheduling callbacks
Date: Wed, 4 Jun 2014 23:34:12 +0200 [thread overview]
Message-ID: <1401917658-26065-4-git-send-email-eranian@google.com> (raw)
In-Reply-To: <1401917658-26065-1-git-send-email-eranian@google.com>
From: Maria Dimakopoulou <maria.n.dimakopoulou@gmail.com>
This patch adds 3 new PMU model specific callbacks
during the event scheduling done by x86_schedule_events().
- start_scheduling: invoked when entering the schedule routine.
- stop_scheduling: invoked at the end of the schedule routine
- commit_scheduling: invoked for each committed event
To be used optionally by model-specific code.
Reviewed-by: Stephane Eranian <eranian@google.com>
Signed-off-by: Maria Dimakopoulou <maria.n.dimakopoulou@gmail.com>
---
arch/x86/kernel/cpu/perf_event.c | 9 +++++++++
arch/x86/kernel/cpu/perf_event.h | 8 ++++++++
2 files changed, 17 insertions(+)
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index 36fb4fc..858a72a 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -733,6 +733,9 @@ int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign)
bitmap_zero(used_mask, X86_PMC_IDX_MAX);
+ if (x86_pmu.start_scheduling)
+ x86_pmu.start_scheduling(cpuc);
+
for (i = 0, wmin = X86_PMC_IDX_MAX, wmax = 0; i < n; i++) {
hwc = &cpuc->event_list[i]->hw;
c = x86_pmu.get_event_constraints(cpuc, cpuc->event_list[i]);
@@ -779,6 +782,8 @@ int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign)
for (i = 0; i < n; i++) {
e = cpuc->event_list[i];
e->hw.flags |= PERF_X86_EVENT_COMMITTED;
+ if (x86_pmu.commit_scheduling)
+ x86_pmu.commit_scheduling(cpuc, e, assign[i]);
}
}
/*
@@ -799,6 +804,10 @@ int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign)
x86_pmu.put_event_constraints(cpuc, e);
}
}
+
+ if (x86_pmu.stop_scheduling)
+ x86_pmu.stop_scheduling(cpuc);
+
return num ? -EINVAL : 0;
}
diff --git a/arch/x86/kernel/cpu/perf_event.h b/arch/x86/kernel/cpu/perf_event.h
index 1cab1c2..413799f 100644
--- a/arch/x86/kernel/cpu/perf_event.h
+++ b/arch/x86/kernel/cpu/perf_event.h
@@ -409,6 +409,14 @@ struct x86_pmu {
void (*put_event_constraints)(struct cpu_hw_events *cpuc,
struct perf_event *event);
+
+ void (*commit_scheduling)(struct cpu_hw_events *cpuc,
+ struct perf_event *event, int cntr);
+
+ void (*start_scheduling)(struct cpu_hw_events *cpuc);
+
+ void (*stop_scheduling)(struct cpu_hw_events *cpuc);
+
struct event_constraint *event_constraints;
struct x86_pmu_quirk *quirks;
int perfctr_second_write;
--
1.7.9.5
next prev parent reply other threads:[~2014-06-04 21:44 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-04 21:34 [PATCH 0/9] perf/x86: implement HT counter corruption workaround Stephane Eranian
2014-06-04 21:34 ` [PATCH 1/9] perf,x86: rename er_flags to flags Stephane Eranian
2014-06-04 21:34 ` [PATCH 2/9] pref/x86: vectorize cpuc->kfree_on_online Stephane Eranian
2014-06-04 21:34 ` Stephane Eranian [this message]
2014-06-04 21:34 ` [PATCH 4/9] perf/x86: add cross-HT counter exclusion infrastructure Stephane Eranian
2014-06-05 7:47 ` Peter Zijlstra
2014-06-05 10:51 ` Stephane Eranian
2014-06-05 8:04 ` Peter Zijlstra
2014-06-05 13:36 ` Maria Dimakopoulou
2014-06-05 8:29 ` Peter Zijlstra
2014-06-05 21:33 ` Andi Kleen
2014-06-05 21:38 ` Stephane Eranian
2014-06-10 11:53 ` Stephane Eranian
2014-06-10 12:26 ` Peter Zijlstra
2014-06-04 21:34 ` [PATCH 5/9] perf/x86: implement cross-HT corruption bug workaround Stephane Eranian
2014-06-05 13:38 ` Peter Zijlstra
2014-06-05 13:42 ` Peter Zijlstra
2014-06-05 13:48 ` Peter Zijlstra
2014-06-05 14:01 ` Maria Dimakopoulou
2014-06-05 14:04 ` Borislav Petkov
2014-06-05 14:11 ` Peter Zijlstra
2014-06-05 14:14 ` Peter Zijlstra
2014-06-05 14:24 ` Maria Dimakopoulou
2014-06-05 14:04 ` Peter Zijlstra
2014-06-05 14:15 ` Stephane Eranian
2014-06-05 14:21 ` Peter Zijlstra
2014-06-05 14:26 ` Stephane Eranian
2014-06-05 14:31 ` Peter Zijlstra
2014-06-05 15:31 ` Stephane Eranian
2014-06-04 21:34 ` [PATCH 6/9] perf/x86: enforce HT bug workaround for SNB/IVB/HSW Stephane Eranian
2014-06-04 21:34 ` [PATCH 7/9] perf/x86: enforce HT bug workaround with PEBS " Stephane Eranian
2014-06-04 21:34 ` [PATCH 8/9] perf/x86: fix intel_get_event_constraints() for dynamic constraints Stephane Eranian
2014-06-04 21:34 ` [PATCH 9/9] perf/x86: add syfs entry to disable HT bug workaround Stephane Eranian
2014-06-05 8:32 ` Matt Fleming
2014-06-05 9:29 ` Stephane Eranian
2014-06-05 10:01 ` Matt Fleming
2014-06-05 10:19 ` Stephane Eranian
2014-06-05 11:16 ` Matt Fleming
2014-06-05 12:02 ` Stephane Eranian
2014-06-05 13:27 ` Borislav Petkov
2014-06-05 13:42 ` Stephane Eranian
2014-06-05 14:03 ` Borislav Petkov
2014-06-05 14:45 ` Maria Dimakopoulou
2014-06-05 15:17 ` Borislav Petkov
2014-06-05 16:39 ` Maria Dimakopoulou
2014-06-05 16:47 ` Stephane Eranian
2014-06-05 16:52 ` Borislav Petkov
2014-06-05 18:00 ` Maria Dimakopoulou
2014-06-05 23:29 ` Andi Kleen
2014-06-06 8:28 ` Matt Fleming
2014-06-05 12:50 ` Peter Zijlstra
2014-06-05 12:55 ` Stephane Eranian
2014-06-05 12:59 ` Peter Zijlstra
2014-06-05 13:16 ` Stephane Eranian
2014-06-05 13:26 ` Peter Zijlstra
2014-06-05 13:19 ` Peter Zijlstra
2014-06-05 13:26 ` Stephane Eranian
2014-06-04 22:28 ` [PATCH 0/9] perf/x86: implement HT counter corruption workaround Andi Kleen
2014-06-05 12:45 ` Stephane Eranian
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1401917658-26065-4-git-send-email-eranian@google.com \
--to=eranian@google.com \
--cc=ak@linux.intel.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maria.n.dimakopoulou@gmail.com \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=zheng.z.yan@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox