From: Tony Luck <tony.luck@intel.com>
To: Fenghua Yu <fenghuay@nvidia.com>,
Reinette Chatre <reinette.chatre@intel.com>,
Maciej Wieczor-Retman <maciej.wieczor-retman@intel.com>,
Peter Newman <peternewman@google.com>,
James Morse <james.morse@arm.com>,
Babu Moger <babu.moger@amd.com>,
Drew Fustini <dfustini@baylibre.com>,
Dave Martin <Dave.Martin@arm.com>
Cc: linux-kernel@vger.kernel.org, patches@lists.linux.dev,
Tony Luck <tony.luck@intel.com>
Subject: [RFC PATCH 14/17] x86/resctrl: Add code in rdtgroup_mondata_show() for core monitor events
Date: Mon, 3 Mar 2025 15:33:34 -0800 [thread overview]
Message-ID: <20250303233340.333743-15-tony.luck@intel.com> (raw)
In-Reply-To: <20250303233340.333743-1-tony.luck@intel.com>
There may be multiple devices tracking each package, so scan all of them
and add up counters.
Output format depends on the data type. Either a 63 bit integer, or a
fixed point decimal.
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
arch/x86/kernel/cpu/resctrl/internal.h | 6 ++
arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 3 +
arch/x86/kernel/cpu/resctrl/intel_pmt.c | 88 +++++++++++++++++++++++
3 files changed, 97 insertions(+)
diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
index 24c4ab331c3c..068a47b015e7 100644
--- a/arch/x86/kernel/cpu/resctrl/internal.h
+++ b/arch/x86/kernel/cpu/resctrl/internal.h
@@ -639,11 +639,17 @@ void free_rmid(u32 closid, u32 rmid);
int rdt_get_mon_l3_config(struct rdt_resource *r);
#ifdef CONFIG_INTEL_PMT_RESCTRL
int rdt_get_intel_pmt_mon_config(void);
+int rdtgroup_intel_pmt_data_show(struct seq_file *m, struct rdt_resource *r,
+ int domid, struct rdtgroup *rdtgrp, u32 evtid,
+ struct rmid_read *rr);
void rdt_get_intel_pmt_mount(void);
void setup_intel_pmt_mon_domain(int cpu, int id, struct rdt_resource *r, struct list_head *add_pos);
void rdt_intel_pmt_exit(void);
#else
static inline int rdt_get_intel_pmt_mon_config(void) { return 0; }
+static inline int rdtgroup_intel_pmt_data_show(struct seq_file *m, struct rdt_resource *r,
+ int domid, struct rdtgroup *rdtgrp, u32 evtid,
+ struct rmid_read *rr) { return 0; }
static inline void rdt_get_intel_pmt_mount(void) { }
static inline void setup_intel_pmt_mon_domain(int cpu, int id, struct rdt_resource *r,
struct list_head *add_pos) { }
diff --git a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
index 515a9bec05cd..0c3d407aca08 100644
--- a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
+++ b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
@@ -700,6 +700,9 @@ int rdtgroup_mondata_show(struct seq_file *m, void *arg)
case RDT_RESOURCE_L3:
ret = rdtgroup_l3_data_show(m, r, domid, rdtgrp, evtid, md.u.sum, &rr);
break;
+ case RDT_RESOURCE_INTEL_PMT:
+ ret = rdtgroup_intel_pmt_data_show(m, r, domid, rdtgrp, evtid, &rr);
+ break;
default:
ret = -EINVAL;
break;
diff --git a/arch/x86/kernel/cpu/resctrl/intel_pmt.c b/arch/x86/kernel/cpu/resctrl/intel_pmt.c
index c5557d7f5fbe..4067aacd9d80 100644
--- a/arch/x86/kernel/cpu/resctrl/intel_pmt.c
+++ b/arch/x86/kernel/cpu/resctrl/intel_pmt.c
@@ -320,3 +320,91 @@ void setup_intel_pmt_mon_domain(int cpu, int id, struct rdt_resource *r, struct
if (resctrl_mounted && resctrl_arch_mon_capable())
mkdir_mondata_subdir_allrdtgrp(r, &hw_dom->hdr);
}
+
+#define VALID_BIT BIT_ULL(63)
+#define DATA_BITS GENMASK_ULL(62, 0)
+
+static u64 scan_pmt_devs(int package, int guid, int offset)
+{
+ u64 rval, val;
+ int ndev = 0;
+
+ rval = 0;
+
+ for (int i = 0; i < pkg_info[package].count; i++) {
+ if (pkg_info[package].regions[i].guid != guid)
+ continue;
+ ndev++;
+ val = readq(pkg_info[package].regions[i].addr + offset);
+
+ if (!(val & VALID_BIT))
+ return ~0ull;
+ rval += val & DATA_BITS;
+ }
+
+ return ndev ? rval : ~0ull;
+}
+
+#define NUM_FRAC_BITS 18
+#define FRAC_MASK GENMASK(NUM_FRAC_BITS - 1, 0)
+
+static void print_u46_18(struct seq_file *m, u64 val)
+{
+ u64 frac;
+
+ frac = val & FRAC_MASK;
+ frac = frac * 1000000;
+ frac += 1ul << (NUM_FRAC_BITS - 1);
+ frac >>= NUM_FRAC_BITS;
+
+ seq_printf(m, "%llu.%06llu\n", val >> NUM_FRAC_BITS, frac);
+}
+
+int rdtgroup_intel_pmt_data_show(struct seq_file *m, struct rdt_resource *r,
+ int domid, struct rdtgroup *rdtgrp, u32 evtid,
+ struct rmid_read *rr)
+{
+ struct rdtgroup *entry;
+ struct list_head *head;
+ u64 val, cval;
+ int offset;
+
+ if (rdtgrp->mon.rmid >= EVT_NUM_RMIDS(evtid)) {
+ seq_puts(m, "unimplemented\n");
+ return 0;
+ }
+
+ offset = rdtgrp->mon.rmid * EVT_STRIDE(evtid);
+ offset += EVT_OFFSET(evtid);
+
+ val = scan_pmt_devs(domid, EVT_GUID(evtid), offset);
+ if (val == ~0ull) {
+ seq_puts(m, "unavailable\n");
+ return 0;
+ }
+
+ if (rdtgrp->type == RDTCTRL_GROUP) {
+ head = &rdtgrp->mon.crdtgrp_list;
+ list_for_each_entry(entry, head, mon.crdtgrp_list) {
+ offset = entry->mon.rmid * EVT_STRIDE(evtid);
+ offset += EVT_OFFSET(evtid);
+ cval = scan_pmt_devs(domid, EVT_GUID(evtid), offset);
+ if (cval == ~0ull) {
+ seq_puts(m, "unavailable\n");
+ return 0;
+ }
+ val += cval;
+ }
+ }
+
+ switch (EVT_TYPE(evtid)) {
+ case EVT_U64:
+ seq_printf(m, "%llu\n", val);
+ break;
+ case EVT_U46_18:
+ print_u46_18(m, val);
+ break;
+ }
+
+ return 0;
+}
--
2.48.1
next prev parent reply other threads:[~2025-03-03 23:34 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-03 23:33 [RFC PATCH 00/17] x86/resctrl telemetry monitoring Tony Luck
2025-03-03 23:33 ` [RFC PATCH 01/17] x86/rectrl: Fake OOBMSM interface Tony Luck
2025-03-03 23:33 ` [RFC PATCH 02/17] x86/resctrl: Move L3 initialization out of domain_add_cpu_mon() Tony Luck
2025-03-03 23:33 ` [RFC PATCH 03/17] x86/resctrl: Refactor domain_remove_cpu_mon() ready for new domain types Tony Luck
2025-03-03 23:33 ` [RFC PATCH 04/17] x86/resctrl: Split L3 specific code out of rdtgroup_mondata_show() Tony Luck
2025-03-03 23:33 ` [RFC PATCH 05/17] x86/resctrl: Change generic monitor functions to use struct rdt_domain_hdr Tony Luck
2025-03-03 23:33 ` [RFC PATCH 06/17] x86/resctrl: Add and initialize rdt_resource for package scope core monitor Tony Luck
2025-03-03 23:33 ` [RFC PATCH 07/17] x86/resctrl: Prepare for resource specific event ids Tony Luck
2025-03-03 23:33 ` [RFC PATCH 08/17] x86/resctrl: Add initialization hook for Intel PMT events Tony Luck
2025-03-03 23:33 ` [RFC PATCH 09/17] x86/resctrl: Add Intel PMT domain specific code Tony Luck
2025-03-03 23:33 ` [RFC PATCH 10/17] x86/resctrl: Add detailed descriptions for Clearwater Forest events Tony Luck
2025-03-03 23:33 ` [RFC PATCH 11/17] x86/resctrl: Allocate per-package structures for known events Tony Luck
2025-03-03 23:33 ` [RFC PATCH 12/17] x86/resctrl: Add list of known events to RDT_RESOURCE_INTEL_PMT Tony Luck
2025-03-03 23:33 ` [RFC PATCH 13/17] x86/resctrl: Build lookup table for package events Tony Luck
2025-03-03 23:33 ` Tony Luck [this message]
2025-03-03 23:33 ` [RFC PATCH 15/17] x86/resctrl: Add status files to info/PKG_MON Tony Luck
2025-03-03 23:33 ` [RFC PATCH 16/17] x86/resctrl: Enable package event monitoring Tony Luck
2025-03-03 23:33 ` [RFC PATCH 17/17] x86/resctrl: Update Documentation for package events Tony Luck
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=20250303233340.333743-15-tony.luck@intel.com \
--to=tony.luck@intel.com \
--cc=Dave.Martin@arm.com \
--cc=babu.moger@amd.com \
--cc=dfustini@baylibre.com \
--cc=fenghuay@nvidia.com \
--cc=james.morse@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maciej.wieczor-retman@intel.com \
--cc=patches@lists.linux.dev \
--cc=peternewman@google.com \
--cc=reinette.chatre@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
all inboxes | Powered by JetHome®