mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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] fs/resctrl: Add the functionality to assign MBM events
Date: Mon, 15 Sep 2025 11:27:37 -0000	[thread overview]
Message-ID: <175793565796.709179.1761353517263868070.tip-bot2@tip-bot2> (raw)
In-Reply-To: <25421710af9c3110ee6dfc1fa25b8f59de99454d.1757108044.git.babu.moger@amd.com>

The following commit has been merged into the x86/cache branch of tip:

Commit-ID:     bd85310efd71b9e7809e1b95fe7a60fde42e62db
Gitweb:        https://git.kernel.org/tip/bd85310efd71b9e7809e1b95fe7a60fde42e62db
Author:        Babu Moger <babu.moger@amd.com>
AuthorDate:    Fri, 05 Sep 2025 16:34:16 -05:00
Committer:     Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Mon, 15 Sep 2025 12:21:24 +02:00

fs/resctrl: Add the functionality to assign MBM events

When supported, "mbm_event" counter assignment mode offers "num_mbm_cntrs"
number of counters that can be assigned to RMID, event pairs and monitor
bandwidth usage as long as it is assigned.

Add the functionality to allocate and assign a counter to an RMID, event
pair in the domain. Also, add the helper rdtgroup_assign_cntrs() to assign
counters in the group.

Log the error message "Failed to allocate counter for <event> in domain
<id>" in /sys/fs/resctrl/info/last_cmd_status if all the counters are in
use. Exit on the first failure when assigning counters across all the
domains.

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
---
 fs/resctrl/internal.h |   2 +-
 fs/resctrl/monitor.c  | 156 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 158 insertions(+)

