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: Introduce the interface to switch between monitor modes
Date: Mon, 15 Sep 2025 11:27:21 -0000	[thread overview]
Message-ID: <175793564174.709179.1003557688903099.tip-bot2@tip-bot2> (raw)
In-Reply-To: <22585f963c8b3c042cb7acfd663d497225fb0f75.1757108044.git.babu.moger@amd.com>

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

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

fs/resctrl: Introduce the interface to switch between monitor modes

Resctrl subsystem can support two monitoring modes, "mbm_event" or "default".
In mbm_event mode, monitoring event can only accumulate data while it is
backed by a hardware counter. In "default" mode, resctrl assumes there is
a hardware counter for each event within every CTRL_MON and MON group.

Introduce mbm_assign_mode resctrl file to switch between mbm_event and default
modes.

Example:
To list the MBM monitor modes supported:
  $ cat /sys/fs/resctrl/info/L3_MON/mbm_assign_mode
  [mbm_event]
  default

To enable the "mbm_event" counter assignment mode:
  $ echo "mbm_event" > /sys/fs/resctrl/info/L3_MON/mbm_assign_mode

To enable the "default" monitoring mode:
  $ echo "default" > /sys/fs/resctrl/info/L3_MON/mbm_assign_mode

Reset MBM event counters automatically as part of changing the mode.  Clear
both architectural and non-architectural event states to prevent overflow
conditions during the next event read. Clear assignable counter configuration
on all the domains. Also, enable auto assignment when switching to "mbm_event"
mode.

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
---
 Documentation/filesystems/resctrl.rst |  22 +++++-
 fs/resctrl/internal.h                 |   6 ++-
 fs/resctrl/monitor.c                  | 100 +++++++++++++++++++++++++-
 fs/resctrl/rdtgroup.c                 |   7 +-
 4 files changed, 131 insertions(+), 4 deletions(-)

diff --git a/Documentation/filesystems/resctrl.rst b/Documentation/filesystems/resctrl.rst
index f60f6a9..006d23a 100644
--- a/Documentation/filesystems/resctrl.rst
+++ b/Documentation/filesystems/resctrl.rst
@@ -259,7 +259,8 @@ with the following files:
 
 "mbm_assign_mode":
 	The supported counter assignment modes. The enclosed brackets indicate which mode
-	is enabled.
+	is enabled. The MBM events associated with counters may reset when "mbm_assign_mode"
+	is changed.
 	::
 
 	  # cat /sys/fs/resctrl/info/L3_MON/mbm_assign_mode
@@ -279,6 +280,15 @@ with the following files:
 	of counters available is described in the "num_mbm_cntrs" file. Changing the
 	mode may cause all counters on the resource to reset.
 
+	Moving to mbm_event counter assignment mode requires users to assign the counters
+	to the events. Otherwise, the MBM event counters will return 'Unassigned' when read.
+
+	The mode is beneficial for AMD platforms that support more CTRL_MON
+	and MON groups than available hardware counters. By default, this
+	feature is enabled on AMD platforms with the ABMC (Assignable Bandwidth
+	Monitoring Counters) capability, ensuring counters remain assigned even
+	when the corresponding RMID is not actively used by any processor.
+
 	"default":
 
 	In default mode, resctrl assumes there is a hardware counter for each
@@ -288,6 +298,16 @@ with the following files:
 	result in misleading values or display "Unavailable" if no counter is assigned
 	to the event.
 
+	* To enable "mbm_event" counter assignment mode:
+	  ::
+
+	    # echo "mbm_event" > /sys/fs/resctrl/info/L3_MON/mbm_assign_mode
+
+	* To enable "default" monitoring mode:
+	  ::
+
+	    # echo "default" > /sys/fs/resctrl/info/L3_MON/mbm_assign_mode
+
 "num_mbm_cntrs":
 	The maximum number of counters (total of available and assigned counters) in
 	each domain when the system supports mbm_event mode.
diff --git a/fs/resctrl/internal.h b/fs/resctrl/internal.h
index c69b1da..cf1fd82 100644
--- a/fs/resctrl/internal.h
+++ b/fs/resctrl/internal.h
@@ -396,6 +396,12 @@ void *rdt_kn_parent_priv(struct kernfs_node *kn);
 
 int resctrl_mbm_assign_mode_show(struct kernfs_open_file *of, struct seq_file *s, void *v);
 
