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>
Subject: [PATCH 01/10] x86/resctrl: Nothing uses struct mbm_state chunks_bw
Date: Fri, 14 Feb 2020 18:23:52 +0000 [thread overview]
Message-ID: <20200214182401.39008-2-james.morse@arm.com> (raw)
In-Reply-To: <20200214182401.39008-1-james.morse@arm.com>
Nothing reads struct mbm_states's chunks_bw value, its a copy of
chunks. Remove it.
Signed-off-by: James Morse <james.morse@arm.com>
---
arch/x86/kernel/cpu/resctrl/internal.h | 2 --
arch/x86/kernel/cpu/resctrl/monitor.c | 3 +--
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
index 181c992f448c..90ca6a090c77 100644
--- a/arch/x86/kernel/cpu/resctrl/internal.h
+++ b/arch/x86/kernel/cpu/resctrl/internal.h
@@ -275,7 +275,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
- * @chunks_bw Total local data moved. Used for bandwidth calculation
* @prev_bw_msr:Value of previous IA32_QM_CTR for bandwidth counting
* @prev_bw The most recent bandwidth in MBps
* @delta_bw Difference between the current and previous bandwidth
@@ -284,7 +283,6 @@ struct rftype {
struct mbm_state {
u64 chunks;
u64 prev_msr;
- u64 chunks_bw;
u64 prev_bw_msr;
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 773124b0e18a..af549df38ec6 100644
--- a/arch/x86/kernel/cpu/resctrl/monitor.c
+++ b/arch/x86/kernel/cpu/resctrl/monitor.c
@@ -279,8 +279,7 @@ static void mbm_bw_count(u32 rmid, struct rmid_read *rr)
return;
chunks = mbm_overflow_count(m->prev_bw_msr, tval);
- m->chunks_bw += chunks;
- m->chunks = m->chunks_bw;
+ m->chunks += chunks;
cur_bw = (chunks * r->mon_scale) >> 20;
if (m->delta_comp)
--
2.24.1
next prev parent reply other threads:[~2020-02-14 18:25 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-14 18:23 [PATCH 00/10] x86/resctrl: Misc cleanup James Morse
2020-02-14 18:23 ` James Morse [this message]
2020-03-16 18:09 ` [PATCH 01/10] x86/resctrl: Nothing uses struct mbm_state chunks_bw Reinette Chatre
2020-02-14 18:23 ` [PATCH 02/10] x86/resctrl: Remove max_delay James Morse
2020-03-16 18:11 ` Reinette Chatre
2020-02-14 18:23 ` [PATCH 03/10] x86/resctrl: Fix stale comment James Morse
2020-03-16 18:12 ` Reinette Chatre
2020-02-14 18:23 ` [PATCH 04/10] x86/resctrl: use container_of() in delayed_work handlers James Morse
2020-03-16 18:13 ` Reinette Chatre
2020-02-14 18:23 ` [PATCH 05/10] x86/resctrl: Include pid.h James Morse
2020-03-16 18:13 ` Reinette Chatre
2020-02-14 18:23 ` [PATCH 06/10] x86/resctrl: Use is_closid_match() in more places James Morse
2020-03-16 18:15 ` Reinette Chatre
2020-02-14 18:23 ` [PATCH 07/10] x86/resctrl: Add arch_needs_linear to explain AMD/Intel MBA difference James Morse
2020-03-16 18:37 ` Reinette Chatre
2020-02-14 18:23 ` [PATCH 08/10] x86/resctrl: Merge AMD/Intel parse_bw() calls James Morse
2020-03-16 18:42 ` Reinette Chatre
2020-02-14 18:24 ` [PATCH 09/10] x86/resctrl: Add arch_has_sparse_bitmaps to explain AMD/Intel CAT difference James Morse
2020-03-16 18:58 ` Reinette Chatre
2020-02-14 18:24 ` [PATCH 10/10] cacheinfo: Move resctrl's get_cache_id() to the cacheinfo header file James Morse
2020-03-16 20:31 ` Reinette Chatre
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=20200214182401.39008-2-james.morse@arm.com \
--to=james.morse@arm.com \
--cc=Babu.Moger@amd.com \
--cc=bp@alien8.de \
--cc=fenghua.yu@intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=reinette.chatre@intel.com \
--cc=tglx@linutronix.de \
--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).