To support resctrl's MBA software controller, the architecture must provide
a second configuration array to hold the mbps_val from user-space.
This complicates the interface between the architecture code.
Make the filesystem parts of resctrl create an array for the mba_sc
values when the struct resctrl_schema is created. The software controller
can be changed to use this, allowing the architecture code to only
consider the values configured in hardware.
Signed-off-by: James Morse <james.morse@xxxxxxx>
---
arch/x86/kernel/cpu/resctrl/internal.h | 1 -
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 69 ++++++++++++++++++++++++++
include/linux/resctrl.h | 13 +++++
3 files changed, 82 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
index e12b55f815bf..a7e2cbce29d5 100644
--- a/arch/x86/kernel/cpu/resctrl/internal.h
+++ b/arch/x86/kernel/cpu/resctrl/internal.h
@@ -36,7 +36,6 @@
#define MBM_OVERFLOW_INTERVAL 1000
#define MAX_MBA_BW 100u
#define MBA_IS_LINEAR 0x4
-#define MBA_MAX_MBPS U32_MAX
#define MAX_MBA_BW_AMD 0x800
#define MBM_CNTR_WIDTH_OFFSET_AMD 20
diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
index cf0db0b7a5d0..185f9bb992d1 100644
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -2030,6 +2030,60 @@ static int mkdir_mondata_all(struct kernfs_node *parent_kn,
struct rdtgroup *prgrp,
struct kernfs_node **mon_data_kn);
+static int mba_sc_domain_allocate(struct rdt_resource *res,
+ struct rdt_domain *d)
+{
+ u32 num_closid = closid_free_map_len;
+ int cpu = cpumask_any(&d->cpu_mask);
+ int i;
+
+ d->mba_sc = kcalloc_node(num_closid, sizeof(*d->mba_sc),
+ GFP_KERNEL, cpu_to_node(cpu));
+ if (!d->mba_sc)
+ return -ENOMEM;
+
+ for (i = 0; i < num_closid; i++)
+ d->mba_sc[i].mbps_val = MBA_MAX_MBPS;
+
+ return 0;
+}
+
/**
* struct rdt_domain - group of CPUs sharing a resctrl resource
* @list: all instances of this resource
@@ -53,6 +64,7 @@ struct resctrl_staged_config {
* @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
+ * @mba_sc: the mba software controller properties, indexed by closid
*/
struct rdt_domain {
struct list_head list;
@@ -67,6 +79,7 @@ struct rdt_domain {
int cqm_work_cpu;
struct pseudo_lock_region *plr;
struct resctrl_staged_config staged_config[CDP_NUM_TYPES];
+ struct resctrl_mba_sc *mba_sc;
};