+ssize_t resctrl_mbm_assign_mode_write(struct kernfs_open_file *of, char *buf,
+				      size_t nbytes, loff_t off);
+
+void resctrl_bmec_files_show(struct rdt_resource *r, struct kernfs_node *l3_mon_kn,
+			     bool show);
+
 int resctrl_num_mbm_cntrs_show(struct kernfs_open_file *of, struct seq_file *s, void *v);
 
 int resctrl_available_mbm_cntrs_show(struct kernfs_open_file *of, struct seq_file *s,
diff --git a/fs/resctrl/monitor.c b/fs/resctrl/monitor.c
index f388dbc..50c2446 100644
--- a/fs/resctrl/monitor.c
+++ b/fs/resctrl/monitor.c
@@ -1079,6 +1079,33 @@ out_unlock:
 }
 
 /*
+ * mbm_cntr_free_all() - Clear all the counter ID configuration details in the
+ *			 domain @d. Called when mbm_assign_mode is changed.
+ */
+static void mbm_cntr_free_all(struct rdt_resource *r, struct rdt_mon_domain *d)
+{
+	memset(d->cntr_cfg, 0, sizeof(*d->cntr_cfg) * r->mon.num_mbm_cntrs);
+}
+
+/*
+ * resctrl_reset_rmid_all() - Reset all non-architecture states for all the
+ *			      supported RMIDs.
+ */
+static void resctrl_reset_rmid_all(struct rdt_resource *r, struct rdt_mon_domain *d)
+{
+	u32 idx_limit = resctrl_arch_system_num_rmid_idx();
+	enum resctrl_event_id evt;
+	int idx;
+
+	for_each_mbm_event_id(evt) {
+		if (!resctrl_is_mon_event_enabled(evt))
+			continue;
+		idx = MBM_STATE_IDX(evt);
+		memset(d->mbm_states[idx], 0, sizeof(*d->mbm_states[0]) * idx_limit);
+	}
+}
+
+/*
  * rdtgroup_assign_cntr() - Assign/unassign the counter ID for the event, RMID
  * pair in the domain.
  *
@@ -1388,6 +1415,79 @@ int resctrl_mbm_assign_mode_show(struct kernfs_open_file *of,
 	return 0;
 }
 
+ssize_t resctrl_mbm_assign_mode_write(struct kernfs_open_file *of, char *buf,
+				      size_t nbytes, loff_t off)
+{
+	struct rdt_resource *r = rdt_kn_parent_priv(of->kn);
+	struct rdt_mon_domain *d;
+	int ret = 0;
+	bool enable;
+
+	/* Valid input requires a trailing newline */
+	if (nbytes == 0 || buf[nbytes - 1] != '\n')
+		return -EINVAL;
+
+	buf[nbytes - 1] = '\0';
+
+	cpus_read_lock();
+	mutex_lock(&rdtgroup_mutex);
+
+	rdt_last_cmd_clear();
+
+	if (!strcmp(buf, "default")) {
+		enable = 0;
+	} else if (!strcmp(buf, "mbm_event")) {
+		if (r->mon.mbm_cntr_assignable) {
+			enable = 1;
+		} else {
+			ret = -EINVAL;
+			rdt_last_cmd_puts("mbm_event mode is not supported\n");
+			goto out_unlock;
+		}
+	} else {
+		ret = -EINVAL;
+		rdt_last_cmd_puts("Unsupported assign mode\n");
+		goto out_unlock;
+	}
+
+	if (enable != resctrl_arch_mbm_cntr_assign_enabled(r)) {
+		ret = resctrl_arch_mbm_cntr_assign_set(r, enable);
+		if (ret)
+			goto out_unlock;
+
+		/* Update the visibility of BMEC related files */
+		resctrl_bmec_files_show(r, NULL, !enable);
+
+		/*
+		 * Initialize the default memory transaction values for
+		 * total and local events.
+		 */
+		if (resctrl_is_mon_event_enabled(QOS_L3_MBM_TOTAL_EVENT_ID))
+			mon_event_all[QOS_L3_MBM_TOTAL_EVENT_ID].evt_cfg = r->mon.mbm_cfg_mask;
+		if (resctrl_is_mon_event_enabled(QOS_L3_MBM_LOCAL_EVENT_ID))
+			mon_event_all[QOS_L3_MBM_LOCAL_EVENT_ID].evt_cfg = r->mon.mbm_cfg_mask &
+									   (READS_TO_LOCAL_MEM |
+									    READS_TO_LOCAL_S_MEM |
+									    NON_TEMP_WRITE_TO_LOCAL_MEM);
+		/* Enable auto assignment when switching to "mbm_event" mode */
+		if (enable)
+			r->mon.mbm_assign_on_mkdir = true;
+		/*
+		 * Reset all the non-achitectural RMID state and assignable counters.
+		 */
+		list_for_each_entry(d, &r->mon_domains, hdr.list) {
+			mbm_cntr_free_all(r, d);
+			resctrl_reset_rmid_all(r, d);
+		}
+	}
+
+out_unlock:
+	mutex_unlock(&rdtgroup_mutex);
+	cpus_read_unlock();
+
+	return ret ?: nbytes;
+}
+
 int resctrl_num_mbm_cntrs_show(struct kernfs_open_file *of,
 			       struct seq_file *s, void *v)
 {
diff --git a/fs/resctrl/rdtgroup.c b/fs/resctrl/rdtgroup.c
index 0c404a1..0320360 100644
--- a/fs/resctrl/rdtgroup.c
+++ b/fs/resctrl/rdtgroup.c
@@ -1807,8 +1807,8 @@ static ssize_t mbm_local_bytes_config_write(struct kernfs_open_file *of,
  * Don't treat kernfs_find_and_get failure as an error, since this function may
  * be called regardless of whether BMEC is supported or the event is enabled.
  */
-static void resctrl_bmec_files_show(struct rdt_resource *r, struct kernfs_node *l3_mon_kn,
-				    bool show)
+void resctrl_bmec_files_show(struct rdt_resource *r, struct kernfs_node *l3_mon_kn,
+			     bool show)
 {
 	struct kernfs_node *kn_config, *mon_kn = NULL;
 	char name[32];
@@ -1985,9 +1985,10 @@ static struct rftype res_common_files[] = {
 	},
 	{
 		.name		= "mbm_assign_mode",
-		.mode		= 0444,
+		.mode		= 0644,
 		.kf_ops		= &rdtgroup_kf_single_ops,
 		.seq_show	= resctrl_mbm_assign_mode_show,
+		.write		= resctrl_mbm_assign_mode_write,
 		.fflags		= RFTYPE_MON_INFO | RFTYPE_RES_CACHE,
 	},
 	{

  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: 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-bot2 for Babu Moger [this message]
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=175793564174.709179.1003557688903099.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®