From: "tip-bot2 for Babu Moger" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Babu Moger <babu.moger@amd.com>,
"Borislav Petkov (AMD)" <bp@alien8.de>,
Reinette Chatre <reinette.chatre@intel.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/cache] x86/resctrl: Implement resctrl_arch_reset_cntr() and resctrl_arch_cntr_read()
Date: Mon, 15 Sep 2025 11:27:32 -0000 [thread overview]
Message-ID: <175793565230.709179.8877435059894464441.tip-bot2@tip-bot2> (raw)
In-Reply-To: <8ef30aebd36972ea63f422f28b465fc4b2544fa4.1757108044.git.babu.moger@amd.com>
The following commit has been merged into the x86/cache branch of tip:
Commit-ID: 2a65b72c1603a74f35228acbb8de2ecff9c13efe
Gitweb: https://git.kernel.org/tip/2a65b72c1603a74f35228acbb8de2ecff9c13efe
Author: Babu Moger <babu.moger@amd.com>
AuthorDate: Fri, 05 Sep 2025 16:34:21 -05:00
Committer: Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Mon, 15 Sep 2025 12:30:22 +02:00
x86/resctrl: Implement resctrl_arch_reset_cntr() and resctrl_arch_cntr_read()
System software reads resctrl event data for a particular resource by writing
the RMID and Event Identifier (EvtID) to the QM_EVTSEL register and then
reading the event data from the QM_CTR register.
In ABMC mode, the event data of a specific counter ID is read by setting the
following fields: QM_EVTSEL.ExtendedEvtID = 1, QM_EVTSEL.EvtID = L3CacheABMC
(=1) and setting QM_EVTSEL.RMID to the desired counter ID. Reading the QM_CTR
then returns the contents of the specified counter ID. RMID_VAL_ERROR bit is
set if the counter configuration is invalid, or if an invalid counter ID is
set in the QM_EVTSEL.RMID field. RMID_VAL_UNAVAIL bit is set if the counter
data is unavailable.
Introduce resctrl_arch_reset_cntr() and resctrl_arch_cntr_read() to reset and
read event data for a specific counter.
Signed-off-by: Babu Moger <babu.moger@amd.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Reinette Chatre <reinette.chatre@intel.com>
Link: https://lore.kernel.org/cover.1757108044.git.babu.moger@amd.com
---
arch/x86/kernel/cpu/resctrl/internal.h | 6 ++-
arch/x86/kernel/cpu/resctrl/monitor.c | 69 +++++++++++++++++++++++++-
2 files changed, 75 insertions(+)
diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
index 0444fea..e5edddb 100644
--- a/arch/x86/kernel/cpu/resctrl/internal.h
+++ b/arch/x86/kernel/cpu/resctrl/internal.h
@@ -40,6 +40,12 @@ struct arch_mbm_state {
/* Setting bit 0 in L3_QOS_EXT_CFG enables the ABMC feature. */
#define ABMC_ENABLE_BIT 0
+/*
+ * Qos Event Identifiers.
+ */
+#define ABMC_EXTENDED_EVT_ID BIT(31)
+#define ABMC_EVT_ID BIT(0)
+
/**
* struct rdt_hw_ctrl_domain - Arch private attributes of a set of CPUs that share
* a resource for a control function
diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c
index 1f77fd5..0b3c199 100644
--- a/arch/x86/kernel/cpu/resctrl/monitor.c
+++ b/arch/x86/kernel/cpu/resctrl/monitor.c
@@ -259,6 +259,75 @@ int resctrl_arch_rmid_read(struct rdt_resource *r, struct rdt_mon_domain *d,
return 0;
}
+static int __cntr_id_read(u32 cntr_id, u64 *val)
+{
+ u64 msr_val;
+
+ /*
+ * QM_EVTSEL Register definition:
+ * =======================================================
+ * Bits Mnemonic Description
+ * =======================================================
+ * 63:44 -- Reserved
+ * 43:32 RMID RMID or counter ID in ABMC mode
+ * when reading an MBM event
+ * 31 ExtendedEvtID Extended Event Identifier
+ * 30:8 -- Reserved
+ * 7:0 EvtID Event Identifier
+ * =======================================================
+ * The contents of a specific counter can be read by setting the
+ * following fields in QM_EVTSEL.ExtendedEvtID(=1) and
+ * QM_EVTSEL.EvtID = L3CacheABMC (=1) and setting QM_EVTSEL.RMID
+ * to the desired counter ID. Reading the QM_CTR then returns the
+ * contents of the specified counter. The RMID_VAL_ERROR bit is set
+ * if the counter configuration is invalid, or if an invalid counter
+ * ID is set in the QM_EVTSEL.RMID field. The RMID_VAL_UNAVAIL bit
+ * is set if the counter data is unavailable.
+ */
+ wrmsr(MSR_IA32_QM_EVTSEL, ABMC_EXTENDED_EVT_ID | ABMC_EVT_ID, cntr_id);
+ rdmsrl(MSR_IA32_QM_CTR, msr_val);
+
+ if (msr_val & RMID_VAL_ERROR)
+ return -EIO;
+ if (msr_val & RMID_VAL_UNAVAIL)
+ return -EINVAL;
+
+ *val = msr_val;
+ return 0;
+}
+
+void resctrl_arch_reset_cntr(struct rdt_resource *r, struct rdt_mon_domain *d,
+ u32 unused, u32 rmid, int cntr_id,
+ enum resctrl_event_id eventid)
+{
+ struct rdt_hw_mon_domain *hw_dom = resctrl_to_arch_mon_dom(d);
+ struct arch_mbm_state *am;
+
+ am = get_arch_mbm_state(hw_dom, rmid, eventid);
+ if (am) {
+ memset(am, 0, sizeof(*am));
+
+ /* Record any initial, non-zero count value. */
+ __cntr_id_read(cntr_id, &am->prev_msr);
+ }
+}
+
+int resctrl_arch_cntr_read(struct rdt_resource *r, struct rdt_mon_domain *d,
+ u32 unused, u32 rmid, int cntr_id,
+ enum resctrl_event_id eventid, u64 *val)
+{
+ u64 msr_val;
+ int ret;
+
+ ret = __cntr_id_read(cntr_id, &msr_val);
+ if (ret)
+ return ret;
+
+ *val = get_corrected_val(r, d, rmid, eventid, msr_val);
+
+ return 0;
+}
+
/*
* The power-on reset value of MSR_RMID_SNC_CONFIG is 0x1
* which indicates that RMIDs are configured in legacy mode.
next prev parent reply other threads:[~2025-09-15 11:27 UTC|newest]
Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-05 21:33 [PATCH v18 00/33] x86,fs/resctrl: Support AMD Assignable Bandwidth Monitoring Counters (ABMC) Babu Moger
2025-09-05 21:34 ` [PATCH v18 01/33] x86,fs/resctrl: Consolidate monitor event descriptions Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Tony Luck
2025-09-05 21:34 ` [PATCH v18 02/33] x86,fs/resctrl: Replace architecture event enabled checks Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Tony Luck
2025-09-05 21:34 ` [PATCH v18 03/33] x86/resctrl: Remove 'rdt_mon_features' global variable Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] x86/resctrl: Remove the rdt_mon_features " tip-bot2 for Tony Luck
2025-09-05 21:34 ` [PATCH v18 04/33] x86,fs/resctrl: Prepare for more monitor events Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Tony Luck
2025-09-05 21:34 ` [PATCH v18 05/33] x86/cpufeatures: Add support for Assignable Bandwidth Monitoring Counters (ABMC) Babu Moger
2025-09-06 4:49 ` Reinette Chatre
2025-09-08 14:41 ` Moger, Babu
2025-09-08 15:03 ` Borislav Petkov
2025-09-08 18:26 ` Moger, Babu
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 06/33] x86/resctrl: Add ABMC feature in the command line options Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 07/33] x86,fs/resctrl: Consolidate monitoring related data from rdt_resource Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 08/33] x86,fs/resctrl: Detect Assignable Bandwidth Monitoring feature details Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 09/33] x86/resctrl: Add support to enable/disable AMD ABMC feature Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 10/33] fs/resctrl: Introduce the interface to display monitoring modes Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 11/33] fs/resctrl: Add resctrl file to display number of assignable counters Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 12/33] fs/resctrl: Introduce mbm_cntr_cfg to track assignable counters per domain Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 13/33] fs/resctrl: Introduce interface to display number of free MBM counters Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 14/33] x86/resctrl: Add data structures and definitions for ABMC assignment Babu Moger
2025-09-10 17:26 ` Borislav Petkov
2025-09-10 19:49 ` Moger, Babu
2025-09-10 19:59 ` Borislav Petkov
2025-09-10 20:26 ` Moger, Babu
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 15/33] fs/resctrl: Introduce event configuration field in struct mon_evt Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 16/33] x86,fs/resctrl: Implement resctrl_arch_config_cntr() to assign a counter with ABMC Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 17/33] fs/resctrl: Add the functionality to assign MBM events Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 18/33] fs/resctrl: Add the functionality to unassign " Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 19/33] fs/resctrl: Pass struct rdtgroup instead of individual members Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 20/33] fs/resctrl: Introduce counter ID read, reset calls in mbm_event mode Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 21/33] x86/resctrl: Refactor resctrl_arch_rmid_read() Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 22/33] x86/resctrl: Implement resctrl_arch_reset_cntr() and resctrl_arch_cntr_read() Babu Moger
2025-09-15 11:27 ` tip-bot2 for Babu Moger [this message]
2025-09-05 21:34 ` [PATCH v18 23/33] fs/resctrl: Support counter read/reset with mbm_event assignment mode Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 24/33] fs/resctrl: Add event configuration directory under info/L3_MON/ Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 25/33] fs/resctrl: Provide interface to update the event configurations Babu Moger
2025-09-06 4:49 ` Reinette Chatre
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 26/33] fs/resctrl: Introduce mbm_assign_on_mkdir to enable assignments on mkdir Babu Moger
2025-09-11 15:08 ` Borislav Petkov
2025-09-11 16:24 ` Reinette Chatre
2025-09-11 16:54 ` Borislav Petkov
2025-09-11 17:11 ` Reinette Chatre
2025-09-11 16:28 ` Moger, Babu
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 27/33] fs/resctrl: Auto assign counters on mkdir and clean up on group removal Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 28/33] fs/resctrl: Introduce mbm_L3_assignments to list assignments in a group Babu Moger
2025-09-06 4:49 ` Reinette Chatre
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 29/33] fs/resctrl: Introduce the interface to modify " Babu Moger
2025-09-06 4:50 ` Reinette Chatre
2025-09-08 19:17 ` Moger, Babu
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 30/33] fs/resctrl: Disable BMEC event configuration when mbm_event mode is enabled Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 31/33] fs/resctrl: Introduce the interface to switch between monitor modes Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 32/33] x86/resctrl: Configure mbm_event mode if supported Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] " tip-bot2 for Babu Moger
2025-09-05 21:34 ` [PATCH v18 33/33] MAINTAINERS: resctrl: add myself as reviewer Babu Moger
2025-09-15 11:27 ` [tip: x86/cache] MAINTAINERS: resctrl: Add " tip-bot2 for Babu Moger
2025-09-09 16:03 ` [PATCH v18 00/33] x86,fs/resctrl: Support AMD Assignable Bandwidth Monitoring Counters (ABMC) Reinette Chatre
2025-09-09 16:19 ` Borislav Petkov
2025-09-09 16:24 ` Reinette Chatre
2025-09-09 17:33 ` Luck, Tony
2025-09-09 17:38 ` Borislav Petkov
2025-09-15 11:25 ` Borislav Petkov
2025-09-15 21:07 ` Reinette Chatre
2025-09-16 10:54 ` Borislav Petkov
2025-09-16 17:00 ` Moger, Babu
2025-11-16 17:25 ` Drew Fustini
2025-11-17 15:07 ` Babu Moger
2025-11-18 23:15 ` Drew Fustini
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=175793565230.709179.8877435059894464441.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=babu.moger@amd.com \
--cc=bp@alien8.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=reinette.chatre@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
all inboxes | Powered by JetHome®