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 09/21] x86/resctrl: Remove architecture copy of mbps_val
Date: Tue, 12 Apr 2022 12:44:07 +0000 [thread overview]
Message-ID: <20220412124419.30689-10-james.morse@arm.com> (raw)
In-Reply-To: <20220412124419.30689-1-james.morse@arm.com>
The resctrl arch code provides a second configuration array mbps_val[]
for the MBA software controller.
Since resctrl switched over to allocating and freeing its own array
when needed, nothing uses the arch code version.
Remove it.
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 v2:
* Made setup_default_ctrlval() static.
Changes since v1:
* Fixed spelling mistake
* Capitalisation
---
arch/x86/kernel/cpu/resctrl/core.c | 20 ++++----------------
arch/x86/kernel/cpu/resctrl/internal.h | 3 ---
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 4 +---
3 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c
index f69182973175..f0e2820af475 100644
--- a/arch/x86/kernel/cpu/resctrl/core.c
+++ b/arch/x86/kernel/cpu/resctrl/core.c
@@ -397,7 +397,7 @@ struct rdt_domain *rdt_find_domain(struct rdt_resource *r, int id,
return NULL;
}
-void setup_default_ctrlval(struct rdt_resource *r, u32 *dc, u32 *dm)
+static void setup_default_ctrlval(struct rdt_resource *r, u32 *dc)
{
struct rdt_hw_resource *hw_res = resctrl_to_arch_res(r);
int i;
@@ -406,18 +406,14 @@ void setup_default_ctrlval(struct rdt_resource *r, u32 *dc, u32 *dm)
* Initialize the Control MSRs to having no control.
* For Cache Allocation: Set all bits in cbm
* For Memory Allocation: Set b/w requested to 100%
- * and the bandwidth in MBps to U32_MAX
*/
- for (i = 0; i < hw_res->num_closid; i++, dc++, dm++) {
+ for (i = 0; i < hw_res->num_closid; i++, dc++)
*dc = r->default_ctrl;
- *dm = MBA_MAX_MBPS;
- }
}
static void domain_free(struct rdt_hw_domain *hw_dom)
{
kfree(hw_dom->ctrl_val);
- kfree(hw_dom->mbps_val);
kfree(hw_dom);
}
@@ -426,23 +422,15 @@ static int domain_setup_ctrlval(struct rdt_resource *r, struct rdt_domain *d)
struct rdt_hw_resource *hw_res = resctrl_to_arch_res(r);
struct rdt_hw_domain *hw_dom = resctrl_to_arch_dom(d);
struct msr_param m;
- u32 *dc, *dm;
+ u32 *dc;
dc = kmalloc_array(hw_res->num_closid, sizeof(*hw_dom->ctrl_val),
GFP_KERNEL);
if (!dc)
return -ENOMEM;
- dm = kmalloc_array(hw_res->num_closid, sizeof(*hw_dom->mbps_val),
- GFP_KERNEL);
- if (!dm) {
- kfree(dc);
- return -ENOMEM;
- }
-
hw_dom->ctrl_val = dc;
- hw_dom->mbps_val = dm;
- setup_default_ctrlval(r, dc, dm);
+ setup_default_ctrlval(r, dc);
m.low = 0;
m.high = hw_res->num_closid;
diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
index a7e2cbce29d5..373aaba53ecd 100644
--- a/arch/x86/kernel/cpu/resctrl/internal.h
+++ b/arch/x86/kernel/cpu/resctrl/internal.h
@@ -308,14 +308,12 @@ struct mbm_state {
* a resource
* @d_resctrl: Properties exposed to the resctrl file system
* @ctrl_val: array of cache or mem ctrl values (indexed by CLOSID)
- * @mbps_val: When mba_sc is enabled, this holds the bandwidth in MBps
*
* Members of this structure are accessed via helpers that provide abstraction.
*/
struct rdt_hw_domain {
struct rdt_domain d_resctrl;
u32 *ctrl_val;
- u32 *mbps_val;
};
static inline struct rdt_hw_domain *resctrl_to_arch_dom(struct rdt_domain *r)
@@ -529,7 +527,6 @@ void mbm_setup_overflow_handler(struct rdt_domain *dom,
void mbm_handle_overflow(struct work_struct *work);
void __init intel_rdt_mbm_apply_quirk(void);
bool is_mba_sc(struct rdt_resource *r);
-void setup_default_ctrlval(struct rdt_resource *r, u32 *dc, u32 *dm);
u32 delay_bw_map(unsigned long bw, struct rdt_resource *r);
void cqm_setup_limbo_handler(struct rdt_domain *dom, unsigned long delay_ms);
void cqm_handle_limbo(struct work_struct *work);
diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
index 07904308245c..441c1b7981c2 100644
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -2353,10 +2353,8 @@ static int reset_all_ctrls(struct rdt_resource *r)
hw_dom = resctrl_to_arch_dom(d);
cpumask_set_cpu(cpumask_any(&d->cpu_mask), cpu_mask);
- for (i = 0; i < hw_res->num_closid; i++) {
+ for (i = 0; i < hw_res->num_closid; i++)
hw_dom->ctrl_val[i] = r->default_ctrl;
- hw_dom->mbps_val[i] = MBA_MAX_MBPS;
- }
}
cpu = get_cpu();
/* Update CBM on this cpu if it's in cpu_mask. */
--
2.30.2
next prev parent reply other threads:[~2022-04-12 13:04 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 ` [PATCH v4 02/21] x86/resctrl: Merge mon_capable and mon_enabled James Morse
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 ` James Morse [this message]
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-10-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).