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 17/21] x86/resctrl: Move mbm_overflow_count() into resctrl_arch_rmid_read()
Date: Tue, 12 Apr 2022 12:44:15 +0000 [thread overview]
Message-ID: <20220412124419.30689-18-james.morse@arm.com> (raw)
In-Reply-To: <20220412124419.30689-1-james.morse@arm.com>
resctrl_arch_rmid_read() is intended as the function that an
architecture agnostic resctrl filesystem driver can use to
read a value in bytes from a counter. Currently the function returns
the MBM values in chunks directly from hardware. When reading a bandwidth
counter, mbm_overflow_count() must be used to correct for any possible
overflow.
mbm_overflow_count() is architecture specific, its behaviour should
be part of resctrl_arch_rmid_read().
Move the mbm_overflow_count() calls into resctrl_arch_rmid_read().
This allows the resctrl filesystems's prev_msr to be removed in
favour of the architecture private version.
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>
---
arch/x86/kernel/cpu/resctrl/internal.h | 2 --
arch/x86/kernel/cpu/resctrl/monitor.c | 35 +++++++++++++++-----------
2 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
index 1d2e7bd6305f..8039e8aba7de 100644
--- a/arch/x86/kernel/cpu/resctrl/internal.h
+++ b/arch/x86/kernel/cpu/resctrl/internal.h
@@ -281,7 +281,6 @@ struct rftype {
/**
* struct mbm_state - status for each MBM counter in each domain
* @chunks: Total data moved (multiply by rdt_group.mon_scale to get bytes)
- * @prev_msr: Value of IA32_QM_CTR for this RMID last time we read it
* @prev_bw_chunks: Previous chunks value read for bandwidth calculation
* @prev_bw: The most recent bandwidth in MBps
* @delta_bw: Difference between the current and previous bandwidth
@@ -289,7 +288,6 @@ struct rftype {
*/
struct mbm_state {
u64 chunks;
- u64 prev_msr;
u64 prev_bw_chunks;
u32 prev_bw;
u32 delta_bw;
diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c
index 81cc7587b598..e727a795388b 100644
--- a/arch/x86/kernel/cpu/resctrl/monitor.c
+++ b/arch/x86/kernel/cpu/resctrl/monitor.c
@@ -167,9 +167,20 @@ void resctrl_arch_reset_rmid(struct rdt_resource *r, struct rdt_domain *d,
memset(am, 0, sizeof(*am));
}
+static u64 mbm_overflow_count(u64 prev_msr, u64 cur_msr, unsigned int width)
+{
+ u64 shift = 64 - width, chunks;
+
+ chunks = (cur_msr << shift) - (prev_msr << shift);
+ return chunks >> shift;
+}
+
int resctrl_arch_rmid_read(struct rdt_resource *r, struct rdt_domain *d,
u32 rmid, enum resctrl_event_id eventid, u64 *val)
{
+ struct rdt_hw_resource *hw_res = resctrl_to_arch_res(r);
+ struct rdt_hw_domain *hw_dom = resctrl_to_arch_dom(d);
+ struct arch_mbm_state *am;
u64 msr_val;
if (!cpumask_test_cpu(smp_processor_id(), &d->cpu_mask))
@@ -191,7 +202,13 @@ int resctrl_arch_rmid_read(struct rdt_resource *r, struct rdt_domain *d,
if (msr_val & RMID_VAL_UNAVAIL)
return -EINVAL;
- *val = msr_val;
+ am = get_arch_mbm_state(hw_dom, rmid, eventid);
+ if (am) {
+ *val = mbm_overflow_count(am->prev_msr, msr_val, hw_res->mbm_width);
+ am->prev_msr = msr_val;
+ } else {
+ *val = msr_val;
+ }
return 0;
}
@@ -322,19 +339,10 @@ void free_rmid(u32 rmid)
list_add_tail(&entry->list, &rmid_free_lru);
}
-static u64 mbm_overflow_count(u64 prev_msr, u64 cur_msr, unsigned int width)
-{
- u64 shift = 64 - width, chunks;
-
- chunks = (cur_msr << shift) - (prev_msr << shift);
- return chunks >> shift;
-}
-
static int __mon_event_count(u32 rmid, struct rmid_read *rr)
{
- struct rdt_hw_resource *hw_res = resctrl_to_arch_res(rr->r);
struct mbm_state *m;
- u64 chunks, tval = 0;
+ u64 tval = 0;
if (rr->first)
resctrl_arch_reset_rmid(rr->r, rr->d, rmid, rr->evtid);
@@ -363,13 +371,10 @@ static int __mon_event_count(u32 rmid, struct rmid_read *rr)
if (rr->first) {
memset(m, 0, sizeof(struct mbm_state));
- m->prev_msr = tval;
return 0;
}
- chunks = mbm_overflow_count(m->prev_msr, tval, hw_res->mbm_width);
- m->chunks += chunks;
- m->prev_msr = tval;
+ m->chunks += tval;
rr->val += get_corrected_mbm_count(rmid, m->chunks);
--
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 ` [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 ` [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 ` James Morse [this message]
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-18-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).