From: Babu Moger <babu.moger@amd.com>
To: <corbet@lwn.net>, <reinette.chatre@intel.com>,
<tglx@linutronix.de>, <mingo@redhat.com>, <bp@alien8.de>
Cc: <fenghua.yu@intel.com>, <dave.hansen@linux.intel.com>,
<x86@kernel.org>, <hpa@zytor.com>, <paulmck@kernel.org>,
<akpm@linux-foundation.org>, <quic_neeraju@quicinc.com>,
<rdunlap@infradead.org>, <damien.lemoal@opensource.wdc.com>,
<songmuchun@bytedance.com>, <peterz@infradead.org>,
<jpoimboe@kernel.org>, <pbonzini@redhat.com>,
<babu.moger@amd.com>, <chang.seok.bae@intel.com>,
<pawan.kumar.gupta@linux.intel.com>, <jmattson@google.com>,
<daniel.sneddon@linux.intel.com>, <sandipan.das@amd.com>,
<tony.luck@intel.com>, <james.morse@arm.com>,
<linux-doc@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<bagasdotme@gmail.com>, <eranian@google.com>
Subject: [PATCH v4 08/13] x86/resctrl : Introduce data structure to support monitor configuration
Date: Wed, 7 Sep 2022 13:00:55 -0500 [thread overview]
Message-ID: <166257365519.1043018.5600209070890797172.stgit@bmoger-ubuntu> (raw)
In-Reply-To: <166257348081.1043018.11227924488792315932.stgit@bmoger-ubuntu>
Add couple of fields in mon_evt to support Bandwidth Monitoring Event
Configuratio (BMEC) and also update the "mon_features".
The sysfs file "mon_features" will display the monitor configuration if
supported.
Before the change.
$cat /sys/fs/resctrl/info/L3_MON/mon_features
llc_occupancy
mbm_total_bytes
mbm_local_bytes
After the change if BMEC is supported.
$cat /sys/fs/resctrl/info/L3_MON/mon_features
llc_occupancy
mbm_total_bytes
mbm_total_config
mbm_local_bytes
mbm_local_config
Signed-off-by: Babu Moger <babu.moger@amd.com>
---
arch/x86/kernel/cpu/resctrl/core.c | 3 ++-
arch/x86/kernel/cpu/resctrl/internal.h | 6 +++++-
arch/x86/kernel/cpu/resctrl/monitor.c | 9 ++++++++-
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 5 ++++-
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c
index 56c96607259c..513e6a00f58e 100644
--- a/arch/x86/kernel/cpu/resctrl/core.c
+++ b/arch/x86/kernel/cpu/resctrl/core.c
@@ -849,6 +849,7 @@ static __init bool get_rdt_alloc_resources(void)
static __init bool get_rdt_mon_resources(void)
{
struct rdt_resource *r = &rdt_resources_all[RDT_RESOURCE_L3].r_resctrl;
+ bool mon_configurable = rdt_cpu_has(X86_FEATURE_BMEC);
if (rdt_cpu_has(X86_FEATURE_CQM_OCCUP_LLC))
rdt_mon_features |= (1 << QOS_L3_OCCUP_EVENT_ID);
@@ -860,7 +861,7 @@ static __init bool get_rdt_mon_resources(void)
if (!rdt_mon_features)
return false;
- return !rdt_get_mon_l3_config(r);
+ return !rdt_get_mon_l3_config(r, mon_configurable);
}
static __init void __check_quirks_intel(void)
diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
index c049a274383c..45923eb4022f 100644
--- a/arch/x86/kernel/cpu/resctrl/internal.h
+++ b/arch/x86/kernel/cpu/resctrl/internal.h
@@ -72,11 +72,15 @@ DECLARE_STATIC_KEY_FALSE(rdt_mon_enable_key);
* struct mon_evt - Entry in the event list of a resource
* @evtid: event id
* @name: name of the event
+ * @configurable: true if the event is configurable
+ * @config_name: sysfs file name of the event if configurable
* @list: entry in &rdt_resource->evt_list
*/
struct mon_evt {
u32 evtid;
char *name;
+ bool configurable;
+ char *config_name;
struct list_head list;
};
@@ -529,7 +533,7 @@ int closids_supported(void);
void closid_free(int closid);
int alloc_rmid(void);
void free_rmid(u32 rmid);
-int rdt_get_mon_l3_config(struct rdt_resource *r);
+int rdt_get_mon_l3_config(struct rdt_resource *r, bool configurable);
void mon_event_count(void *info);
int rdtgroup_mondata_show(struct seq_file *m, void *arg);
void rmdir_mondata_subdir_allrdtgrp(struct rdt_resource *r,
diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c
index eaf25a234ff5..dc97aa7a3b3d 100644
--- a/arch/x86/kernel/cpu/resctrl/monitor.c
+++ b/arch/x86/kernel/cpu/resctrl/monitor.c
@@ -656,11 +656,13 @@ static struct mon_evt llc_occupancy_event = {
static struct mon_evt mbm_total_event = {
.name = "mbm_total_bytes",
.evtid = QOS_L3_MBM_TOTAL_EVENT_ID,
+ .config_name = "mbm_total_config",
};
static struct mon_evt mbm_local_event = {
.name = "mbm_local_bytes",
.evtid = QOS_L3_MBM_LOCAL_EVENT_ID,
+ .config_name = "mbm_local_config",
};
/*
@@ -682,7 +684,7 @@ static void l3_mon_evt_init(struct rdt_resource *r)
list_add_tail(&mbm_local_event.list, &r->evt_list);
}
-int rdt_get_mon_l3_config(struct rdt_resource *r)
+int rdt_get_mon_l3_config(struct rdt_resource *r, bool configurable)
{
unsigned int mbm_offset = boot_cpu_data.x86_cache_mbm_width_offset;
struct rdt_hw_resource *hw_res = resctrl_to_arch_res(r);
@@ -714,6 +716,11 @@ int rdt_get_mon_l3_config(struct rdt_resource *r)
if (ret)
return ret;
+ if (configurable) {
+ mbm_total_event.configurable = true;
+ mbm_local_event.configurable = true;
+ }
+
l3_mon_evt_init(r);
r->mon_capable = true;
diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
index fc5286067201..f55a693fa958 100644
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -1001,8 +1001,11 @@ static int rdt_mon_features_show(struct kernfs_open_file *of,
struct rdt_resource *r = of->kn->parent->priv;
struct mon_evt *mevt;
- list_for_each_entry(mevt, &r->evt_list, list)
+ list_for_each_entry(mevt, &r->evt_list, list) {
seq_printf(seq, "%s\n", mevt->name);
+ if (mevt->configurable)
+ seq_printf(seq, "%s\n", mevt->config_name);
+ }
return 0;
}
next prev parent reply other threads:[~2022-09-07 18:02 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-07 17:59 [PATCH v4 00/13] x86/resctrl: Support for AMD QoS new features and bug fix Babu Moger
2022-09-07 17:59 ` [PATCH v4 01/13] x86/resctrl: Fix min_cbm_bits for AMD Babu Moger
2022-09-09 17:00 ` James Morse
2022-09-12 14:54 ` Moger, Babu
2022-09-16 15:52 ` Reinette Chatre
2022-09-16 18:28 ` Moger, Babu
2022-09-16 15:53 ` Reinette Chatre
2022-09-16 18:31 ` Moger, Babu
2022-09-07 18:00 ` [PATCH v4 02/13] x86/resctrl: Remove arch_has_empty_bitmaps Babu Moger
2022-09-16 15:53 ` Reinette Chatre
2022-09-16 19:00 ` Moger, Babu
2022-09-07 18:00 ` [PATCH v4 03/13] x86/cpufeatures: Add Slow Memory Bandwidth Allocation feature flag Babu Moger
2022-09-16 15:54 ` Reinette Chatre
2022-09-16 19:02 ` Moger, Babu
2022-09-07 18:00 ` [PATCH v4 04/13] x86/resctrl: Add a new resource type RDT_RESOURCE_SMBA Babu Moger
2022-09-16 15:54 ` Reinette Chatre
2022-09-16 19:11 ` Moger, Babu
2022-09-07 18:00 ` [PATCH v4 05/13] x86/cpufeatures: Add Bandwidth Monitoring Event Configuration feature flag Babu Moger
2022-09-07 18:36 ` Daniel Sneddon
2022-09-07 19:59 ` Moger, Babu
2022-09-16 15:55 ` Reinette Chatre
2022-09-16 20:19 ` Moger, Babu
2022-09-07 18:00 ` [PATCH v4 06/13] x86/resctrl: Include new features in command line options Babu Moger
2022-09-16 15:55 ` Reinette Chatre
2022-09-16 20:22 ` Moger, Babu
2022-09-07 18:00 ` [PATCH v4 07/13] x86/resctrl: Detect and configure Slow Memory Bandwidth allocation Babu Moger
2022-09-07 18:00 ` Babu Moger [this message]
2022-09-16 15:56 ` [PATCH v4 08/13] x86/resctrl : Introduce data structure to support monitor configuration Reinette Chatre
2022-09-16 21:23 ` Moger, Babu
2022-09-07 18:01 ` [PATCH v4 09/13] x86/resctrl: Add sysfs interface files to read/write event configuration Babu Moger
2022-09-16 15:58 ` Reinette Chatre
2022-09-19 15:46 ` Moger, Babu
2022-09-19 16:42 ` Reinette Chatre
2022-09-19 20:26 ` Moger, Babu
2022-09-19 21:07 ` Reinette Chatre
2022-09-20 17:09 ` Moger, Babu
2022-09-07 18:01 ` [PATCH v4 10/13] x86/resctrl: Add the sysfs interface to read the " Babu Moger
2022-09-16 15:59 ` Reinette Chatre
2022-09-19 16:07 ` Moger, Babu
2022-09-07 18:01 ` [PATCH v4 11/13] x86/resctrl: Add sysfs interface to write " Babu Moger
2022-09-16 16:17 ` Reinette Chatre
2022-09-19 16:50 ` Moger, Babu
2022-09-07 18:01 ` [PATCH v4 12/13] x86/resctrl: Replace smp_call_function_many with on_each_cpu_mask Babu Moger
2022-09-16 16:17 ` Reinette Chatre
2022-09-16 20:38 ` Moger, Babu
2022-09-07 18:01 ` [PATCH v4 13/13] Documentation/x86: Update resctrl_ui.rst for new features Babu Moger
2022-09-08 4:07 ` Bagas Sanjaya
2022-09-08 9:26 ` Bagas Sanjaya
2022-09-08 13:40 ` 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=166257365519.1043018.5600209070890797172.stgit@bmoger-ubuntu \
--to=babu.moger@amd.com \
--cc=akpm@linux-foundation.org \
--cc=bagasdotme@gmail.com \
--cc=bp@alien8.de \
--cc=chang.seok.bae@intel.com \
--cc=corbet@lwn.net \
--cc=damien.lemoal@opensource.wdc.com \
--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=james.morse@arm.com \
--cc=jmattson@google.com \
--cc=jpoimboe@kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=paulmck@kernel.org \
--cc=pawan.kumar.gupta@linux.intel.com \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=quic_neeraju@quicinc.com \
--cc=rdunlap@infradead.org \
--cc=reinette.chatre@intel.com \
--cc=sandipan.das@amd.com \
--cc=songmuchun@bytedance.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@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;
as well as URLs for NNTP newsgroup(s).