[PATCH v4 4/7] x86/resctrl: Delete unused fields from struct rdt_domain

From: Tony Luck
Date: Sat Jul 22 2023 - 15:08:03 EST


Now that all the monitoring functions use struct rdt_mondomain the
monitor fields can be dropped from the structure used for control
operations.

Signed-off-by: Tony Luck <tony.luck@xxxxxxxxx>
---
include/linux/resctrl.h | 14 --------------
arch/x86/kernel/cpu/resctrl/internal.h | 4 ----
2 files changed, 18 deletions(-)

diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h
index 663bbc427c4b..80a89d171eba 100644
--- a/include/linux/resctrl.h
+++ b/include/linux/resctrl.h
@@ -57,13 +57,6 @@ struct resctrl_staged_config {
* @list: all instances of this resource
* @id: unique id for this instance
* @cpu_mask: which CPUs share this resource
- * @rmid_busy_llc: bitmap of which limbo RMIDs are above threshold
- * @mbm_total: saved state for MBM total bandwidth
- * @mbm_local: saved state for MBM local bandwidth
- * @mbm_over: worker to periodically read MBM h/w counters
- * @cqm_limbo: worker to periodically read CQM h/w counters
- * @mbm_work_cpu: worker CPU for MBM h/w counters
- * @cqm_work_cpu: worker CPU for CQM h/w counters
* @plr: pseudo-locked region (if any) associated with domain
* @staged_config: parsed configuration to be applied
* @mbps_val: When mba_sc is enabled, this holds the array of user
@@ -74,13 +67,6 @@ struct rdt_domain {
struct list_head list;
int id;
struct cpumask cpu_mask;
- unsigned long *rmid_busy_llc;
- struct mbm_state *mbm_total;
- struct mbm_state *mbm_local;
- struct delayed_work mbm_over;
- struct delayed_work cqm_limbo;
- int mbm_work_cpu;
- int cqm_work_cpu;
struct pseudo_lock_region *plr;
struct resctrl_staged_config staged_config[CDP_NUM_TYPES];
u32 *mbps_val;
diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
index 401af6ccf272..016ef0373c5a 100644
--- a/arch/x86/kernel/cpu/resctrl/internal.h
+++ b/arch/x86/kernel/cpu/resctrl/internal.h
@@ -323,16 +323,12 @@ struct arch_mbm_state {
* a control resource
* @d_resctrl: Properties exposed to the resctrl file system
* @ctrl_val: array of cache or mem ctrl values (indexed by CLOSID)
- * @arch_mbm_total: arch private state for MBM total bandwidth
- * @arch_mbm_local: arch private state for MBM local bandwidth
*
* Members of this structure are accessed via helpers that provide abstraction.
*/
struct rdt_hw_domain {
struct rdt_domain d_resctrl;
u32 *ctrl_val;
- struct arch_mbm_state *arch_mbm_total;
- struct arch_mbm_state *arch_mbm_local;
};

/**
--
2.40.1