From: Fenghua Yu <fenghuay@nvidia.com>
To: Reinette Chatre <reinette.chatre@intel.com>,
Tony Luck <tony.luck@intel.com>, Ben Horgan <ben.horgan@arm.com>,
James Morse <james.morse@arm.com>,
Dave Martin <Dave.Martin@arm.com>, Will Deacon <will@kernel.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Shaopeng Tan <tan.shaopeng@fujitsu.com>,
Chen Yu <yu.c.chen@intel.com>, Babu Moger <babu.moger@amd.com>,
Drew Fustini <fustini@kernel.org>,
Vikram Sethi <vsethi@nvidia.com>,
Shanker Donthineni <sdonthineni@nvidia.com>,
Newton Liu <newtonl@nvidia.com>,
Richard Cheng <icheng@nvidia.com>
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Fenghua Yu <fenghuay@nvidia.com>
Subject: [PATCH RFC v2 08/19] arm_mpam: Include all MSC components during domain setup
Date: Mon, 31 Aug 2026 10:22:34 -0700 [thread overview]
Message-ID: <20260831172245.42253-9-fenghuay@nvidia.com> (raw)
In-Reply-To: <20260831172245.42253-1-fenghuay@nvidia.com>
Iterate all MSC components per CPU when creating and looking up control
and monitor domains on the controls branch. Key monitor domains by
component, support MBA mon_capable lookup, and report mon capability
from any L3 or MBA monitor resource.
Signed-off-by: Fenghua Yu <fenghuay@nvidia.com>
---
drivers/resctrl/mpam_resctrl.c | 197 +++++++++++++++++++--------------
1 file changed, 112 insertions(+), 85 deletions(-)
diff --git a/drivers/resctrl/mpam_resctrl.c b/drivers/resctrl/mpam_resctrl.c
index 72302f6021d7..9a02bc0e091d 100644
--- a/drivers/resctrl/mpam_resctrl.c
+++ b/drivers/resctrl/mpam_resctrl.c
@@ -95,11 +95,27 @@ static bool mpam_class_memory(struct mpam_class *class)
bool resctrl_arch_mon_capable(void)
{
- struct mpam_resctrl_res *res = &mpam_resctrl_controls[RDT_RESOURCE_L3];
- struct rdt_resource *l3 = &res->resctrl_res;
+ enum resctrl_event_id eventid;
+ struct mpam_resctrl_mon *mon;
+ struct mpam_resctrl_res *res;
+ struct rdt_resource *r;
+
+ for_each_mpam_resctrl_mon(mon, eventid) {
+ if (!mon->class)
+ continue; // dummy resource
+
+ if (mpam_class_memory(mon->class))
+ res = &mpam_resctrl_controls[RDT_RESOURCE_MBA];
+ else
+ res = &mpam_resctrl_controls[RDT_RESOURCE_L3];
+
+ r = &res->resctrl_res;
- /* All monitors are presented as being on the L3 cache */
- return l3->mon_capable;
+ if (r->mon_capable)
+ return true;
+ }
+
+ return false;
}
bool resctrl_arch_is_evt_configurable(enum resctrl_event_id evt)
@@ -1731,13 +1747,12 @@ static struct mpam_component *find_component(struct mpam_class *class, int cpu)
static struct mpam_resctrl_dom *
mpam_resctrl_alloc_ctrl_domain(unsigned int cpu, struct mpam_resctrl_res *res,
- struct resctrl_ctrl *ctrl)
+ struct resctrl_ctrl *ctrl,
+ struct mpam_component *comp)
{
int err;
struct mpam_resctrl_dom *dom;
struct rdt_ctrl_domain *ctrl_d;
- struct mpam_class *class = res->class;
- struct mpam_component *comp_iter, *ctrl_comp;
struct rdt_resource *r = &res->resctrl_res;
lockdep_assert_held(&domain_list_lock);
@@ -1745,28 +1760,17 @@ mpam_resctrl_alloc_ctrl_domain(unsigned int cpu, struct mpam_resctrl_res *res,
if (!r->alloc_capable)
return ERR_PTR(-EINVAL);
- ctrl_comp = NULL;
- guard(srcu)(&mpam_srcu);
- list_for_each_entry_srcu(comp_iter, &class->components, class_list,
- srcu_read_lock_held(&mpam_srcu)) {
- if (cpumask_test_cpu(cpu, &comp_iter->affinity)) {
- ctrl_comp = comp_iter;
- break;
- }
- }
-
- /* class has no component for this CPU */
- if (WARN_ON_ONCE(!ctrl_comp))
+ if (WARN_ON_ONCE(!comp))
return ERR_PTR(-EINVAL);
dom = kzalloc_node(sizeof(*dom), GFP_KERNEL, cpu_to_node(cpu));
if (!dom)
return ERR_PTR(-ENOMEM);
- dom->ctrl_comp = ctrl_comp;
+ dom->ctrl_comp = comp;
ctrl_d = &dom->resctrl_ctrl_dom;
- mpam_resctrl_domain_hdr_init(cpu, ctrl_comp, r->rid, &ctrl_d->hdr);
+ mpam_resctrl_domain_hdr_init(cpu, comp, r->rid, &ctrl_d->hdr);
ctrl_d->hdr.type = RESCTRL_CTRL_DOMAIN;
err = resctrl_online_ctrl_domain(r, ctrl, ctrl_d);
if (err)
@@ -1784,13 +1788,12 @@ mpam_resctrl_alloc_ctrl_domain(unsigned int cpu, struct mpam_resctrl_res *res,
}
static struct mpam_resctrl_dom *
-mpam_resctrl_alloc_mon_domain(unsigned int cpu, struct mpam_resctrl_res *res)
+mpam_resctrl_alloc_mon_domain(unsigned int cpu, struct mpam_resctrl_res *res,
+ struct mpam_component *comp)
{
int err;
struct mpam_resctrl_dom *dom;
struct rdt_l3_mon_domain *mon_d;
- struct mpam_class *class = res->class;
- struct mpam_component *comp_iter, *ctrl_comp;
struct rdt_resource *r = &res->resctrl_res;
struct mpam_component *any_mon_comp = NULL;
struct mpam_resctrl_mon *mon;
@@ -1801,24 +1804,14 @@ mpam_resctrl_alloc_mon_domain(unsigned int cpu, struct mpam_resctrl_res *res)
if (!r->mon_capable)
return ERR_PTR(-EINVAL);
- ctrl_comp = NULL;
- guard(srcu)(&mpam_srcu);
- list_for_each_entry_srcu(comp_iter, &class->components, class_list,
- srcu_read_lock_held(&mpam_srcu)) {
- if (cpumask_test_cpu(cpu, &comp_iter->affinity)) {
- ctrl_comp = comp_iter;
- break;
- }
- }
-
- /* class has no component for this CPU */
- if (WARN_ON_ONCE(!ctrl_comp))
+ if (WARN_ON_ONCE(!comp))
return ERR_PTR(-EINVAL);
dom = kzalloc_node(sizeof(*dom), GFP_KERNEL, cpu_to_node(cpu));
if (!dom)
return ERR_PTR(-ENOMEM);
+ dom->ctrl_comp = comp;
/*
* Even if the monitor domain is backed by a different
@@ -1833,7 +1826,7 @@ mpam_resctrl_alloc_mon_domain(unsigned int cpu, struct mpam_resctrl_res *res)
if (!mon->class)
continue; // dummy resource
- mon_comp = find_component(mon->class, cpu);
+ mon_comp = comp ? comp : find_component(mon->class, cpu);
dom->mon_comp[eventid] = mon_comp;
if (mon_comp)
any_mon_comp = mon_comp;
@@ -1870,25 +1863,32 @@ mpam_resctrl_alloc_mon_domain(unsigned int cpu, struct mpam_resctrl_res *res)
* for anything that is not a cache.
*/
static struct mpam_resctrl_dom *
-mpam_resctrl_get_mon_domain_from_cpu(int cpu, struct mpam_resctrl_res *res)
+mpam_resctrl_get_mon_domain_from_cpu(int cpu, struct mpam_resctrl_res *res,
+ struct mpam_component *comp)
{
- int cache_id;
struct mpam_resctrl_dom *dom;
struct rdt_resource *r = &res->resctrl_res;
+ int id;
lockdep_assert_cpus_held();
- if (r->rid != RDT_RESOURCE_L3)
- return ERR_PTR(-EINVAL);
+ if (!r->mon_capable || !res->class || !comp)
+ return NULL;
- if (!res->class)
- return ERR_PTR(-EINVAL);
- cache_id = get_cpu_cacheinfo_id(cpu, 3);
- if (cache_id < 0)
- return ERR_PTR(-EINVAL);
+ if (r->rid == RDT_RESOURCE_L3) {
+ id = get_cpu_cacheinfo_id(cpu, 3);
+ if (id < 0)
+ return NULL;
+ } else if (r->rid == RDT_RESOURCE_MBA) {
+ id = comp->comp_id;
+ } else {
+ return NULL;
+ }
- list_for_each_entry_rcu(dom, &res->resctrl_res.mon_domains, resctrl_mon_dom.hdr.list) {
- if (dom->resctrl_mon_dom.hdr.id == cache_id)
+ list_for_each_entry_rcu(dom, &r->mon_domains, resctrl_mon_dom.hdr.list) {
+ if (dom->ctrl_comp != comp)
+ continue;
+ if (dom->resctrl_mon_dom.hdr.id == id)
return dom;
}
@@ -1896,14 +1896,19 @@ mpam_resctrl_get_mon_domain_from_cpu(int cpu, struct mpam_resctrl_res *res)
}
static struct mpam_resctrl_dom *
-mpam_resctrl_get_ctrl_domain_from_cpu(int cpu, struct resctrl_ctrl *ctrl)
+mpam_resctrl_get_ctrl_domain_from_cpu(int cpu, struct mpam_resctrl_res *res,
+ struct resctrl_ctrl *ctrl,
+ struct mpam_component *comp)
{
struct mpam_resctrl_dom *dom;
lockdep_assert_cpus_held();
+ if (!comp)
+ return NULL;
+
list_for_each_entry_rcu(dom, &ctrl->domains, resctrl_ctrl_dom.hdr.list) {
- if (cpumask_test_cpu(cpu, &dom->ctrl_comp->affinity))
+ if (dom->ctrl_comp == comp)
return dom;
}
@@ -1914,6 +1919,7 @@ int mpam_resctrl_online_cpu(unsigned int cpu)
{
struct mpam_resctrl_res *res;
enum resctrl_res_level rid;
+ struct mpam_component *comp;
guard(mutex)(&domain_list_lock);
for_each_mpam_resctrl_control(res, rid) {
@@ -1924,30 +1930,40 @@ int mpam_resctrl_online_cpu(unsigned int cpu)
if (!res->class)
continue; // dummy_resource;
- if (r->alloc_capable) {
- for_each_resource_ctrl(ctrl, r) {
- dom = mpam_resctrl_get_ctrl_domain_from_cpu(cpu, ctrl);
- if (!dom) {
- dom = mpam_resctrl_alloc_ctrl_domain(cpu, res, ctrl);
+ guard(srcu)(&mpam_srcu);
+ list_for_each_entry_srcu(comp, &res->class->components, class_list,
+ srcu_read_lock_held(&mpam_srcu)) {
+ if (!cpumask_test_cpu(cpu, &comp->affinity))
+ continue;
+
+ if (r->alloc_capable) {
+ for_each_resource_ctrl(ctrl, r) {
+ dom = mpam_resctrl_get_ctrl_domain_from_cpu(cpu, res,
+ ctrl, comp);
+ if (!dom) {
+ dom = mpam_resctrl_alloc_ctrl_domain(cpu, res,
+ ctrl, comp);
+ } else {
+ struct rdt_ctrl_domain *ctrl_d =
+ &dom->resctrl_ctrl_dom;
+
+ mpam_resctrl_online_domain_hdr(cpu, &ctrl_d->hdr);
+ }
if (IS_ERR(dom))
return PTR_ERR(dom);
+ }
+ }
+ if (r->mon_capable) {
+ dom = mpam_resctrl_get_mon_domain_from_cpu(cpu, res, comp);
+ if (!dom) {
+ dom = mpam_resctrl_alloc_mon_domain(cpu, res, comp);
} else {
- struct rdt_ctrl_domain *ctrl_d = &dom->resctrl_ctrl_dom;
+ struct rdt_l3_mon_domain *mon_d = &dom->resctrl_mon_dom;
- mpam_resctrl_online_domain_hdr(cpu, &ctrl_d->hdr);
+ mpam_resctrl_online_domain_hdr(cpu, &mon_d->hdr);
}
- }
- }
- if (r->mon_capable) {
- dom = mpam_resctrl_get_mon_domain_from_cpu(cpu, res);
- if (!dom) {
- dom = mpam_resctrl_alloc_mon_domain(cpu, res);
if (IS_ERR(dom))
return PTR_ERR(dom);
- } else {
- struct rdt_l3_mon_domain *mon_d = &dom->resctrl_mon_dom;
-
- mpam_resctrl_online_domain_hdr(cpu, &mon_d->hdr);
}
}
}
@@ -1961,6 +1977,7 @@ void mpam_resctrl_offline_cpu(unsigned int cpu)
{
struct mpam_resctrl_res *res;
enum resctrl_res_level rid;
+ struct mpam_component *comp;
resctrl_offline_cpu(cpu);
@@ -1976,31 +1993,41 @@ void mpam_resctrl_offline_cpu(unsigned int cpu)
if (!res->class)
continue; // dummy resource
- if (r->alloc_capable) {
- for_each_resource_ctrl(ctrl, r) {
- dom = mpam_resctrl_get_ctrl_domain_from_cpu(cpu, ctrl);
+ guard(srcu)(&mpam_srcu);
+ list_for_each_entry_srcu(comp, &res->class->components, class_list,
+ srcu_read_lock_held(&mpam_srcu)) {
+ if (!cpumask_test_cpu(cpu, &comp->affinity))
+ continue;
+
+ if (r->alloc_capable) {
+ for_each_resource_ctrl(ctrl, r) {
+ dom = mpam_resctrl_get_ctrl_domain_from_cpu(cpu, res,
+ ctrl, comp);
+ if (WARN_ON_ONCE(!dom))
+ continue;
+ ctrl_d = &dom->resctrl_ctrl_dom;
+ dom_empty = mpam_resctrl_offline_domain_hdr(cpu,
+ &ctrl_d->hdr);
+ if (dom_empty) {
+ resctrl_offline_ctrl_domain(&res->resctrl_res, ctrl,
+ ctrl_d);
+ kfree(dom);
+ }
+ }
+ }
+
+ if (r->mon_capable) {
+ dom = mpam_resctrl_get_mon_domain_from_cpu(cpu, res, comp);
if (WARN_ON_ONCE(!dom))
continue;
- ctrl_d = &dom->resctrl_ctrl_dom;
- dom_empty = mpam_resctrl_offline_domain_hdr(cpu, &ctrl_d->hdr);
+ mon_d = &dom->resctrl_mon_dom;
+ dom_empty = mpam_resctrl_offline_domain_hdr(cpu, &mon_d->hdr);
if (dom_empty) {
- resctrl_offline_ctrl_domain(&res->resctrl_res, ctrl, ctrl_d);
+ resctrl_offline_mon_domain(&res->resctrl_res, &mon_d->hdr);
kfree(dom);
}
}
}
-
- if (r->mon_capable) {
- dom = mpam_resctrl_get_mon_domain_from_cpu(cpu, res);
- if (WARN_ON_ONCE(!dom))
- continue;
- mon_d = &dom->resctrl_mon_dom;
- dom_empty = mpam_resctrl_offline_domain_hdr(cpu, &mon_d->hdr);
- if (dom_empty) {
- resctrl_offline_mon_domain(&res->resctrl_res, &mon_d->hdr);
- kfree(dom);
- }
- }
}
}
--
2.53.0
next prev parent reply other threads:[~2026-08-31 17:23 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-31 17:22 [PATCH RFC v2 00/19] arm,fs/resctrl: ARM MPAM MB_NODE support Fenghua Yu
2026-08-31 17:22 ` [PATCH RFC v2 01/19] resctrl: De-hardcode L3 monitor infrastructure Fenghua Yu
2026-08-31 17:22 ` [PATCH RFC v2 02/19] resctrl: Expose MBA MBM counter assignment sysfs Fenghua Yu
2026-08-31 17:22 ` [PATCH RFC v2 03/19] resctrl: name node-scoped monitor domains mon_NODE_<id> Fenghua Yu
2026-08-31 17:22 ` [PATCH RFC v2 04/19] resctrl: Add node-scope MBM total event Fenghua Yu
2026-08-31 17:22 ` [PATCH RFC v2 05/19] resctrl: Make MBM paths resource-aware Fenghua Yu
2026-08-31 17:22 ` [PATCH RFC v2 06/19] arm_mpam: Support memory-level MSCs and ABMC per class Fenghua Yu
2026-08-31 17:22 ` [PATCH RFC v2 07/19] arm_mpam: Refine L3 topology and class selection Fenghua Yu
2026-08-31 17:22 ` Fenghua Yu [this message]
2026-08-31 17:22 ` [PATCH RFC v2 09/19] fs/resctrl: Take memory hotplug lock whenever taking CPU hotplug lock Fenghua Yu
2026-08-31 17:22 ` [PATCH RFC v2 10/19] arm_mpam: Handle CPU-less numa nodes Fenghua Yu
2026-08-31 17:22 ` [PATCH RFC v2 11/19] arm_mpam: Emulate MB control with node-scoped MB_NODE control Fenghua Yu
2026-08-31 17:22 ` [PATCH RFC v2 12/19] arm_mpam: resctrl: Add NUMA node notifier for domain online/offline Fenghua Yu
2026-09-07 11:12 ` Ben Horgan
2026-08-31 17:22 ` [PATCH RFC v2 13/19] resctrl: Add mbm_assign_scope_mode for native assignment file names Fenghua Yu
2026-08-31 17:22 ` [PATCH RFC v2 14/19] Documentation: resctrl: document mbm_assign_scope_mode Fenghua Yu
2026-08-31 17:22 ` [PATCH RFC v2 15/19] Documentation: arm64: mpam: document memory-level MB control and NUMA nodes Fenghua Yu
2026-08-31 17:22 ` [PATCH RFC v2 16/19] Documentation: resctrl: document NODE-scoped MBA domains and mon_NODE monitoring Fenghua Yu
2026-08-31 17:22 ` [PATCH RFC v2 17/19] Documentation: resctrl: document MB_NODE emulation example on ARM MPAM Fenghua Yu
2026-08-31 17:22 ` [PATCH RFC v2 18/19] arm_mpam: Add KUnit test for CPU-less NUMA node affinity Fenghua Yu
2026-08-31 17:22 ` [PATCH RFC v2 19/19] selftests/resctrl: Add MB emulation test for ARM MPAM Fenghua Yu
2026-09-01 9:37 ` [PATCH RFC v2 00/19] arm,fs/resctrl: ARM MPAM MB_NODE support Richard Cheng
2026-09-07 11:20 ` Ben Horgan
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=20260831172245.42253-9-fenghuay@nvidia.com \
--to=fenghuay@nvidia.com \
--cc=Dave.Martin@arm.com \
--cc=babu.moger@amd.com \
--cc=ben.horgan@arm.com \
--cc=catalin.marinas@arm.com \
--cc=fustini@kernel.org \
--cc=icheng@nvidia.com \
--cc=james.morse@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=newtonl@nvidia.com \
--cc=reinette.chatre@intel.com \
--cc=sdonthineni@nvidia.com \
--cc=tan.shaopeng@fujitsu.com \
--cc=tony.luck@intel.com \
--cc=vsethi@nvidia.com \
--cc=will@kernel.org \
--cc=yu.c.chen@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.