mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Babu Moger <babu.moger@amd.com>
To: <corbet@lwn.net>, <fenghua.yu@intel.com>,
	<reinette.chatre@intel.com>, <tglx@linutronix.de>,
	<mingo@redhat.com>, <bp@alien8.de>, <dave.hansen@linux.intel.com>
Cc: <x86@kernel.org>, <hpa@zytor.com>, <paulmck@kernel.org>,
	<rdunlap@infradead.org>, <tj@kernel.org>, <peterz@infradead.org>,
	<yanjiewtw@gmail.com>, <babu.moger@amd.com>,
	<kim.phillips@amd.com>, <lukas.bulwahn@gmail.com>,
	<seanjc@google.com>, <jmattson@google.com>, <leitao@debian.org>,
	<jpoimboe@kernel.org>, <rick.p.edgecombe@intel.com>,
	<kirill.shutemov@linux.intel.com>, <jithu.joseph@intel.com>,
	<kai.huang@intel.com>, <kan.liang@linux.intel.com>,
	<daniel.sneddon@linux.intel.com>, <pbonzini@redhat.com>,
	<sandipan.das@amd.com>, <ilpo.jarvinen@linux.intel.com>,
	<peternewman@google.com>, <maciej.wieczor-retman@intel.com>,
	<linux-doc@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<eranian@google.com>, <james.morse@arm.com>
Subject: [PATCH v8 17/25] x86/resctrl: Add the interface to assign/update counter assignment
Date: Wed, 9 Oct 2024 12:39:42 -0500	[thread overview]
Message-ID: <86c8fd4db89f264b1382cd22d7cf53c4510bf07a.1728495588.git.babu.moger@amd.com> (raw)
In-Reply-To: <cover.1728495588.git.babu.moger@amd.com>

The mbm_cntr_assign mode offers several hardware counters that can be
assigned to an RMID-event pair and monitor the bandwidth as long as it
is assigned.

Counters are managed at two levels. The global assignment is tracked
using the mbm_cntr_free_map field in the struct resctrl_mon, while
domain-specific assignments are tracked using the mbm_cntr_map field
in the struct rdt_mon_domain. Allocation begins at the global level
and is then applied individually to each domain.

Introduce an interface to allocate these counters and update the
corresponding domains accordingly.

Signed-off-by: Babu Moger <babu.moger@amd.com>
---
v8: Renamed rdtgroup_assign_cntr() to rdtgroup_assign_cntr_event().
    Added the code to return the error if rdtgroup_assign_cntr_event fails.
    Moved definition of MBM_EVENT_ARRAY_INDEX to resctrl/internal.h.
    Updated typo in the comments.

v7: New patch. Moved all the FS code here.
    Merged rdtgroup_assign_cntr and rdtgroup_alloc_cntr.
    Adde new #define MBM_EVENT_ARRAY_INDEX.
---
 arch/x86/kernel/cpu/resctrl/internal.h |  9 +++++
 arch/x86/kernel/cpu/resctrl/rdtgroup.c | 47 ++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
index 6d4df0490186..900e18aea2c4 100644
--- a/arch/x86/kernel/cpu/resctrl/internal.h
+++ b/arch/x86/kernel/cpu/resctrl/internal.h
@@ -67,6 +67,13 @@
 
 #define MON_CNTR_UNSET			U32_MAX
 