diff --git a/fs/resctrl/internal.h b/fs/resctrl/internal.h
index 1cddfff..762705d 100644
--- a/fs/resctrl/internal.h
+++ b/fs/resctrl/internal.h
@@ -396,6 +396,8 @@ int resctrl_num_mbm_cntrs_show(struct kernfs_open_file *of, struct seq_file *s, 
 int resctrl_available_mbm_cntrs_show(struct kernfs_open_file *of, struct seq_file *s,
 				     void *v);
 
+void rdtgroup_assign_cntrs(struct rdtgroup *rdtgrp);
+
 #ifdef CONFIG_RESCTRL_FS_PSEUDO_LOCK
 int rdtgroup_locksetup_enter(struct rdtgroup *rdtgrp);
 
diff --git a/fs/resctrl/monitor.c b/fs/resctrl/monitor.c
index f714e7b..106e9bd 100644
--- a/fs/resctrl/monitor.c
+++ b/fs/resctrl/monitor.c
@@ -356,6 +356,55 @@ static struct mbm_state *get_mbm_state(struct rdt_mon_domain *d, u32 closid,
 	return state ? &state[idx] : NULL;
 }
 
+/*
+ * mbm_cntr_get() - Return the counter ID for the matching @evtid and @rdtgrp.
+ *
+ * Return:
+ * Valid counter ID on success, or -ENOENT on failure.
+ */
+static int mbm_cntr_get(struct rdt_resource *r, struct rdt_mon_domain *d,
+			struct rdtgroup *rdtgrp, enum resctrl_event_id evtid)
+{
+	int cntr_id;
+
+	if (!r->mon.mbm_cntr_assignable)
+		return -ENOENT;
+
+	if (!resctrl_is_mbm_event(evtid))
+		return -ENOENT;
+
+	for (cntr_id = 0; cntr_id < r->mon.num_mbm_cntrs; cntr_id++) {
+		if (d->cntr_cfg[cntr_id].rdtgrp == rdtgrp &&
+		    d->cntr_cfg[cntr_id].evtid == evtid)
+			return cntr_id;
+	}
+
+	return -ENOENT;
+}
+
+/*
+ * mbm_cntr_alloc() - Initialize and return a new counter ID in the domain @d.
+ * Caller must ensure that the specified event is not assigned already.
+ *
+ * Return:
+ * Valid counter ID on success, or -ENOSPC on failure.
+ */
+static int mbm_cntr_alloc(struct rdt_resource *r, struct rdt_mon_domain *d,
+			  struct rdtgroup *rdtgrp, enum resctrl_event_id evtid)
+{
+	int cntr_id;
+
+	for (cntr_id = 0; cntr_id < r->mon.num_mbm_cntrs; cntr_id++) {
+		if (!d->cntr_cfg[cntr_id].rdtgrp) {
+			d->cntr_cfg[cntr_id].rdtgrp = rdtgrp;
+			d->cntr_cfg[cntr_id].evtid = evtid;
+			return cntr_id;
+		}
+	}
+
+	return -ENOSPC;
+}
+
 static int __mon_event_count(u32 closid, u32 rmid, struct rmid_read *rr)
 {
 	int cpu = smp_processor_id();
@@ -887,6 +936,113 @@ u32 resctrl_get_mon_evt_cfg(enum resctrl_event_id evtid)
 	return mon_event_all[evtid].evt_cfg;
 }
 
+/*
+ * rdtgroup_assign_cntr() - Assign/unassign the counter ID for the event, RMID
+ * pair in the domain.
+ *
+ * Assign the counter if @assign is true else unassign the counter. Reset the
+ * associated non-architectural state.
+ */
+static void rdtgroup_assign_cntr(struct rdt_resource *r, struct rdt_mon_domain *d,
+				 enum resctrl_event_id evtid, u32 rmid, u32 closid,
+				 u32 cntr_id, bool assign)
+{
+	struct mbm_state *m;
+
+	resctrl_arch_config_cntr(r, d, evtid, rmid, closid, cntr_id, assign);
+
+	m = get_mbm_state(d, closid, rmid, evtid);
+	if (m)
+		memset(m, 0, sizeof(*m));
+}
+
+/*
+ * rdtgroup_alloc_assign_cntr() - Allocate a counter ID and assign it to the event
+ * pointed to by @mevt and the resctrl group @rdtgrp within the domain @d.
+ *
+ * Return:
+ * 0 on success, < 0 on failure.
+ */
+static int rdtgroup_alloc_assign_cntr(struct rdt_resource *r, struct rdt_mon_domain *d,
+				      struct rdtgroup *rdtgrp, struct mon_evt *mevt)
+{
+	int cntr_id;
+
+	/* No action required if the counter is assigned already. */
+	cntr_id = mbm_cntr_get(r, d, rdtgrp, mevt->evtid);
+	if (cntr_id >= 0)
+		return 0;
+
+	cntr_id = mbm_cntr_alloc(r, d, rdtgrp, mevt->evtid);
+	if (cntr_id < 0) {
+		rdt_last_cmd_printf("Failed to allocate counter for %s in domain %d\n",
+				    mevt->name, d->hdr.id);
+		return cntr_id;
+	}
+
+	rdtgroup_assign_cntr(r, d, mevt->evtid, rdtgrp->mon.rmid, rdtgrp->closid, cntr_id, true);
+
+	return 0;
+}
+
+/*
+ * rdtgroup_assign_cntr_event() - Assign a hardware counter for the event in
+ * @mevt to the resctrl group @rdtgrp. Assign counters to all domains if @d is
+ * NULL; otherwise, assign the counter to the specified domain @d.
+ *
+ * If all counters in a domain are already in use, rdtgroup_alloc_assign_cntr()
+ * will fail. The assignment process will abort at the first failure encountered
+ * during domain traversal, which may result in the event being only partially
+ * assigned.
+ *
+ * Return:
+ * 0 on success, < 0 on failure.
+ */
+static int rdtgroup_assign_cntr_event(struct rdt_mon_domain *d, struct rdtgroup *rdtgrp,
+				      struct mon_evt *mevt)
+{
+	struct rdt_resource *r = resctrl_arch_get_resource(mevt->rid);
+	int ret = 0;
+
+	if (!d) {
+		list_for_each_entry(d, &r->mon_domains, hdr.list) {
+			ret = rdtgroup_alloc_assign_cntr(r, d, rdtgrp, mevt);
+			if (ret)
+				return ret;
+		}
+	} else {
+		ret = rdtgroup_alloc_assign_cntr(r, d, rdtgrp, mevt);
+	}
+
+	return ret;
+}
+
+/*
+ * rdtgroup_assign_cntrs() - Assign counters to MBM events. Called when
+ *			     a new group is created.
+ *
+ * Each group can accommodate two counters per domain: one for the total
+ * event and one for the local event. Assignments may fail due to the limited
+ * number of counters. However, it is not necessary to fail the group creation
+ * and thus no failure is returned. Users have the option to modify the
+ * counter assignments after the group has been created.
+ */
+void rdtgroup_assign_cntrs(struct rdtgroup *rdtgrp)
+{
+	struct rdt_resource *r = resctrl_arch_get_resource(RDT_RESOURCE_L3);
+
+	if (!r->mon_capable || !resctrl_arch_mbm_cntr_assign_enabled(r))
+		return;
+
+	if (resctrl_is_mon_event_enabled(QOS_L3_MBM_TOTAL_EVENT_ID))
+		rdtgroup_assign_cntr_event(NULL, rdtgrp,
+					   &mon_event_all[QOS_L3_MBM_TOTAL_EVENT_ID]);
+
+	if (resctrl_is_mon_event_enabled(QOS_L3_MBM_LOCAL_EVENT_ID))
+		rdtgroup_assign_cntr_event(NULL, rdtgrp,
+					   &mon_event_all[QOS_L3_MBM_LOCAL_EVENT_ID]);
+}
+
 int resctrl_mbm_assign_mode_show(struct kernfs_open_file *of,
 				 struct seq_file *s, void *v)
 {

  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-bot2 for Babu Moger [this message]
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: x86/cache] " tip-bot2 for Babu Moger
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=175793565796.709179.1761353517263868070.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®