@@ -712,6 +712,11 @@ int resctrl_arch_alloc_rmid(u32 *closid, u32 *rmid)
return 0;
}
+void resctrl_arch_free_rmid(u32 closid, u32 rmid)
+{
+ free_rmid(closid, rmid);
+}
+
static void clear_closid_rmid(int cpu)
{
struct resctrl_pqr_state *state = this_cpu_ptr(&pqr_state);
@@ -1544,6 +1544,7 @@ static void mpam_reprogram_ris_partid(struct mpam_msc_ris *ris, u16 partid,
u32 pri_val = 0;
u16 cmax = MPAMCFG_CMAX_CMAX;
u16 bwa_fract = MPAMCFG_MBW_MAX_MAX;
+ u16 intpartid = req2intpartid(partid);
struct mpam_msc *msc = ris->vmsc->msc;
struct mpam_props *rprops = &ris->props;
u16 dspri = GENMASK(rprops->dspri_wd, 0);
@@ -1554,8 +1555,14 @@ static void mpam_reprogram_ris_partid(struct mpam_msc_ris *ris, u16 partid,
if (mpam_has_feature(mpam_feat_partid_nrw, rprops)) {
mpam_write_partsel_reg(msc, INTPARTID,
- MPAMCFG_INTPARTID_INTERNAL | partid);
- __mpam_intpart_sel(ris->ris_idx, partid, msc);
+ MPAMCFG_INTPARTID_INTERNAL |
+ intpartid);
+
+ /* Already finish mapping reqPARTID to intPARTID */
+ if (partid != intpartid)
+ goto out;
+
+ __mpam_intpart_sel(ris->ris_idx, intpartid, msc);
}
if (mpam_has_feature(mpam_feat_cpor_part, rprops)) {
@@ -1615,6 +1622,7 @@ static void mpam_reprogram_ris_partid(struct mpam_msc_ris *ris, u16 partid,
mpam_quirk_post_config_change(ris, partid, cfg);
+out:
mutex_unlock(&msc->part_sel_lock);
}
@@ -3072,10 +3080,34 @@ struct mpam_write_config_arg {
static int __write_config(void *arg)
{
+ int closid_num = resctrl_arch_get_num_closid(NULL);
struct mpam_write_config_arg *c = arg;
+ struct mpam_props *rprops;
+ u32 reqpartid;
+ int i;
mpam_reprogram_ris_partid(c->ris, c->partid, &c->comp->cfg[c->partid]);
+ if (c->partid != req2intpartid(c->partid))
+ return 0;
+
+ rprops = &c->ris->props;
+
+ /*
+ * Synchronize the configuration to each working sub-monitoring
+ * group.
+ */
+ for (i = 1; i < get_num_reqpartid_per_closid(); i++) {
+ reqpartid = i * closid_num + c->partid;
+
+ if (!reqpartid_is_busy(reqpartid))
+ continue;
+
+ if (!mpam_has_feature(mpam_feat_partid_nrw, rprops))
+ mpam_reprogram_ris_partid(c->ris, reqpartid,
+ &c->comp->cfg[c->partid]);
+ }
+
return 0;
}
@@ -3149,6 +3181,7 @@ static void mpam_extend_config(struct mpam_class *class, struct mpam_config *cfg
int mpam_apply_config(struct mpam_component *comp, u16 partid,
struct mpam_config *cfg)
{
+ int intpartid = req2intpartid(partid);
struct mpam_write_config_arg arg;
struct mpam_msc_ris *ris;
struct mpam_vmsc *vmsc;
@@ -3159,7 +3192,12 @@ int mpam_apply_config(struct mpam_component *comp, u16 partid,
mpam_extend_config(comp->class, cfg);
- if (!mpam_update_config(&comp->cfg[partid], cfg))
+ /*
+ * If the partid is not equal to its intpartid, then we continue
+ * to establish the association between reqpartid and intpartid.
+ */
+ if ((intpartid == partid) &&
+ !mpam_update_config(&comp->cfg[intpartid], cfg))
return 0;
arg.comp = comp;
@@ -773,4 +773,8 @@ static inline void mpam_resctrl_teardown_class(struct mpam_class *class) { }
*/
#define MSMON_CAPT_EVNT_NOW BIT(0)
+u32 get_num_reqpartid_per_closid(void);
+u32 req2intpartid(u32 reqpartid);
+bool reqpartid_is_busy(int reqpartid);
+
#endif /* MPAM_INTERNAL_H */
@@ -171,11 +171,16 @@ static u32 get_num_reqpartid(void)
return mpam_partid_max + 1;
}
-static u32 get_num_reqpartid_per_closid(void)
+u32 get_num_reqpartid_per_closid(void)
{
return get_num_reqpartid() / resctrl_arch_get_num_closid(NULL);
}
+u32 req2intpartid(u32 reqpartid)
+{
+ return reqpartid % resctrl_arch_get_num_closid(NULL);
+}
+
u32 resctrl_arch_system_num_rmid_idx(void)
{
u8 closid_shift = fls(mpam_pmg_max);
@@ -1040,10 +1045,26 @@ static void reqpartid_destroy(void)
bitmap_free(reqpartid_free_map);
}
+static int reqpartid_alloc(int reqpartid)
+{
+ __clear_bit(reqpartid, reqpartid_free_map);
+ return reqpartid;
+}
+
+static void reqpartid_free(int reqpartid)
+{
+ __set_bit(reqpartid, reqpartid_free_map);
+}
+
+bool reqpartid_is_busy(int reqpartid)
+{
+ return !test_bit(reqpartid, reqpartid_free_map);
+}
+
int resctrl_arch_alloc_rmid(u32 *closid, u32 *rmid)
{
int closid_num = resctrl_arch_get_num_closid(NULL);
- int i, reqpartid, pmg;
+ int i, ret, reqpartid, pmg;
if (!closid || !rmid)
return -EINVAL;
@@ -1064,7 +1085,48 @@ int resctrl_arch_alloc_rmid(u32 *closid, u32 *rmid)
*closid = reqpartid;
*rmid = pmg;
+
+ if (reqpartid_is_busy(reqpartid))
+ return 0;
+
+ ret = reqpartid_alloc(reqpartid);
+ if (ret < 0)
+ goto out_free_rmid;
+
+ ret = resctrl_sync_config(reqpartid);
+ if (ret < 0)
+ goto out;
+
return 0;
+
+out:
+ reqpartid_free(reqpartid);
+out_free_rmid:
+ free_rmid(reqpartid, pmg);
+ return ret;
+}
+
+void resctrl_arch_free_rmid(u32 reqpartid, u32 pmg)
+{
+ int i;
+
+ free_rmid(reqpartid, pmg);
+
+ /* Always reserve the reqPARTID which equals to its intPARTID. */
+ if (reqpartid == req2intpartid(reqpartid))
+ return;
+
+ /*
+ * Check whether every RMID belongs to this reqPARTID is freed or
+ * not. If all belonging rmids are freed, also free the reqPARTID
+ * self.
+ */
+ for (i = 0; i <= mpam_pmg_max; i++) {
+ if (rmid_is_busy(reqpartid, i))
+ return;
+ }
+
+ reqpartid_free(reqpartid);
}
int mpam_resctrl_setup(void)
@@ -325,8 +325,6 @@ int closids_supported(void);
void closid_free(int closid);
-void free_rmid(u32 closid, u32 rmid);
-
void resctrl_mon_resource_exit(void);
void mon_event_count(void *info);
@@ -282,10 +282,24 @@ int alloc_rmid(u32 closid)
if (IS_ERR(entry))
return PTR_ERR(entry);
- list_del(&entry->list);
+ list_del_init(&entry->list);
return entry->rmid;
}
+bool rmid_is_busy(u32 closid, u32 rmid)
+{
+ u32 idx = resctrl_arch_rmid_idx_encode(closid, rmid);
+ struct rmid_entry *entry;
+
+ entry = __rmid_entry(idx);
+
+ /*
+ * If it's not in the rmid_free_lru list,
+ * the rmid is working.
+ */
+ return list_empty(&entry->list);
+}
+
static void add_rmid_to_limbo(struct rmid_entry *entry)
{
struct rdt_resource *r = resctrl_arch_get_resource(RDT_RESOURCE_L3);
@@ -557,7 +557,7 @@ int rdtgroup_locksetup_enter(struct rdtgroup *rdtgrp)
* anymore when this group would be used for pseudo-locking. This
* is safe to call on platforms not capable of monitoring.
*/
- free_rmid(rdtgrp->closid, rdtgrp->mon.rmid);
+ resctrl_arch_free_rmid(rdtgrp->closid, rdtgrp->mon.rmid);
ret = 0;
goto out;
@@ -591,7 +591,7 @@ int rdtgroup_locksetup_exit(struct rdtgroup *rdtgrp)
ret = rdtgroup_locksetup_user_restore(rdtgrp);
if (ret) {
- free_rmid(rdtgrp->closid, rdtgrp->mon.rmid);
+ resctrl_arch_free_rmid(rdtgrp->closid, rdtgrp->mon.rmid);
return ret;
}
@@ -2746,7 +2746,7 @@ static void free_all_child_rdtgrp(struct rdtgroup *rdtgrp)
head = &rdtgrp->mon.crdtgrp_list;
list_for_each_entry_safe(sentry, stmp, head, mon.crdtgrp_list) {
- free_rmid(sentry->closid, sentry->mon.rmid);
+ resctrl_arch_free_rmid(sentry->closid, sentry->mon.rmid);
list_del(&sentry->mon.crdtgrp_list);
if (atomic_read(&sentry->waitcount) != 0)
@@ -2786,7 +2786,7 @@ static void rmdir_all_sub(void)
cpumask_or(&rdtgroup_default.cpu_mask,
&rdtgroup_default.cpu_mask, &rdtgrp->cpu_mask);
- free_rmid(rdtgrp->closid, rdtgrp->mon.rmid);
+ resctrl_arch_free_rmid(rdtgrp->closid, rdtgrp->mon.rmid);
kernfs_remove(rdtgrp->kn);
list_del(&rdtgrp->rdtgroup_list);
@@ -3281,7 +3281,7 @@ static int mkdir_rdt_prepare_rmid_alloc(struct rdtgroup *rdtgrp)
ret = mkdir_mondata_all(rdtgrp->kn, rdtgrp, &rdtgrp->mon.mon_data_kn);
if (ret) {
rdt_last_cmd_puts("kernfs subdir error\n");
- free_rmid(rdtgrp->closid, rdtgrp->mon.rmid);
+ resctrl_arch_free_rmid(rdtgrp->closid, rdtgrp->mon.rmid);
return ret;
}
@@ -3291,7 +3291,24 @@ static int mkdir_rdt_prepare_rmid_alloc(struct rdtgroup *rdtgrp)
static void mkdir_rdt_prepare_rmid_free(struct rdtgroup *rgrp)
{
if (resctrl_arch_mon_capable())
- free_rmid(rgrp->closid, rgrp->mon.rmid);
+ resctrl_arch_free_rmid(rgrp->closid, rgrp->mon.rmid);
+}
+
+int resctrl_sync_config(u32 closid)
+{
+ struct resctrl_schema *s;
+ int ret;
+
+ list_for_each_entry(s, &resctrl_schema_all, list) {
+ ret = resctrl_arch_update_domains(s->res, closid);
+ if (ret < 0) {
+ rdt_last_cmd_puts("Failed to synchronize partitions\n");
+ goto out;
+ }
+ }
+
+out:
+ return ret;
}
static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,
@@ -3557,7 +3574,7 @@ static int rdtgroup_rmdir_mon(struct rdtgroup *rdtgrp, cpumask_var_t tmpmask)
update_closid_rmid(tmpmask, NULL);
rdtgrp->flags = RDT_DELETED;
- free_rmid(rdtgrp->closid, rdtgrp->mon.rmid);
+ resctrl_arch_free_rmid(rdtgrp->closid, rdtgrp->mon.rmid);
/*
* Remove the rdtgrp from the parent ctrl_mon group's list
@@ -3604,7 +3621,7 @@ static int rdtgroup_rmdir_ctrl(struct rdtgroup *rdtgrp, cpumask_var_t tmpmask)
cpumask_or(tmpmask, tmpmask, &rdtgrp->cpu_mask);
update_closid_rmid(tmpmask, NULL);
- free_rmid(rdtgrp->closid, rdtgrp->mon.rmid);
+ resctrl_arch_free_rmid(rdtgrp->closid, rdtgrp->mon.rmid);
closid_free(rdtgrp->closid);
rdtgroup_ctrl_remove(rdtgrp);
@@ -507,6 +507,9 @@ static inline void resctrl_arch_rmid_read_context_check(void)
}
int alloc_rmid(u32 closid);
+void free_rmid(u32 closid, u32 rmid);
+bool rmid_is_busy(u32 closid, u32 rmid);
+
/**
* resctrl_arch_alloc_rmid() - Providing the similar functionality as
* alloc_rmid, but this function is an
@@ -521,6 +524,17 @@ int alloc_rmid(u32 closid);
* 0 on success, or -EINVAL, -ENOSPC etc on error.
*/
int resctrl_arch_alloc_rmid(u32 *closid, u32 *rmid);
+/**
+ * resctrl_arch_free_rmid() - Manage rmid and reqpartid resources in
+ * conjunction with the
+ * resctrl_arch_alloc_rmid().
+ *
+ * @closid: closid that matches the rmid.
+ * @rmid: The rmid would be free.
+ */
+void resctrl_arch_free_rmid(u32 closid, u32 rmid);
+
+int resctrl_sync_config(u32 closid);
/**
* resctrl_arch_reset_rmid() - Reset any private state associated with rmid
Add resctrl_sync_config() for establishing new mapping between intPARTID and reqPARTID for hardware or synchronizing their configuration by software. For the expansion of monitors using reqPARTID in the system: 1. If a MSC class supports the narrow-partid feature, then it is only necessary to associate the newly allocated reqPARTID with its corresponding intPARTID. 2. If a MSC class does not support the narrow-partid feature, the hardware can't associate reqPARTID with intPARTID, and the software needs to synchronize the configuration of the parent control group to the new PARTID (the newly allocated "reqpartid"). Additionally, for MSC class that doesn't support the narrow-partid feature, when the control group configuration is updated, the software needs to forcibly update its sub-monitoring groups (referencing the __write_config()). We establish a reqPARTID resource bitmap and check whether the reqPARTID is in use by reqpartid_is_busy() to reduce unnecessary I/O operations. In mpam_apply_config(), if closid is equal to intPARTID, we regard that it is updating new configuration for the control group. Otherwise, it is attempting to establish mapping and synchronize configuration for sub-monitoring groups. Signed-off-by: Zeng Heng <zengheng4@huawei.com> --- arch/x86/kernel/cpu/resctrl/core.c | 5 ++ drivers/platform/arm64/mpam/mpam_devices.c | 44 +++++++++++++- drivers/platform/arm64/mpam/mpam_internal.h | 4 ++ drivers/platform/arm64/mpam/mpam_resctrl.c | 66 ++++++++++++++++++++- fs/resctrl/internal.h | 2 - fs/resctrl/monitor.c | 16 ++++- fs/resctrl/pseudo_lock.c | 4 +- fs/resctrl/rdtgroup.c | 29 +++++++-- include/linux/resctrl.h | 14 +++++ 9 files changed, 168 insertions(+), 16 deletions(-)