From: David Carrillo-Cisneros <davidcc@google.com>
To: linux-kernel@vger.kernel.org
Cc: "x86@kernel.org" <x86@kernel.org>, Ingo Molnar <mingo@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Andi Kleen <ak@linux.intel.com>, Kan Liang <kan.liang@intel.com>,
Peter Zijlstra <peterz@infradead.org>,
Vegard Nossum <vegard.nossum@gmail.com>,
Marcelo Tosatti <mtosatti@redhat.com>,
Nilay Vaish <nilayvaish@gmail.com>, Borislav Petkov <bp@suse.de>,
Vikas Shivappa <vikas.shivappa@linux.intel.com>,
Ravi V Shankar <ravi.v.shankar@intel.com>,
Fenghua Yu <fenghua.yu@intel.com>, Paul Turner <pjt@google.com>,
Stephane Eranian <eranian@google.com>,
David Carrillo-Cisneros <davidcc@google.com>
Subject: [PATCH v3 10/46] perf/x86/intel/cmt: add Package MONitored Resource (pmonr) initialization
Date: Sat, 29 Oct 2016 17:38:07 -0700 [thread overview]
Message-ID: <1477787923-61185-11-git-send-email-davidcc@google.com> (raw)
In-Reply-To: <1477787923-61185-1-git-send-email-davidcc@google.com>
A pmonr is the per-package component of a monr. This patch only adds
initialization/destruction of pmonrs. Future patches explain their
usage and add functionality.
CPU hotplug is supported by initializing/terminating all pmonrs in
monr hierarchy when first/last CPU in package goes online/offline.
Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
---
arch/x86/events/intel/cmt.c | 161 +++++++++++++++++++++++++++++++++++++++++++-
arch/x86/events/intel/cmt.h | 20 +++++-
2 files changed, 177 insertions(+), 4 deletions(-)
diff --git a/arch/x86/events/intel/cmt.c b/arch/x86/events/intel/cmt.c
index 39f4bfa..06e6325 100644
--- a/arch/x86/events/intel/cmt.c
+++ b/arch/x86/events/intel/cmt.c
@@ -103,13 +103,49 @@ static void monr_hrchy_release_locks(unsigned long *flags)
raw_local_irq_restore(*flags);
}
+static inline struct pmonr *pkgd_pmonr(struct pkg_data *pkgd, struct monr *monr)
+{
+#ifdef CONFIG_LOCKDEP
+ bool safe = lockdep_is_held(&cmt_mutex) ||
+ lockdep_is_held(&pkgd->lock) ||
+ rcu_read_lock_held();
+#endif
+
+ return rcu_dereference_check(monr->pmonrs[pkgd->pkgid], safe);
+}
+
+static struct pmonr *pmonr_alloc(struct pkg_data *pkgd)
+{
+ struct pmonr *pmonr;
+ int cpu_node = cpu_to_node(pkgd->work_cpu);
+
+ pmonr = kzalloc_node(sizeof(*pmonr), GFP_KERNEL, cpu_node);
+ if (!pmonr)
+ return ERR_PTR(-ENOMEM);
+
+ pmonr->pkgd = pkgd;
+
+ return pmonr;
+}
+
static void monr_dealloc(struct monr *monr)
{
+ u16 p, nr_pkgs = topology_max_packages();
+
+ for (p = 0; p < nr_pkgs; p++) {
+ /* out of monr_hrchy, so no need for rcu or lock protection. */
+ if (!monr->pmonrs[p])
+ continue;
+ kfree(monr->pmonrs[p]);
+ }
kfree(monr);
}
+/* Alloc monr with all pmonrs in Off state. */
static struct monr *monr_alloc(void)
{
+ struct pkg_data *pkgd = NULL;
+ struct pmonr *pmonr;
struct monr *monr;
lockdep_assert_held(&cmt_mutex);
@@ -122,6 +158,28 @@ static struct monr *monr_alloc(void)
INIT_LIST_HEAD(&monr->children);
INIT_LIST_HEAD(&monr->parent_entry);
+ monr->pmonrs = kcalloc(topology_max_packages(),
+ sizeof(pmonr), GFP_KERNEL);
+ if (!monr->pmonrs) {
+ monr_dealloc(monr);
+ return ERR_PTR(-ENOMEM);
+ }
+
+ /*
+ * Do not create pmonrs for unitialized packages.
+ * Protected from initialization of new pkgs by cqm_mutex
+ */
+ while ((pkgd = cmt_pkgs_data_next_rcu(pkgd))) {
+ pmonr = pmonr_alloc(pkgd);
+ if (IS_ERR(pmonr)) {
+ monr_dealloc(monr);
+ return ERR_CAST(pmonr);
+ }
+ pmonr->monr = monr;
+ /* safe to assign since pmonr is not in monr_hrchy. */
+ RCU_INIT_POINTER(monr->pmonrs[pkgd->pkgid], pmonr);
+ }
+
return monr;
}
@@ -318,6 +376,69 @@ static int mon_group_setup_event(struct perf_event *event)
return monr_hrchy_attach_event(event);
}
+static struct monr *monr_next_child(struct monr *pos, struct monr *parent)
+{
+ if (!pos)
+ return list_first_entry_or_null(
+ &parent->children, struct monr, parent_entry);
+ if (list_is_last(&pos->parent_entry, &parent->children))
+ return NULL;
+
+ return list_next_entry(pos, parent_entry);
+}
+
+static struct monr *monr_next_descendant_pre(struct monr *pos,
+ struct monr *root)
+{
+ struct monr *next;
+
+ if (!pos)
+ return root;
+
+ next = monr_next_child(NULL, pos);
+ if (next)
+ return next;
+
+ while (pos != root) {
+ next = monr_next_child(pos, pos->parent);
+ if (next)
+ return next;
+ pos = pos->parent;
+ }
+
+ return NULL;
+}
+
+static struct monr *monr_leftmost_descendant(struct monr *pos)
+{
+ struct monr *last;
+
+ do {
+ last = pos;
+ pos = monr_next_child(NULL, pos);
+ } while (pos);
+
+ return last;
+}
+
+static struct monr *monr_next_descendant_post(struct monr *pos,
+ struct monr *root)
+{
+ struct monr *next;
+
+ if (!pos)
+ return monr_leftmost_descendant(root);
+
+ if (pos == root)
+ return NULL;
+
+ next = monr_next_child(pos, pos->parent);
+ if (next)
+ return monr_leftmost_descendant(next);
+
+ return pos->parent;
+}
+
static void intel_cmt_event_read(struct perf_event *event)
{
}
@@ -482,14 +603,29 @@ static struct pkg_data *alloc_pkg_data(int cpu)
static void __terminate_pkg_data(struct pkg_data *pkgd)
{
+ struct monr *pos = NULL;
+ unsigned long flags;
+
lockdep_assert_held(&cmt_mutex);
+ raw_spin_lock_irqsave(&pkgd->lock, flags);
+ /* post-order traversal guarantees pos to be leaf of monr hierarchy. */
+ while ((pos = monr_next_descendant_post(pos, monr_hrchy_root)))
+ RCU_INIT_POINTER(pos->pmonrs[pkgd->pkgid], NULL);
+
+ raw_spin_unlock_irqrestore(&pkgd->lock, flags);
+
+ synchronize_rcu();
+
free_pkg_data(pkgd);
}
static int init_pkg_data(int cpu)
{
+ struct monr *pos = NULL;
struct pkg_data *pkgd;
+ struct pmonr *pmonr;
+ int err = 0;
u16 pkgid = topology_logical_package_id(cpu);
lockdep_assert_held(&cmt_mutex);
@@ -502,10 +638,28 @@ static int init_pkg_data(int cpu)
if (IS_ERR(pkgd))
return PTR_ERR(pkgd);
- rcu_assign_pointer(cmt_pkgs_data[pkgid], pkgd);
- synchronize_rcu();
+ while ((pos = monr_next_descendant_pre(pos, monr_hrchy_root))) {
+ pmonr = pmonr_alloc(pkgd);
+ if (IS_ERR(pmonr)) {
+ err = PTR_ERR(pmonr);
+ break;
+ }
+ pmonr->monr = pos;
+ /*
+ * No need to protect pmonrs since this pkgd is
+ * not set in cmt_pkgs_data yet.
+ */
+ RCU_INIT_POINTER(pos->pmonrs[pkgid], pmonr);
+ }
- return 0;
+ if (err) {
+ __terminate_pkg_data(pkgd);
+ } else {
+ rcu_assign_pointer(cmt_pkgs_data[pkgid], pkgd);
+ synchronize_rcu();
+ }
+
+ return err;
}
static int intel_cmt_hp_online_enter(unsigned int cpu)
@@ -604,6 +758,7 @@ static int __init cmt_alloc(void)
if (!cmt_pkgs_data)
return -ENOMEM;
+ /* won't alloc any pmonr since no cmt_pkg_data is initialized yet. */
mutex_lock(&cmt_mutex);
monr_hrchy_root = monr_alloc();
mutex_unlock(&cmt_mutex);
diff --git a/arch/x86/events/intel/cmt.h b/arch/x86/events/intel/cmt.h
index 46e8335..7f3a7b8 100644
--- a/arch/x86/events/intel/cmt.h
+++ b/arch/x86/events/intel/cmt.h
@@ -27,6 +27,9 @@
* and to make possible to capture dependencies between threads in the same
* cgroup or process.
*
+ * Each monr has a package monr (pmonr) for each package with at least one
+ * online cpu. The pmonr handles the CMT and MBM monitoring within its package.
+ *
*
* Locking
*
@@ -38,8 +41,19 @@
* cgroup start/stop.
* - Hold pkg->mutex and pkg->lock in _all_ active packages to traverse or
* change the monr hierarchy.
- * - pkgd->lock: Hold in current package to access that pkgd's members.
+ * - pkgd->lock: Hold in current package to access that pkgd's members. Hold
+ * a pmonr's package pkgd->lock for non-atomic access to pmonr.
+ */
+
+/**
+ * struct pmonr - per-package componet of MONitored Resources (monr).
+ * @monr: The monr that contains this pmonr.
+ * @pkgd: The package data associated with this pmonr.
*/
+struct pmonr {
+ struct monr *monr;
+ struct pkg_data *pkgd;
+};
/**
* struct pkg_data - Per-package CMT data.
@@ -65,6 +79,7 @@ struct pkg_data {
* struct monr - MONitored Resource.
* @mon_events: The head of event's group that use this monr, if any.
* @entry: List entry into cmt_event_monrs.
+ * @pmonrs: Per-package pmonrs.
* @parent: Parent in monr hierarchy.
* @children: List of children in monr hierarchy.
* @parent_entry: Entry in parent's children list.
@@ -72,10 +87,13 @@ struct pkg_data {
* An monr is assigned to every CMT event and/or monitored cgroups when
* monitoring is activated and that instance's address do not change during
* the lifetime of the event or cgroup.
+ *
+ * On initialization, all monr's pmonrs start in Off state.
*/
struct monr {
struct perf_event *mon_events;
struct list_head entry;
+ struct pmonr **pmonrs;
struct monr *parent;
struct list_head children;
--
2.8.0.rc3.226.g39d4020
next prev parent reply other threads:[~2016-10-30 0:48 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-30 0:37 [PATCH v3 00/46] Cache Monitoring Technology (aka CQM) David Carrillo-Cisneros
2016-10-30 0:37 ` [PATCH v3 01/46] perf/x86/intel/cqm: remove previous version of CQM and MBM David Carrillo-Cisneros
2016-10-30 0:37 ` [PATCH v3 02/46] perf/x86/intel: rename CQM cpufeatures to CMT David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 03/46] x86/intel: add CONFIG_INTEL_RDT_M configuration flag David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 04/46] perf/x86/intel/cmt: add device initialization and CPU hotplug support David Carrillo-Cisneros
2016-11-10 15:19 ` Thomas Gleixner
2016-10-30 0:38 ` [PATCH v3 05/46] perf/x86/intel/cmt: add per-package locks David Carrillo-Cisneros
2016-11-10 21:23 ` Thomas Gleixner
2016-11-11 2:22 ` David Carrillo-Cisneros
2016-11-11 7:21 ` Peter Zijlstra
2016-11-11 7:32 ` Ingo Molnar
2016-11-11 9:41 ` Thomas Gleixner
2016-11-11 17:21 ` David Carrillo-Cisneros
2016-11-13 10:58 ` Thomas Gleixner
2016-11-15 4:53 ` David Carrillo-Cisneros
2016-11-16 19:00 ` Thomas Gleixner
2016-10-30 0:38 ` [PATCH v3 06/46] perf/x86/intel/cmt: add intel_cmt pmu David Carrillo-Cisneros
2016-11-10 21:27 ` Thomas Gleixner
2016-10-30 0:38 ` [PATCH v3 07/46] perf/core: add RDT Monitoring attributes to struct hw_perf_event David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 08/46] perf/x86/intel/cmt: add MONitored Resource (monr) initialization David Carrillo-Cisneros
2016-11-10 23:09 ` Thomas Gleixner
2016-10-30 0:38 ` [PATCH v3 09/46] perf/x86/intel/cmt: add basic monr hierarchy David Carrillo-Cisneros
2016-10-30 0:38 ` David Carrillo-Cisneros [this message]
2016-10-30 0:38 ` [PATCH v3 11/46] perf/x86/intel/cmt: add cmt_user_flags (uflags) to monr David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 12/46] perf/x86/intel/cmt: add per-package rmid pools David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 13/46] perf/x86/intel/cmt: add pmonr's Off and Unused states David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 14/46] perf/x86/intel/cmt: add Active and Dep_{Idle, Dirty} states David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 15/46] perf/x86/intel: encapsulate rmid and closid updates in pqr cache David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 16/46] perf/x86/intel/cmt: set sched rmid and complete pmu start/stop/add/del David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 17/46] perf/x86/intel/cmt: add uflag CMT_UF_NOLAZY_RMID David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 18/46] perf/core: add arch_info field to struct perf_cgroup David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 19/46] perf/x86/intel/cmt: add support for cgroup events David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 20/46] perf/core: add pmu::event_terminate David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 21/46] perf/x86/intel/cmt: use newly introduced event_terminate David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 22/46] perf/x86/intel/cmt: sync cgroups and intel_cmt device start/stop David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 23/46] perf/core: hooks to add architecture specific features in perf_cgroup David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 24/46] perf/x86/intel/cmt: add perf_cgroup_arch_css_{online,offline} David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 25/46] perf/x86/intel/cmt: add monr->flags and CMT_MONR_ZOMBIE David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 26/46] sched: introduce the finish_arch_pre_lock_switch() scheduler hook David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 27/46] perf/x86/intel: add pqr cache flags and intel_pqr_ctx_switch David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 28/46] perf,perf/x86,perf/powerpc,perf/arm,perf/*: add int error return to pmu::read David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 29/46] perf/x86/intel/cmt: add error handling to intel_cmt_event_read David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 30/46] perf/x86/intel/cmt: add asynchronous read for task events David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 31/46] perf/x86/intel/cmt: add subtree read for cgroup events David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 32/46] perf/core: Add PERF_EV_CAP_READ_ANY_{CPU_,}PKG flags David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 33/46] perf/x86/intel/cmt: use PERF_EV_CAP_READ_{,CPU_}PKG flags in Intel cmt David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 34/46] perf/core: introduce PERF_EV_CAP_CGROUP_NO_RECURSION David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 35/46] perf/x86/intel/cmt: use PERF_EV_CAP_CGROUP_NO_RECURSION in intel_cmt David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 36/46] perf/core: add perf_event cgroup hooks for subsystem attributes David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 37/46] perf/x86/intel/cmt: add cont_monitoring to perf cgroup David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 38/46] perf/x86/intel/cmt: introduce read SLOs for rotation David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 39/46] perf/x86/intel/cmt: add max_recycle_threshold sysfs attribute David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 40/46] perf/x86/intel/cmt: add rotation scheduled work David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 41/46] perf/x86/intel/cmt: add rotation minimum progress SLO David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 42/46] perf/x86/intel/cmt: add rmid stealing David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 43/46] perf/x86/intel/cmt: add CMT_UF_NOSTEAL_RMID flag David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 44/46] perf/x86/intel/cmt: add debugfs intel_cmt directory David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 45/46] perf/stat: fix bug in handling events in error state David Carrillo-Cisneros
2016-10-30 0:38 ` [PATCH v3 46/46] perf/stat: revamp read error handling, snapshot and per_pkg events David Carrillo-Cisneros
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=1477787923-61185-11-git-send-email-davidcc@google.com \
--to=davidcc@google.com \
--cc=ak@linux.intel.com \
--cc=bp@suse.de \
--cc=eranian@google.com \
--cc=fenghua.yu@intel.com \
--cc=kan.liang@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=mtosatti@redhat.com \
--cc=nilayvaish@gmail.com \
--cc=peterz@infradead.org \
--cc=pjt@google.com \
--cc=ravi.v.shankar@intel.com \
--cc=tglx@linutronix.de \
--cc=vegard.nossum@gmail.com \
--cc=vikas.shivappa@linux.intel.com \
--cc=x86@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).