From: James Morse <james.morse@arm.com>
To: x86@kernel.org, linux-kernel@vger.kernel.org
Cc: Fenghua Yu <fenghua.yu@intel.com>,
Reinette Chatre <reinette.chatre@intel.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
H Peter Anvin <hpa@zytor.com>, Babu Moger <Babu.Moger@amd.com>,
James Morse <james.morse@arm.com>,
shameerali.kolothum.thodi@huawei.com,
D Scott Phillips OS <scott@os.amperecomputing.com>,
lcherian@marvell.com, bobo.shaobowang@huawei.com,
tan.shaopeng@fujitsu.com, Jamie Iles <quic_jiles@quicinc.com>,
Cristian Marussi <cristian.marussi@arm.com>,
Xin Hao <xhao@linux.alibaba.com>,
xingxin.hx@openanolis.org, baolin.wang@linux.alibaba.com
Subject: [PATCH v4 02/21] x86/resctrl: Merge mon_capable and mon_enabled
Date: Tue, 12 Apr 2022 12:44:00 +0000 [thread overview]
Message-ID: <20220412124419.30689-3-james.morse@arm.com> (raw)
In-Reply-To: <20220412124419.30689-1-james.morse@arm.com>
mon_enabled and mon_capable are always set as a pair by
rdt_get_mon_l3_config().
There is no point having two values.
Merge them together.
Reviewed-by: Jamie Iles <quic_jiles@quicinc.com>
Tested-by: Xin Hao <xhao@linux.alibaba.com>
Reviewed-by: Shaopeng Tan <tan.shaopeng@fujitsu.com>
Tested-by: Shaopeng Tan <tan.shaopeng@fujitsu.com>
Tested-by: Cristian Marussi <cristian.marussi@arm.com>
Signed-off-by: James Morse <james.morse@arm.com>
---
Changes since v1:
* Removed stray cdp_capable changes.
---
arch/x86/kernel/cpu/resctrl/internal.h | 4 ----
arch/x86/kernel/cpu/resctrl/monitor.c | 1 -
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 8 ++++----
include/linux/resctrl.h | 2 --
4 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
index 53f3d275a98f..8828b5c1b6d2 100644
--- a/arch/x86/kernel/cpu/resctrl/internal.h
+++ b/arch/x86/kernel/cpu/resctrl/internal.h
@@ -459,10 +459,6 @@ int resctrl_arch_set_cdp_enabled(enum resctrl_res_level l, bool enable);
for_each_rdt_resource(r) \
if (r->mon_capable)
-#define for_each_mon_enabled_rdt_resource(r) \
- for_each_rdt_resource(r) \
- if (r->mon_enabled)
-
/* CPUID.(EAX=10H, ECX=ResID=1).EAX */
union cpuid_0x10_1_eax {
struct {
diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c
index eaf25a234ff5..497cadf3285d 100644
--- a/arch/x86/kernel/cpu/resctrl/monitor.c
+++ b/arch/x86/kernel/cpu/resctrl/monitor.c
@@ -717,7 +717,6 @@ int rdt_get_mon_l3_config(struct rdt_resource *r)
l3_mon_evt_init(r);
r->mon_capable = true;
- r->mon_enabled = true;
return 0;
}
diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
index d15c49f77c8c..651ff5288e85 100644
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -1765,7 +1765,7 @@ static int rdtgroup_create_info_dir(struct kernfs_node *parent_kn)
goto out_destroy;
}
- for_each_mon_enabled_rdt_resource(r) {
+ for_each_mon_capable_rdt_resource(r) {
fflags = r->fflags | RF_MON_INFO;
sprintf(name, "%s_MON", r->name);
ret = rdtgroup_mkdir_info_resdir(r, name, fflags);
@@ -2504,7 +2504,7 @@ void rmdir_mondata_subdir_allrdtgrp(struct rdt_resource *r, unsigned int dom_id)
struct rdtgroup *prgrp, *crgrp;
char name[32];
- if (!r->mon_enabled)
+ if (!r->mon_capable)
return;
list_for_each_entry(prgrp, &rdt_all_groups, rdtgroup_list) {
@@ -2572,7 +2572,7 @@ void mkdir_mondata_subdir_allrdtgrp(struct rdt_resource *r,
struct rdtgroup *prgrp, *crgrp;
struct list_head *head;
- if (!r->mon_enabled)
+ if (!r->mon_capable)
return;
list_for_each_entry(prgrp, &rdt_all_groups, rdtgroup_list) {
@@ -2642,7 +2642,7 @@ static int mkdir_mondata_all(struct kernfs_node *parent_kn,
* Create the subdirectories for each domain. Note that all events
* in a domain like L3 are grouped into a resource whose domain is L3
*/
- for_each_mon_enabled_rdt_resource(r) {
+ for_each_mon_capable_rdt_resource(r) {
ret = mkdir_mondata_subdir_alldom(kn, r, prgrp);
if (ret)
goto out_destroy;
diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h
index 386ab3a41500..8180c539800d 100644
--- a/include/linux/resctrl.h
+++ b/include/linux/resctrl.h
@@ -130,7 +130,6 @@ struct resctrl_schema;
/**
* struct rdt_resource - attributes of a resctrl resource
* @rid: The index of the resource
- * @mon_enabled: Is monitoring enabled for this feature
* @alloc_capable: Is allocation available on this machine
* @mon_capable: Is monitor feature available on this machine
* @num_rmid: Number of RMIDs available
@@ -149,7 +148,6 @@ struct resctrl_schema;
*/
struct rdt_resource {
int rid;
- bool mon_enabled;
bool alloc_capable;
bool mon_capable;
int num_rmid;
--
2.30.2
next prev parent reply other threads:[~2022-04-12 13:06 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-12 12:43 [PATCH v4 00/21] x86/resctrl: Make resctrl_arch_rmid_read() return values in bytes James Morse
2022-04-12 12:43 ` [PATCH v4 01/21] x86/resctrl: Kill off alloc_enabled James Morse
2022-04-12 12:44 ` James Morse [this message]
2022-04-12 12:44 ` [PATCH v4 03/21] x86/resctrl: Add domain online callback for resctrl work James Morse
[not found] ` <3acfb11b-eba2-3eb0-94d1-d24a24d03d1f@linux.alibaba.com>
2022-05-03 7:59 ` Xin Hao
2022-04-12 12:44 ` [PATCH v4 04/21] x86/resctrl: Group struct rdt_hw_domain cleanup James Morse
2022-04-12 12:44 ` [PATCH v4 05/21] x86/resctrl: Add domain offline callback for resctrl work James Morse
2022-04-12 12:44 ` [PATCH v4 06/21] x86/resctrl: Remove set_mba_sc()s control array re-initialisation James Morse
2022-04-12 12:44 ` [PATCH v4 07/21] x86/resctrl: Create mba_sc configuration in the rdt_domain James Morse
2022-05-17 16:18 ` Reinette Chatre
2022-06-07 12:07 ` James Morse
2022-05-18 16:06 ` Reinette Chatre
2022-04-12 12:44 ` [PATCH v4 08/21] x86/resctrl: Switch over to the resctrl mbps_val list James Morse
2022-05-17 16:19 ` Reinette Chatre
2022-06-07 12:07 ` James Morse
2022-04-12 12:44 ` [PATCH v4 09/21] x86/resctrl: Remove architecture copy of mbps_val James Morse
2022-04-12 12:44 ` [PATCH v4 10/21] x86/resctrl: Abstract and use supports_mba_mbps() James Morse
2022-04-12 12:44 ` [PATCH v4 11/21] x86/resctrl: Allow update_mba_bw() to update controls directly James Morse
2022-04-12 12:44 ` [PATCH v4 12/21] x86/resctrl: Calculate bandwidth from the previous __mon_event_count() chunks James Morse
2022-04-12 12:44 ` [PATCH v4 13/21] x86/resctrl: Add per-rmid arch private storage for overflow and chunks James Morse
2022-05-18 16:06 ` Reinette Chatre
2022-04-12 12:44 ` [PATCH v4 14/21] x86/resctrl: Allow per-rmid arch private storage to be reset James Morse
2022-04-12 12:44 ` [PATCH v4 15/21] x86/resctrl: Abstract __rmid_read() James Morse
2022-05-17 21:23 ` Reinette Chatre
2022-06-07 12:07 ` James Morse
2022-06-07 15:51 ` Reinette Chatre
2022-06-07 20:44 ` Fenghua Yu
2022-06-07 21:25 ` Fenghua Yu
2022-04-12 12:44 ` [PATCH v4 16/21] x86/resctrl: Pass the required parameters into resctrl_arch_rmid_read() James Morse
2022-06-07 21:07 ` Fenghua Yu
2022-06-22 15:16 ` James Morse
2022-04-12 12:44 ` [PATCH v4 17/21] x86/resctrl: Move mbm_overflow_count() " James Morse
2022-04-12 12:44 ` [PATCH v4 18/21] x86/resctrl: Move get_corrected_mbm_count() " James Morse
2022-04-12 12:44 ` [PATCH v4 19/21] x86/resctrl: Rename and change the units of resctrl_cqm_threshold James Morse
2022-05-17 21:23 ` Reinette Chatre
2022-06-07 22:08 ` Fenghua Yu
2022-06-22 15:16 ` James Morse
2022-04-12 12:44 ` [PATCH v4 20/21] x86/resctrl: Add resctrl_rmid_realloc_limit to abstract x86's boot_cpu_data James Morse
2022-04-12 12:44 ` [PATCH v4 21/21] x86/resctrl: Make resctrl_arch_rmid_read() return values in bytes James Morse
2022-04-18 8:09 ` [PATCH v4 00/21] " tan.shaopeng
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=20220412124419.30689-3-james.morse@arm.com \
--to=james.morse@arm.com \
--cc=Babu.Moger@amd.com \
--cc=baolin.wang@linux.alibaba.com \
--cc=bobo.shaobowang@huawei.com \
--cc=bp@alien8.de \
--cc=cristian.marussi@arm.com \
--cc=fenghua.yu@intel.com \
--cc=hpa@zytor.com \
--cc=lcherian@marvell.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=quic_jiles@quicinc.com \
--cc=reinette.chatre@intel.com \
--cc=scott@os.amperecomputing.com \
--cc=shameerali.kolothum.thodi@huawei.com \
--cc=tan.shaopeng@fujitsu.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=xhao@linux.alibaba.com \
--cc=xingxin.hx@openanolis.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).