From: Babu Moger <babu.moger@amd.com>
To: <tony.luck@intel.com>, <reinette.chatre@intel.com>,
<peternewman@google.com>
Cc: <corbet@lwn.net>, <tglx@linutronix.de>, <mingo@redhat.com>,
<bp@alien8.de>, <dave.hansen@linux.intel.com>, <x86@kernel.org>,
<hpa@zytor.com>, <paulmck@kernel.org>,
<akpm@linux-foundation.org>, <thuth@redhat.com>,
<rostedt@goodmis.org>, <ardb@kernel.org>,
<gregkh@linuxfoundation.org>, <daniel.sneddon@linux.intel.com>,
<jpoimboe@kernel.org>, <alexandre.chartre@oracle.com>,
<pawan.kumar.gupta@linux.intel.com>, <thomas.lendacky@amd.com>,
<perry.yuan@amd.com>, <seanjc@google.com>, <kai.huang@intel.com>,
<xiaoyao.li@intel.com>, <babu.moger@amd.com>,
<kan.liang@linux.intel.com>, <xin3.li@intel.com>,
<ebiggers@google.com>, <xin@zytor.com>, <sohil.mehta@intel.com>,
<andrew.cooper3@citrix.com>, <mario.limonciello@amd.com>,
<linux-doc@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<maciej.wieczor-retman@intel.com>, <eranian@google.com>
Subject: [PATCH v12 05/26] x86/resctrl: Consolidate monitoring related data from rdt_resource
Date: Thu, 3 Apr 2025 19:18:14 -0500 [thread overview]
Message-ID: <9d94d65fbbbd514a60bfa43f7ef1436d8d8255dd.1743725907.git.babu.moger@amd.com> (raw)
In-Reply-To: <cover.1743725907.git.babu.moger@amd.com>
The cache allocation and memory bandwidth allocation feature properties
are consolidated into struct resctrl_cache and struct resctrl_membw
respectively.
In preparation for more monitoring properties that will clobber the
existing resource struct more, re-organize the monitoring specific
properties to also be in a separate structure.
Suggested-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: Babu Moger <babu.moger@amd.com>
---
v12: Fixed the conflicts due to recent changes in rdt_resource data structure.
Added new mbm_cfg_mask field to resctrl_mon.
Removed Reviewed-by tag as patch has changed.
v11: No changes.
v10: No changes.
v9: No changes.
v8: Added Reviewed-by from Reinette. No other changes.
v7: Added kernel doc for data structure. Minor text update.
v6: Update commit message and update kernel doc for rdt_resource.
v5: Commit message update.
Also changes related to data structure updates does to SNC support.
v4: New patch.
---
arch/x86/kernel/cpu/resctrl/core.c | 4 ++--
arch/x86/kernel/cpu/resctrl/monitor.c | 20 ++++++++++----------
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 12 ++++++------
include/linux/resctrl.h | 22 +++++++++++++++-------
4 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c
index 5ac1fe79a030..16f700c2d00d 100644
--- a/arch/x86/kernel/cpu/resctrl/core.c
+++ b/arch/x86/kernel/cpu/resctrl/core.c
@@ -110,7 +110,7 @@ u32 resctrl_arch_system_num_rmid_idx(void)
struct rdt_resource *r = &rdt_resources_all[RDT_RESOURCE_L3].r_resctrl;
/* RMID are independent numbers for x86. num_rmid_idx == num_rmid */
- return r->num_rmid;
+ return r->mon.num_rmid;
}
struct rdt_resource *resctrl_arch_get_resource(enum resctrl_res_level l)
@@ -553,7 +553,7 @@ static void domain_add_cpu_mon(int cpu, struct rdt_resource *r)
arch_mon_domain_online(r, d);
- if (arch_domain_mbm_alloc(r->num_rmid, hw_dom)) {
+ if (arch_domain_mbm_alloc(r->mon.num_rmid, hw_dom)) {
mon_domain_free(hw_dom);
return;
}
diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c
index b84cd48c3d95..38970096ef3d 100644
--- a/arch/x86/kernel/cpu/resctrl/monitor.c
+++ b/arch/x86/kernel/cpu/resctrl/monitor.c
@@ -222,7 +222,7 @@ static int logical_rmid_to_physical_rmid(int cpu, int lrmid)
if (snc_nodes_per_l3_cache == 1)
return lrmid;
- return lrmid + (cpu_to_node(cpu) % snc_nodes_per_l3_cache) * r->num_rmid;
+ return lrmid + (cpu_to_node(cpu) % snc_nodes_per_l3_cache) * r->mon.num_rmid;
}
static int __rmid_read_phys(u32 prmid, enum resctrl_event_id eventid, u64 *val)
@@ -297,11 +297,11 @@ void resctrl_arch_reset_rmid_all(struct rdt_resource *r, struct rdt_mon_domain *
if (resctrl_arch_is_mbm_total_enabled())
memset(hw_dom->arch_mbm_total, 0,
- sizeof(*hw_dom->arch_mbm_total) * r->num_rmid);
+ sizeof(*hw_dom->arch_mbm_total) * r->mon.num_rmid);
if (resctrl_arch_is_mbm_local_enabled())
memset(hw_dom->arch_mbm_local, 0,
- sizeof(*hw_dom->arch_mbm_local) * r->num_rmid);
+ sizeof(*hw_dom->arch_mbm_local) * r->mon.num_rmid);
}
static u64 mbm_overflow_count(u64 prev_msr, u64 cur_msr, unsigned int width)
@@ -1099,14 +1099,14 @@ static struct mon_evt mbm_local_event = {
*/
static void l3_mon_evt_init(struct rdt_resource *r)
{
- INIT_LIST_HEAD(&r->evt_list);
+ INIT_LIST_HEAD(&r->mon.evt_list);
if (resctrl_arch_is_llc_occupancy_enabled())
- list_add_tail(&llc_occupancy_event.list, &r->evt_list);
+ list_add_tail(&llc_occupancy_event.list, &r->mon.evt_list);
if (resctrl_arch_is_mbm_total_enabled())
- list_add_tail(&mbm_total_event.list, &r->evt_list);
+ list_add_tail(&mbm_total_event.list, &r->mon.evt_list);
if (resctrl_arch_is_mbm_local_enabled())
- list_add_tail(&mbm_local_event.list, &r->evt_list);
+ list_add_tail(&mbm_local_event.list, &r->mon.evt_list);
}
/*
@@ -1247,7 +1247,7 @@ int __init rdt_get_mon_l3_config(struct rdt_resource *r)
resctrl_rmid_realloc_limit = boot_cpu_data.x86_cache_size * 1024;
hw_res->mon_scale = boot_cpu_data.x86_cache_occ_scale / snc_nodes_per_l3_cache;
- r->num_rmid = (boot_cpu_data.x86_cache_max_rmid + 1) / snc_nodes_per_l3_cache;
+ r->mon.num_rmid = (boot_cpu_data.x86_cache_max_rmid + 1) / snc_nodes_per_l3_cache;
hw_res->mbm_width = MBM_CNTR_WIDTH_BASE;
if (mbm_offset > 0 && mbm_offset <= MBM_CNTR_WIDTH_OFFSET_MAX)
@@ -1262,7 +1262,7 @@ int __init rdt_get_mon_l3_config(struct rdt_resource *r)
*
* For a 35MB LLC and 56 RMIDs, this is ~1.8% of the LLC.
*/
- threshold = resctrl_rmid_realloc_limit / r->num_rmid;
+ threshold = resctrl_rmid_realloc_limit / r->mon.num_rmid;
/*
* Because num_rmid may not be a power of two, round the value
@@ -1276,7 +1276,7 @@ int __init rdt_get_mon_l3_config(struct rdt_resource *r)
/* Detect list of bandwidth sources that can be tracked */
cpuid_count(0x80000020, 3, &eax, &ebx, &ecx, &edx);
- r->mbm_cfg_mask = ecx & MAX_EVT_CONFIG_BITS;
+ r->mon.mbm_cfg_mask = ecx & MAX_EVT_CONFIG_BITS;
}
r->mon_capable = true;
diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
index b8100c89f1a6..17de38e26f94 100644
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -1134,7 +1134,7 @@ static int rdt_num_rmids_show(struct kernfs_open_file *of,
{
struct rdt_resource *r = of->kn->parent->priv;
- seq_printf(seq, "%d\n", r->num_rmid);
+ seq_printf(seq, "%d\n", r->mon.num_rmid);
return 0;
}
@@ -1145,7 +1145,7 @@ static int rdt_mon_features_show(struct kernfs_open_file *of,
struct rdt_resource *r = of->kn->parent->priv;
struct mon_evt *mevt;
- list_for_each_entry(mevt, &r->evt_list, list) {
+ list_for_each_entry(mevt, &r->mon.evt_list, list) {
seq_printf(seq, "%s\n", mevt->name);
if (mevt->configurable)
seq_printf(seq, "%s_config\n", mevt->name);
@@ -1728,9 +1728,9 @@ static int mon_config_write(struct rdt_resource *r, char *tok, u32 evtid)
}
/* Value from user cannot be more than the supported set of events */
- if ((val & r->mbm_cfg_mask) != val) {
+ if ((val & r->mon.mbm_cfg_mask) != val) {
rdt_last_cmd_printf("Invalid event configuration: max valid mask is 0x%02x\n",
- r->mbm_cfg_mask);
+ r->mon.mbm_cfg_mask);
return -EINVAL;
}
@@ -3117,13 +3117,13 @@ static int mon_add_all_files(struct kernfs_node *kn, struct rdt_mon_domain *d,
struct mon_evt *mevt;
int ret;
- if (WARN_ON(list_empty(&r->evt_list)))
+ if (WARN_ON(list_empty(&r->mon.evt_list)))
return -EPERM;
priv.u.rid = r->rid;
priv.u.domid = do_sum ? d->ci->id : d->hdr.id;
priv.u.sum = do_sum;
- list_for_each_entry(mevt, &r->evt_list, list) {
+ list_for_each_entry(mevt, &r->mon.evt_list, list) {
priv.u.evtid = mevt->evtid;
ret = mon_addfile(kn, mevt->name, priv.priv);
if (ret)
diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h
index afa9aabf014c..f31bb48f2b1f 100644
--- a/include/linux/resctrl.h
+++ b/include/linux/resctrl.h
@@ -241,40 +241,48 @@ enum resctrl_schema_fmt {
RESCTRL_SCHEMA_RANGE,
};
+/**
+ * struct resctrl_mon - Monitoring related data of a resctrl resource
+ * @num_rmid: Number of RMIDs available
+ * @mbm_cfg_mask: Bandwidth sources that can be tracked when bandwidth
+ * monitoring events can be configured.
+ * @evt_list: List of monitoring events
+ */
+struct resctrl_mon {
+ int num_rmid;
+ unsigned int mbm_cfg_mask;
+ struct list_head evt_list;
+};
+
/**
* struct rdt_resource - attributes of a resctrl resource
* @rid: The index of the resource
* @alloc_capable: Is allocation available on this machine
* @mon_capable: Is monitor feature available on this machine
- * @num_rmid: Number of RMIDs available
* @ctrl_scope: Scope of this resource for control functions
* @mon_scope: Scope of this resource for monitor functions
* @cache: Cache allocation related data
* @membw: If the component has bandwidth controls, their properties.
+ * @mon: Monitoring related data.
* @ctrl_domains: RCU list of all control domains for this resource
* @mon_domains: RCU list of all monitor domains for this resource
* @name: Name to use in "schemata" file.
* @schema_fmt: Which format string and parser is used for this schema.
- * @evt_list: List of monitoring events
- * @mbm_cfg_mask: Bandwidth sources that can be tracked when bandwidth
- * monitoring events can be configured.
* @cdp_capable: Is the CDP feature available on this resource
*/
struct rdt_resource {
int rid;
bool alloc_capable;
bool mon_capable;
- int num_rmid;
enum resctrl_scope ctrl_scope;
enum resctrl_scope mon_scope;
struct resctrl_cache cache;
struct resctrl_membw membw;
+ struct resctrl_mon mon;
struct list_head ctrl_domains;
struct list_head mon_domains;
char *name;
enum resctrl_schema_fmt schema_fmt;
- struct list_head evt_list;
- unsigned int mbm_cfg_mask;
bool cdp_capable;
};
--
2.34.1
next prev parent reply other threads:[~2025-04-04 0:19 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-04 0:18 [PATCH v12 00/26] x86/resctrl : Support AMD Assignable Bandwidth Monitoring Counters (ABMC) Babu Moger
2025-04-04 0:18 ` [PATCH v12 01/26] x86/resctrl: Introduce mbm_total_cfg and mbm_local_cfg in struct rdt_hw_mon_domain Babu Moger
2025-04-11 20:49 ` Reinette Chatre
2025-04-14 15:56 ` Moger, Babu
2025-04-04 0:18 ` [PATCH v12 02/26] x86/resctrl: Remove MSR reading of event configuration value Babu Moger
2025-04-11 20:50 ` Reinette Chatre
2025-04-14 15:57 ` Moger, Babu
2025-04-04 0:18 ` [PATCH v12 03/26] x86/cpufeatures: Add support for Assignable Bandwidth Monitoring Counters (ABMC) Babu Moger
2025-04-11 20:52 ` Reinette Chatre
2025-04-14 17:48 ` Moger, Babu
2025-04-15 16:09 ` Reinette Chatre
2025-04-15 19:43 ` Moger, Babu
2025-04-16 16:08 ` Reinette Chatre
2025-04-17 14:27 ` Moger, Babu
2025-04-04 0:18 ` [PATCH v12 04/26] x86/resctrl: Add ABMC feature in the command line options Babu Moger
2025-04-04 0:18 ` Babu Moger [this message]
2025-04-04 0:18 ` [PATCH v12 06/26] x86/resctrl: Detect Assignable Bandwidth Monitoring feature details Babu Moger
2025-04-04 0:18 ` [PATCH v12 07/26] x86/resctrl: Add support to enable/disable AMD ABMC feature Babu Moger
2025-04-04 0:18 ` [PATCH v12 08/26] x86/resctrl: Introduce the interface to display monitor mode Babu Moger
2025-04-11 20:56 ` Reinette Chatre
2025-04-14 19:52 ` Moger, Babu
2025-04-15 16:22 ` Reinette Chatre
2025-04-16 14:05 ` Moger, Babu
2025-04-04 0:18 ` [PATCH v12 09/26] x86/resctrl: Introduce interface to display number of monitoring counters Babu Moger
2025-04-11 21:01 ` Reinette Chatre
2025-04-14 20:12 ` Moger, Babu
2025-04-04 0:18 ` [PATCH v12 10/26] x86/resctrl: Introduce mbm_cntr_cfg to track assignable counters at domain Babu Moger
2025-04-04 0:18 ` [PATCH v12 11/26] x86/resctrl: Introduce interface to display number of free MBM counters Babu Moger
2025-04-04 0:18 ` [PATCH v12 12/26] x86/resctrl: Add data structures and definitions for ABMC assignment Babu Moger
2025-04-11 21:01 ` Reinette Chatre
2025-04-14 20:30 ` Moger, Babu
2025-04-15 16:30 ` Reinette Chatre
2025-04-16 15:43 ` Moger, Babu
2025-04-04 0:18 ` [PATCH v12 13/26] x86/resctrl: Implement resctrl_arch_config_cntr() to assign a counter with ABMC Babu Moger
2025-04-11 21:02 ` Reinette Chatre
2025-04-14 20:51 ` Moger, Babu
2025-04-15 16:38 ` Reinette Chatre
2025-04-16 15:51 ` Moger, Babu
2025-04-04 0:18 ` [PATCH v12 14/26] x86/resctrl: Add the functionality to assign MBM events Babu Moger
2025-04-11 21:04 ` Reinette Chatre
2025-04-15 14:20 ` Moger, Babu
2025-04-15 16:53 ` Reinette Chatre
2025-04-16 17:09 ` Moger, Babu
2025-04-16 17:55 ` Luck, Tony
2025-04-16 18:17 ` Moger, Babu
2025-04-16 19:02 ` Reinette Chatre
2025-04-16 19:29 ` Moger, Babu
2025-04-04 0:18 ` [PATCH v12 15/26] x86/resctrl: Add the functionality to unassign " Babu Moger
2025-04-04 0:18 ` [PATCH v12 16/26] x86/resctrl: Report 'Unassigned' for MBM events in mbm_cntr_assign mode Babu Moger
2025-04-11 21:08 ` Reinette Chatre
2025-04-15 15:00 ` Moger, Babu
2025-04-04 0:18 ` [PATCH v12 17/26] x86/resctrl: Add the support for reading ABMC counters Babu Moger
2025-04-11 21:21 ` Reinette Chatre
2025-04-15 16:41 ` Moger, Babu
2025-04-04 0:18 ` [PATCH v12 18/26] x86/resctrl: Add default MBM event configurations for mbm_cntr_assign mode Babu Moger
2025-04-11 21:44 ` Reinette Chatre
2025-04-15 18:48 ` Moger, Babu
2025-04-15 19:25 ` Luck, Tony
2025-04-16 16:21 ` Reinette Chatre
2025-04-16 17:26 ` Moger, Babu
2025-04-16 16:18 ` Reinette Chatre
2025-04-16 17:27 ` Moger, Babu
2025-04-04 0:18 ` [PATCH v12 19/26] x86/resctrl: Add event configuration directory under info/L3_MON/ Babu Moger
2025-04-11 22:04 ` Reinette Chatre
2025-04-15 20:29 ` Moger, Babu
2025-04-04 0:18 ` [PATCH v12 20/26] x86/resctrl: Provide interface to update the event configurations Babu Moger
2025-04-11 22:07 ` Reinette Chatre
2025-04-15 20:37 ` Moger, Babu
2025-04-16 18:52 ` Reinette Chatre
2025-04-17 14:34 ` Moger, Babu
2025-04-17 15:09 ` Reinette Chatre
2025-04-17 20:19 ` Moger, Babu
2025-04-04 0:18 ` [PATCH v12 21/26] x86/resctrl: Introduce mbm_assign_on_mkdir to configure assignments Babu Moger
2025-04-11 22:08 ` Reinette Chatre
2025-04-15 20:39 ` Moger, Babu
2025-04-04 0:18 ` [PATCH v12 22/26] x86/resctrl: Auto assign/unassign counters when mbm_cntr_assign is enabled Babu Moger
2025-04-04 0:18 ` [PATCH v12 23/26] x86/resctrl: Introduce mbm_L3_assignments to list assignments in a group Babu Moger
2025-04-04 0:18 ` [PATCH v12 24/26] x86/resctrl: Introduce the interface to modify " Babu Moger
2025-04-04 0:18 ` [PATCH v12 25/26] x86/resctrl: Introduce the interface to switch between monitor modes Babu Moger
2025-04-04 0:18 ` [PATCH v12 26/26] x86/resctrl: Configure mbm_cntr_assign mode if supported Babu Moger
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=9d94d65fbbbd514a60bfa43f7ef1436d8d8255dd.1743725907.git.babu.moger@amd.com \
--to=babu.moger@amd.com \
--cc=akpm@linux-foundation.org \
--cc=alexandre.chartre@oracle.com \
--cc=andrew.cooper3@citrix.com \
--cc=ardb@kernel.org \
--cc=bp@alien8.de \
--cc=corbet@lwn.net \
--cc=daniel.sneddon@linux.intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=ebiggers@google.com \
--cc=eranian@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=hpa@zytor.com \
--cc=jpoimboe@kernel.org \
--cc=kai.huang@intel.com \
--cc=kan.liang@linux.intel.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maciej.wieczor-retman@intel.com \
--cc=mario.limonciello@amd.com \
--cc=mingo@redhat.com \
--cc=paulmck@kernel.org \
--cc=pawan.kumar.gupta@linux.intel.com \
--cc=perry.yuan@amd.com \
--cc=peternewman@google.com \
--cc=reinette.chatre@intel.com \
--cc=rostedt@goodmis.org \
--cc=seanjc@google.com \
--cc=sohil.mehta@intel.com \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
--cc=thuth@redhat.com \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
--cc=xiaoyao.li@intel.com \
--cc=xin3.li@intel.com \
--cc=xin@zytor.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
all inboxes | Powered by JetHome®