+/*
+ * Get the counter index for the assignable counter
+ * 0 for evtid == QOS_L3_MBM_TOTAL_EVENT_ID
+ * 1 for evtid == QOS_L3_MBM_LOCAL_EVENT_ID
+ */
+#define MBM_EVENT_ARRAY_INDEX(_event) ((_event) - 2)
+
 /**
  * cpumask_any_housekeeping() - Choose any CPU in @mask, preferring those that
  *			        aren't marked nohz_full
@@ -708,6 +715,8 @@ unsigned int mon_event_config_index_get(u32 evtid);
 int resctrl_arch_config_cntr(struct rdt_resource *r, struct rdt_mon_domain *d,
 			     enum resctrl_event_id evtid, u32 rmid, u32 closid,
 			     u32 cntr_id, bool assign);
+int rdtgroup_assign_cntr_event(struct rdt_resource *r, struct rdtgroup *rdtgrp,
+			       struct rdt_mon_domain *d, enum resctrl_event_id evtid);
 void rdt_staged_configs_clear(void);
 bool closid_allocated(unsigned int closid);
 int resctrl_find_cleanest_closid(void);
diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
index 4ab1a18010c9..e4f628e6fe65 100644
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -1898,6 +1898,53 @@ int resctrl_arch_config_cntr(struct rdt_resource *r, struct rdt_mon_domain *d,
 	return 0;
 }
 
+/*
+ * Assign a hardware counter to the group.
+ * Counter will be assigned to all the domains if rdt_mon_domain is NULL
+ * else the counter will be allocated to specific domain.
+ */
+int rdtgroup_assign_cntr_event(struct rdt_resource *r, struct rdtgroup *rdtgrp,
+			       struct rdt_mon_domain *d, enum resctrl_event_id evtid)
+{
+	int index = MBM_EVENT_ARRAY_INDEX(evtid);
+	int cntr_id = rdtgrp->mon.cntr_id[index];
+	int ret;
+
+	/*
+	 * Allocate a new counter id to the event if the counter is not
+	 * assigned already.
+	 */
+	if (cntr_id == MON_CNTR_UNSET) {
+		cntr_id = mbm_cntr_alloc(r);
+		if (cntr_id < 0) {
+			rdt_last_cmd_puts("Out of MBM assignable counters\n");
+			return -ENOSPC;
+		}
+		rdtgrp->mon.cntr_id[index] = cntr_id;
+	}
+
+	if (!d) {
+		list_for_each_entry(d, &r->mon_domains, hdr.list) {
+			ret = resctrl_arch_config_cntr(r, d, evtid, rdtgrp->mon.rmid,
+						       rdtgrp->closid, cntr_id, true);
+			if (ret)
+				goto out_done_assign;
+
+			set_bit(cntr_id, d->mbm_cntr_map);
+		}
+	} else {
+		ret = resctrl_arch_config_cntr(r, d, evtid, rdtgrp->mon.rmid,
+					       rdtgrp->closid, cntr_id, true);
+		if (ret)
+			goto out_done_assign;
+
+		set_bit(cntr_id, d->mbm_cntr_map);
+	}
+
+out_done_assign:
+	return ret;
+}
+
 /* rdtgroup information files for one cache resource. */
 static struct rftype res_common_files[] = {
 	{
-- 
2.34.1


  parent reply	other threads:[~2024-10-09 17:42 UTC|newest]

Thread overview: 124+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-09 17:39 [PATCH v8 00/25] x86/resctrl : Support AMD Assignable Bandwidth Monitoring Counters (ABMC) Babu Moger
2024-10-09 17:39 ` [PATCH v8 01/25] x86/cpufeatures: Add support for " Babu Moger
2024-10-09 17:39 ` [PATCH v8 02/25] x86/resctrl: Add ABMC feature in the command line options Babu Moger
2024-10-16  3:06   ` Reinette Chatre
2024-10-09 17:39 ` [PATCH v8 03/25] x86/resctrl: Consolidate monitoring related data from rdt_resource Babu Moger
2024-10-09 17:39 ` [PATCH v8 04/25] x86/resctrl: Detect Assignable Bandwidth Monitoring feature details Babu Moger
2024-10-16  3:06   ` Reinette Chatre
2024-10-09 17:39 ` [PATCH v8 05/25] x86/resctrl: Introduce resctrl_file_fflags_init() to initialize fflags Babu Moger
2024-10-09 17:39 ` [PATCH v8 06/25] x86/resctrl: Add support to enable/disable AMD ABMC feature Babu Moger
2024-10-11 18:14   ` Tony Luck
2024-10-11 20:53     ` Moger, Babu
2024-10-16  3:07   ` Reinette Chatre
2024-10-09 17:39 ` [PATCH v8 07/25] x86/resctrl: Introduce the interface to display monitor mode Babu Moger
2024-10-09 22:42   ` Tony Luck
2024-10-10 14:54     ` Moger, Babu
2024-10-10 15:07       ` Luck, Tony
2024-10-10 15:30         ` Moger, Babu
2024-10-10 16:02           ` Luck, Tony
2024-10-11 22:24           ` Reinette Chatre
2024-10-14 15:16             ` Moger, Babu
2024-10-16  3:12   ` Reinette Chatre
2024-10-16 15:57     ` Moger, Babu
2024-10-16 16:25       ` Reinette Chatre
2024-10-09 17:39 ` [PATCH v8 08/25] x86/resctrl: Introduce interface to display number of monitoring counters Babu Moger
2024-10-09 22:49   ` Tony Luck
2024-10-10 15:12     ` Moger, Babu
2024-10-10 15:58       ` Luck, Tony
2024-10-10 16:57         ` Moger, Babu
2024-10-10 17:08           ` Luck, Tony
2024-10-10 18:36             ` Moger, Babu
2024-10-10 18:57               ` Luck, Tony
2024-10-10 20:32                 ` Moger, Babu
2024-10-11 17:44                   ` Tony Luck
2024-10-11 20:49                     ` Moger, Babu
2024-10-11 21:36                       ` Tony Luck
2024-10-14 16:46                         ` Reinette Chatre
2024-10-14 17:20                           ` Moger, Babu
2024-10-14 17:49                             ` Luck, Tony
2024-10-14 19:21                               ` Moger, Babu
2024-10-14 19:51                                 ` Luck, Tony
2024-10-14 20:05                                   ` Reinette Chatre
2024-10-14 20:32                                     ` Moger, Babu
2024-10-24 17:29                                     ` Moger, Babu
2024-10-24 17:37                                       ` Luck, Tony
2024-10-25 20:31                                         ` Moger, Babu
2024-10-14 16:59               ` Reinette Chatre
2024-10-14 19:23                 ` Moger, Babu
2024-10-14 16:25       ` Reinette Chatre
2024-10-14 17:46         ` Moger, Babu
2024-10-14 18:30           ` Reinette Chatre
2024-10-14 18:51             ` Moger, Babu
2024-10-09 17:39 ` [PATCH v8 09/25] x86/resctrl: Add __init attribute to dom_data_init() Babu Moger
2024-10-16  3:13   ` Reinette Chatre
2024-10-16 17:32     ` Moger, Babu
2024-10-16 18:55       ` Reinette Chatre
2024-10-16 20:18         ` Moger, Babu
2024-10-09 17:39 ` [PATCH v8 10/25] x86/resctrl: Introduce bitmap mbm_cntr_free_map to track assignable counters Babu Moger
2024-10-16  3:14   ` Reinette Chatre
2024-10-17 16:55     ` Moger, Babu
2024-10-09 17:39 ` [PATCH v8 11/25] x86/resctrl: Introduce mbm_total_cfg and mbm_local_cfg in struct rdt_hw_mon_domain Babu Moger
2024-10-16  3:15   ` Reinette Chatre
2024-10-09 17:39 ` [PATCH v8 12/25] x86/resctrl: Remove MSR reading of event configuration value Babu Moger
2024-10-16  3:16   ` Reinette Chatre
2024-10-17 17:59     ` Moger, Babu
2024-10-09 17:39 ` [PATCH v8 13/25] x86/resctrl: Introduce mbm_cntr_map to track assignable counters at domain Babu Moger
2024-10-16  3:19   ` Reinette Chatre
2024-10-09 17:39 ` [PATCH v8 14/25] x86/resctrl: Add data structures and definitions for ABMC assignment Babu Moger
2024-10-16  3:21   ` Reinette Chatre
2024-10-17 18:52     ` Moger, Babu
2024-10-17 21:13       ` Reinette Chatre
2024-10-17 23:02         ` Moger, Babu
2024-10-09 17:39 ` [PATCH v8 15/25] x86/resctrl: Introduce cntr_id in mongroup for assignments Babu Moger
2024-10-16  3:22   ` Reinette Chatre
2024-10-17 19:19     ` Moger, Babu
2024-10-09 17:39 ` [PATCH v8 16/25] x86/resctrl: Implement resctrl_arch_config_cntr() to assign a counter with ABMC Babu Moger
2024-10-16  3:23   ` Reinette Chatre
2024-10-17 22:44     ` Moger, Babu
2024-10-09 17:39 ` Babu Moger [this message]
2024-10-16  3:25   ` [PATCH v8 17/25] x86/resctrl: Add the interface to assign/update counter assignment Reinette Chatre
2024-10-17 22:56     ` Moger, Babu
2024-10-18 15:59       ` Reinette Chatre
2024-10-21 14:40         ` Moger, Babu
2024-10-21 15:31           ` Reinette Chatre
2024-10-22  1:15             ` Moger, Babu
2024-10-09 17:39 ` [PATCH v8 18/25] x86/resctrl: Add the interface to unassign a MBM counter Babu Moger
2024-10-16  3:29   ` Reinette Chatre
2024-10-17 23:11     ` Moger, Babu
2024-10-18 16:06       ` Reinette Chatre
2024-10-09 17:39 ` [PATCH v8 19/25] x86/resctrl: Auto assign/unassign counters when mbm_cntr_assign is enabled Babu Moger
2024-10-11 17:17   ` Tony Luck
2024-10-11 21:17     ` Moger, Babu
2024-10-11 21:33       ` Luck, Tony
2024-10-14 15:43         ` Moger, Babu
2024-10-14 16:18           ` Luck, Tony
2024-10-14 16:35             ` Moger, Babu
2024-10-15  2:39               ` Reinette Chatre
2024-10-15 15:43                 ` Moger, Babu
2024-10-15 16:57                   ` Luck, Tony
2024-10-15 17:18                   ` Reinette Chatre
2024-10-15 20:42                     ` Moger, Babu
2024-10-16  3:30   ` Reinette Chatre
2024-10-18 14:22     ` Moger, Babu
2024-10-09 17:39 ` [PATCH v8 20/25] x86/resctrl: Report "Unassigned" for MBM events in mbm_cntr_assign mode Babu Moger
2024-10-11 17:23   ` Tony Luck
2024-10-11 21:21     ` Moger, Babu
2024-10-16  3:31   ` Reinette Chatre
2024-10-18 14:31     ` Moger, Babu
2024-10-09 17:39 ` [PATCH v8 21/25] x86/resctrl: Introduce the interface to switch between monitor modes Babu Moger
2024-10-16  3:36   ` Reinette Chatre
2024-10-18 15:13     ` Moger, Babu
2024-10-09 17:39 ` [PATCH v8 22/25] x86/resctrl: Configure mbm_cntr_assign mode if supported Babu Moger
2024-10-09 17:39 ` [PATCH v8 23/25] x86/resctrl: Update assignments on event configuration changes Babu Moger
2024-10-16  3:40   ` Reinette Chatre
2024-10-18 15:50     ` Moger, Babu
2024-10-09 17:39 ` [PATCH v8 24/25] x86/resctrl: Introduce interface to list assignment states of all the groups Babu Moger
2024-10-16  3:40   ` Reinette Chatre
2024-10-21 14:56     ` Moger, Babu
2024-10-09 17:39 ` [PATCH v8 25/25] x86/resctrl: Introduce interface to modify assignment states of " Babu Moger
2024-10-16  3:43   ` Reinette Chatre
2024-10-21 17:04     ` Moger, Babu
2024-10-21 17:20       ` Reinette Chatre
2024-10-22  1:12         ` Moger, Babu
2024-10-16  3:05 ` [PATCH v8 00/25] x86/resctrl : Support AMD Assignable Bandwidth Monitoring Counters (ABMC) Reinette Chatre
2024-10-21 17:09   ` Moger, Babu

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=86c8fd4db89f264b1382cd22d7cf53c4510bf07a.1728495588.git.babu.moger@amd.com \
    --to=babu.moger@amd.com \
    --cc=bp@alien8.de \
    --cc=corbet@lwn.net \
    --cc=daniel.sneddon@linux.intel.com \
    --cc=dave.hansen@linux.intel.com \
    --cc=eranian@google.com \
    --cc=fenghua.yu@intel.com \
    --cc=hpa@zytor.com \
    --cc=ilpo.jarvinen@linux.intel.com \
    --cc=james.morse@arm.com \
    --cc=jithu.joseph@intel.com \
    --cc=jmattson@google.com \
    --cc=jpoimboe@kernel.org \
    --cc=kai.huang@intel.com \
    --cc=kan.liang@linux.intel.com \
    --cc=kim.phillips@amd.com \
    --cc=kirill.shutemov@linux.intel.com \
    --cc=leitao@debian.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lukas.bulwahn@gmail.com \
    --cc=maciej.wieczor-retman@intel.com \
    --cc=mingo@redhat.com \
    --cc=paulmck@kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=peternewman@google.com \
    --cc=peterz@infradead.org \
    --cc=rdunlap@infradead.org \
    --cc=reinette.chatre@intel.com \
    --cc=rick.p.edgecombe@intel.com \
    --cc=sandipan.das@amd.com \
    --cc=seanjc@google.com \
    --cc=tglx@linutronix.de \
    --cc=tj@kernel.org \
    --cc=x86@kernel.org \
    --cc=yanjiewtw@gmail.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®